feat: update source content

electron · May 19, 2020 · c182015 · c182015
1 parent 2db48aa
commit c182015
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/content/current/en-US/docs/tutorial/electron-timelines.md b/content/current/en-US/docs/tutorial/electron-timelines.md
@@ -4,15 +4,17 @@
 * We strive for weekly beta releases, however we often release more betas than scheduled.
 * All dates are our goals but there may be reasons for adjusting the stable deadline, such as security bugs.
 * Take a look at the [5.0.0 Timeline blog post](https://electronjs.org/blog/electron-5-0-timeline) for info about publicizing our release dates.
+* Since Electron 6.0, we've been targetting every other Chromium version and releasing our stable on the same day as Chrome stable. You can reference Chromium's release schedule [here](https://chromiumdash.appspot.com/schedule). See [Electron's new release cadence blog post](https://www.electronjs.org/blog/12-week-cadence) for more details on our release schedule.
 
 | Version | -beta.1 | Stable | Chrome | Node |
 | ------- | ------- | ------ | ------ | ---- |
-| 2.0.0 | 2018-02-21 | 2018-05-01 | M61 | v8 |
-| 3.0.0 | 2018-06-21 | 2018-09-18 | M66 | v10 |
-| 4.0.0 | 2018-10-11 | 2018-12-20 | M69 | v10 |
-| 5.0.0 | 2019-01-22 | 2019-04-24 | M73 | v12 |
-| 6.0.0 | 2019-05-01 | 2019-07-30 | M76 | v12 |
-| 7.0.0 | 2019-08-01 | 2019-10-22 | M78 | v12 |
-| 8.0.0 | 2019-10-24 | 2020-02-04 | M80 | v12 |
-| 9.0.0 | 2020-02-06 | 2020-05-19 | M83 | v12 |
-| 10.0.0 | TBD | TBD | TBD | TBD |
+| 2.0.0 | 2018-02-21 | 2018-05-01 | M61 | v8.9 |
+| 3.0.0 | 2018-06-21 | 2018-09-18 | M66 | v10.2 |
+| 4.0.0 | 2018-10-11 | 2018-12-20 | M69 | v10.11 |
+| 5.0.0 | 2019-01-22 | 2019-04-24 | M73 | v12.0 |
+| 6.0.0 | 2019-05-01 | 2019-07-30 | M76 | v12.4 |
+| 7.0.0 | 2019-08-01 | 2019-10-22 | M78 | v12.8 |
+| 8.0.0 | 2019-10-24 | 2020-02-04 | M80 | v12.13 |
+| 9.0.0 | 2020-02-06 | 2020-05-19 | M83 | v12.14 |
+| 10.0.0 | 2020-05-21 | 2020-08-25 | M85 | v12.x |
+| 11.0.0 | TBD | TBD | TBD| TBD |
diff --git a/content/current/en-US/docs/tutorial/support.md b/content/current/en-US/docs/tutorial/support.md
@@ -58,9 +58,9 @@ threshold, we will attempt to support backwards compatibility beyond two version
 until the maintainers feel the maintenance burden is too high to continue doing so.
 
 ### Currently supported versions
-- 8.1.x
-- 7.1.x
-- 6.1.x
+- 9.x.y
+- 8.x.y
+- 7.x.y
 
 ### End-of-life
 

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "automerge": "ts-node ./script/automerge.ts"
   },
   "electronLatestStableTag": "v9.0.0",
-  "electronMasterBranchCommit": "01579cc8ed2ed9c8f9fbdb028967a912d0292778",
+  "electronMasterBranchCommit": "de44d28c8e790d72249865eedfc6c81a4d874ccb",
   "engines": {
     "node": ">=10"
   },

diff --git a/stats.json b/stats.json
@@ -185,14 +185,14 @@
     "name": "Korean",
     "code": "ko",
     "phrases": "65822",
-    "translated": "28953",
+    "translated": "28960",
     "approved": "21779",
     "words": "632677",
-    "words_translated": "253784",
+    "words_translated": "253880",
     "words_approved": "180878",
     "translated_progress": 40,
     "approved_progress": 28,
-    "qa_issues": 2490
+    "qa_issues": 2494
   },
   {
     "name": "Persian",

diff --git a/wordcount.md b/wordcount.md
@@ -5,8 +5,8 @@
 Stat | Value
 ---- | -----
 total files | 277
-total words | 266350
-unique words | 12619
+total words | 266429
+unique words | 12621
 average words per file | 961
 
 ## Blog English
@@ -23,6 +23,6 @@ average words per file | 703
 Stat | Value
 ---- | -----
 total files | 7264
-total words | 5423704
-unique words | 91157
+total words | 5423783
+unique words | 91159
 average words per file | 746
-Original file line number
+Diff line change
@@ Expand Up @@
     until the maintainers feel the maintenance burden is too high to continue doing so.
     ### Currently supported versions
-    - 8.1.x
-    - 7.1.x
-    - 6.1.x
+    - 9.x.y
+    - 8.x.y
+    - 7.x.y
     ### End-of-life
@@ Expand Down @@