Skip to content
This repository has been archived by the owner on Aug 11, 2022. It is now read-only.

Commit

Permalink
feat: update source content
Browse files Browse the repository at this point in the history
  • Loading branch information
electron-bot committed Apr 22, 2020
1 parent c7993d0 commit a2cbd25
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion content/current/en-US/docs/tutorial/electron-versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Stabilization branches are branches that run parallel to master, taking in only

![](../images/versioning-sketch-1.png)

Stabilization branches are always either **major** or **minor** version lines, and named against the following template `$MAJOR-$MINOR-x` e.g. `2-0-x`.
Since Electron 8, stabilization branches are always **major** version lines, and named against the following template `$MAJOR-x-y` e.g. `8-x-y`. Prior to that we used **minor** version lines and named them as `$MAJOR-$MINOR-x` e.g. `2-0-x`

We allow for multiple stabilization branches to exist simultaneously, and intend to support at least two in parallel at all times, backporting security fixes as necessary.
![](../images/versioning-sketch-2.png)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"automerge": "ts-node ./script/automerge.ts"
},
"electronLatestStableTag": "v8.2.3",
"electronMasterBranchCommit": "f3dc3997b10fd79439ad22ff5973b3d3541d8e9d",
"electronMasterBranchCommit": "aca2e4f96896f7f715cd582a631ba84f71c25a4f",
"engines": {
"node": ">=10"
},
Expand Down
18 changes: 9 additions & 9 deletions stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@
"name": "French",
"code": "fr",
"phrases": "65629",
"translated": "43561",
"translated": "43563",
"approved": "34946",
"words": "630652",
"words_translated": "368166",
"words_translated": "368192",
"words_approved": "292927",
"translated_progress": 58,
"approved_progress": 46,
"qa_issues": 2098
"qa_issues": 2099
},
{
"name": "German",
Expand Down Expand Up @@ -185,14 +185,14 @@
"name": "Korean",
"code": "ko",
"phrases": "65629",
"translated": "28242",
"translated": "28266",
"approved": "21807",
"words": "630652",
"words_translated": "242946",
"words_translated": "243071",
"words_approved": "180680",
"translated_progress": 38,
"approved_progress": 28,
"qa_issues": 2404
"qa_issues": 2411
},
{
"name": "Persian",
Expand Down Expand Up @@ -250,14 +250,14 @@
"name": "Russian",
"code": "ru",
"phrases": "65629",
"translated": "40740",
"translated": "40792",
"approved": "35120",
"words": "630652",
"words_translated": "335885",
"words_translated": "336287",
"words_approved": "288805",
"translated_progress": 53,
"approved_progress": 45,
"qa_issues": 1794
"qa_issues": 1807
},
{
"name": "Spanish",
Expand Down
8 changes: 4 additions & 4 deletions wordcount.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Stat | Value
---- | -----
total files | 272
total words | 262599
unique words | 12503
total words | 262619
unique words | 12504
average words per file | 965

## Blog English
Expand All @@ -23,6 +23,6 @@ average words per file | 702
Stat | Value
---- | -----
total files | 7259
total words | 5448699
unique words | 93831
total words | 5448719
unique words | 93832
average words per file | 750

0 comments on commit a2cbd25

Please sign in to comment.