Merge branch 'master' into patch-2

magento · Jul 11, 2019 · 311b6d0 · 311b6d0
2 parents 6fca86d + 4362bdc
commit 311b6d0
Show file tree

Hide file tree

Showing 2,705 changed files with 158,440 additions and 142,108 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -71,14 +71,14 @@ The following guidelines may answer most of your questions and help you get star
         For example:
 
         ```bash
-        git rm guides/v2.2/install-gde/composer.md
+        git rm guides/v2.3/install-gde/composer.md
         ```
 
         ```bash
-        cp guides/v2.1/install-gde/composer.md guides/v2.2/install-gde/composer.md
+        cp guides/v2.2/install-gde/composer.md guides/v2.3/install-gde/composer.md
         ```
 
-- Make sure that you update the correct version(s) of documentation (v2.1, v2.2, v2.3). If you are not sure what directory to put your content in, just do your best. We can help re-locate it (if necessary) during the review process.
+- Make sure that you update the correct version(s) of documentation (v2.2, v2.3). If you are not sure what directory to put your content in, just do your best. We can help re-locate it (if necessary) during the review process.
 - Review your work for basic typos, formatting errors, or ambiguous sentences before opening a pull request.
 - Revise pull requests according to review feedback. We will close pull requests that require an inordinate amount of time to review and process (especially for minor changes) if you fail to make revisions according to review feedback.
 - Do not directly contact DevDocs team members or maintainers on Slack to review your pull request unless it has been open for more than five days. We have a process and queue for pull requests that everyone must follow.
@@ -105,11 +105,11 @@ _(Optional)_ To review your changes in HTML output, follow the instructions in t
 
 We provide templates to help you get started writing new content and understanding Markdown formatting:
 
-- **General topic template** - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.1/contributor-guide/templates/basic_template.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/basic_template.html): This is a template for writing any topic with example formats and styles.
+- **General topic template** - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/basic_template.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/basic_template.html): This is a template for writing any topic with example formats and styles.
 - **Tutorial templates**: These templates provide example formats and styles for step-by-step instructions (like how-tos). Each file adds navigation buttons when content is generated. Templates include:
-  - First introduction topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.1/contributor-guide/templates/tutorial-template-first.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-first.html): Introduction to a tutorial for prerequisites and listing steps
-  - Middle topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.1/contributor-guide/templates/tutorial-template-middle.md) |  [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-middle.html): Use for each step in a tutorial.
-  - Final step topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.1/contributor-guide/templates/tutorial-template-last.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-last.html): Use for the last step of the tutorial.
+  - First introduction topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-first.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-first.html): Introduction to a tutorial for prerequisites and listing steps
+  - Middle topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-middle.md) |  [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-middle.html): Use for each step in a tutorial.
+  - Final step topic - [Markdown](https://github.com/magento/devdocs/blob/master/guides/v2.3/contributor-guide/templates/tutorial-template-last.md) | [HTML](https://devdocs.magento.com/guides/v2.3/contributor-guide/templates/tutorial-template-last.html): Use for the last step of the tutorial.
 
 ### Edit metadata
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,9 @@
+<!-- # IMPORTANT
+
+We are no longer accepting pull requests to update v2.1 devdoc files.
+
+Magento 2.1.18 is the final 2.1.x release. After the [June 2019 end-of-support date](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf), Magento will no longer apply security patches, quality fixes, or documentation updates to v2.1.x. To maintain your site's performance, security, and PCI compliance, [upgrade](https://devdocs.magento.com/guides/v2.3/comp-mgr/bk-compman-upgrade-guide.html) to the latest version of Magento. -->
+
 ## Purpose of this pull request
 
 <!-- REQUIRED Describe the goal and the type of changes this pull request covers. -->
@@ -8,14 +14,12 @@ This pull request (PR) ...
 
 <!-- REQUIRED List the affected pages on devdocs.magento.com (URLs). Not needed for large numbers of files. -->
 
-- ...
 - ...
 
 ## Links to Magento source code
 
 <!--  OPTIONAL - REMOVE THIS SECTION IF NOT USED. If this pull request references a file in a Magento codebase repository, add it here. -->
 
-- ...
 - ...
 
 <!-- 

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ _algolia_api_key
 ###################################
 
 /guides/v2.0/
+/guides/v2.1/
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 450a470aa4b937400190d009131fa91cf27d7a9d
+  revision: 5ce6bf94dbf827682b1f83d5e3c4fbc4c4f69478
   specs:
-    devdocs (0.0.1)
+    devdocs (2)
       jekyll (>= 3.3)
 
 GEM
@@ -33,10 +33,10 @@ GEM
     exifr (1.3.6)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
+    ffi (1.11.1)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
-    fspath (3.1.0)
+    fspath (3.1.1)
     html-proofer (3.9.3)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
@@ -50,18 +50,18 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    image_optim (0.26.3)
+    image_optim (0.26.4)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.5.2.20190428)
+    image_optim_pack (0.5.3)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (2.0.1)
-    in_threads (1.5.1)
-    jekyll (3.8.5)
+    in_threads (1.5.2)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -118,16 +118,16 @@ GEM
     parallel (1.17.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    progress (3.5.0)
-    progressbar (1.10.0)
-    public_suffix (3.0.3)
+    progress (3.5.1)
+    progressbar (1.10.1)
+    public_suffix (3.1.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    rouge (3.3.0)
+    rouge (3.5.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.5)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -147,7 +147,7 @@ GEM
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)
-    yell (2.1.0)
+    yell (2.2.0)
 
 PLATFORMS
   ruby

diff --git a/_config.yml b/_config.yml
@@ -19,9 +19,6 @@ baseurl: ""
 #
 version: "2.3"
 versions:
-   -
-      name: "2.1"
-      url: /guides/v2.1/
    -
       name: "2.2"
       url: /guides/v2.2/
@@ -102,11 +99,7 @@ defaults:
       group: module-reference-guide-2_3
       github_link: false
       feedback_link: false
-  -
-    scope:
-      path: guides/v2.1
-    values:
-      sitemap: false
+
   -
     scope:
       path: guides/v2.2
@@ -180,7 +173,7 @@ algolia:
   api_key: d2d0f33ab73e291ef8d88d8b565e754c
 
 google:
-  analytics: UA-66243208-1
+  gtm: GTM-KRCLXBB
 
 # Toggles the _plugin/html-check-hook.rb script that checks links in the generated HTML
 #
@@ -197,10 +190,6 @@ mage2bloburl: https://github.com/magento/magento2/blob
 m1xgdeurl: /guides/m1x
 m1xgithuburl: https://github.com/magento/devdocs/blob/master
 
-# 2.1 variables
-gdeurl21: /guides/v2.1/
-githuburl21: https://github.com/magento/devdocs/tree/master/guides/v2.1/
-
 # 2.2 variables
 gdeurl22: /guides/v2.2/
 githuburl22: https://github.com/magento/devdocs/tree/master/guides/v2.2/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,4 @@ _algolia_api_key
		###################################

		/guides/v2.0/
		/guides/v2.1/