Merge remote-tracking branch 'upstream/master' into addition/widget-dropdown

# Conflicts:
#	guides/v2.1/javascript-dev-guide/widgets/jquery-widgets-about.md

Author: Vasilii Burlacu

.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. -->
 
-- ...
 - ...
 
 <!-- 

.gitignore

@@ -2,6 +2,7 @@
 ######################
 /*.db
 .DS_Store
+.vscode
 
 # Config and output files #
 ###########################
@@ -10,6 +11,7 @@
 
 _config.local.yml
 .jekyll-metadata
+.whatsup.yml
 
 *.bat
 /tmp/
@@ -30,4 +32,5 @@ _algolia_api_key
 # Docs from different branches #
 ###################################
 
-/guides/v2.0/
+/guides/v2.0/
+/guides/v2.1/

Docfile.yml

@@ -1,8 +1,8 @@
 content_map:
 -
-  directory: guides/v2.0
+  directory: guides/v2.1
   repository: magento/devdocs
-  branch: 2.0
+  branch: 2.1
   filter: false
 -
   directory: guides/m1x
@@ -17,7 +17,7 @@ content_map:
 -
   directory: mftf
   repository: magento/magento2-functional-testing-framework
-  branch: develop
+  branch: master
   filter: true
 -
   directory: page-builder

Gemfile

@@ -4,14 +4,20 @@ source 'https://rubygems.org'
 
 gem 'devdocs', git: 'https://github.com/magento-devdocs/devdocs-theme.git'
 gem 'jekyll'
+gem 'whatsup_github'
 
-gem 'wdm' if Gem.win_platform?
+gem 'wdm', platform: :mswin
 
 group :test do
   gem 'html-proofer'
   gem 'launchy'
 end
 
+group :optimization do
+  gem 'image_optim'
+  gem 'image_optim_pack'
+end
+
 group :jekyll_plugins do
   gem 'jekyll-algolia', '~> 1.0'
   gem 'jekyll-redirect-from'

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: 20f1b8529a01f4585117f73913475072e73f9cab
+  revision: 5ce6bf94dbf827682b1f83d5e3c4fbc4c4f69478
   specs:
-    devdocs (0.0.1)
+    devdocs (2)
       jekyll (>= 3.3)
 
 GEM
@@ -30,9 +30,13 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    ffi (1.10.0)
+    exifr (1.3.6)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.11.1)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
+    fspath (3.1.1)
     html-proofer (3.9.3)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
@@ -46,7 +50,18 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    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.3)
+      fspath (>= 2.1, < 4)
+      image_optim (~> 0.19)
+    image_size (2.0.1)
+    in_threads (1.5.2)
+    jekyll (3.8.6)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -94,38 +109,55 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    multipart-post (2.1.1)
+    netrc (0.11.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
+    octokit (4.14.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.17.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    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)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     verbal_expressions (0.1.5)
-    yell (2.1.0)
+    wdm (0.1.1)
+    whatsup_github (0.0.1)
+      netrc (~> 0.10)
+      octokit (~> 4.14)
+      thor (~> 0.20)
+    yell (2.2.0)
 
 PLATFORMS
   ruby
+  x86-mswin32
 
 DEPENDENCIES
   devdocs!
   html-proofer
+  image_optim
+  image_optim_pack
   jekyll
   jekyll-algolia (~> 1.0)
   jekyll-optional-front-matter
@@ -134,6 +166,8 @@ DEPENDENCIES
   jekyll-sitemap
   jekyll-titles-from-headings
   launchy
+  wdm
+  whatsup_github
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

README.md

@@ -146,6 +146,38 @@ The following example will generate Magento 2.2 documentation only.
 
 If you don't have the `_config.local.yml` file at the root of your `devdocs/` directory, the rake will generate all versions of the documentation.
 
+### To build v2.0 documentation
+
+Magento 2.0.18 was the final 2.0.x release. After March 2018, Magento 2.0.x stopped receiving security patches, quality fixes, and documentation updates.
+
+To ensure the quality of our public documentation for versions of Magento that are still supported and to avoid potential confusion about 2.0.x support, we removed all 2.0.x content from our public documentation websites on May 31, 2019.
+
+To build v2.0 documentation:
+
+> Also, you can use the GitHub interface to read the source Markdown files instead of building the site locally. Navigate to the [`2.0`](https://github.com/magento/devdocs/tree/2.0) branch and click the file you want to view.
+
+1. Add an entry for 2.0 in the `Docfile.yml` file.
+
+    ```yaml
+    -
+      directory: guides/v2.0
+      repository: magento/devdocs
+      branch: 2.0
+      filter: false
+    ```
+
+1. Initialize the `2.0` branch in your local devdocs repository.
+
+    ```shell
+    rake init
+    ```
+
+1. Run the preview command.
+
+    ```shell
+    rake preview
+    ```
+
 ## Build using Vagrant
 
 You can deploy the devdocs site locally using [this Vagrant project](https://github.com/magento-devdocs/vagrant-for-magento-devdocs).

Rakefile

@@ -60,3 +60,12 @@ end
 
 desc 'Pull docs from external repositories'
 task init: %w[multirepo:init]
+
+desc 'Run checks (image optimization).'
+task check: %w[check:image_optim] 
+
+desc 'Generate data for the weekly digest.'
+task :whatsnew do
+  print 'Generating data for the weekly digest: $ '.magenta
+  sh 'whatsup_github'
+end

_config.checks.yml

@@ -3,13 +3,27 @@
 # For configuration defaults, refer to: https://github.com/gjtorikian/html-proofer/blob/master/lib/html-proofer/configuration.rb
 #
 html-proofer:
+  # Do not check external links.
   :disable_external: true
+
+  # Report only errors that fall within the 4xx status code range.
   :only_4xx: true
+
+  # Ignores images with empty alt tags.
   :empty_alt_ignore: true
-  :allow_hash_ref: true
+
+  # Sort errors by description in the report
   :error_sort: :desc
+
+  # Use up to 3 parallel processes to speed up internal file checks.
   :parallel:
     :in_processes: 3
-  :file_ignore:
-  - !ruby/regexp /guides\/v2\.0/
-  - !ruby/regexp /videos\//
+
+  # Ignore entirely the files which pathname matches a specified pattern 
+  # :file_ignore:
+  # - guides/v2.0
+
+  # Ignore any link that includes a specified pattern
+  # :url_ignore:
+  # - !ruby/regexp /guides\/v2\.0/
+  

_config.index.yml

@@ -0,0 +1,24 @@
+# Jekyll Algolia settings for indexing https://community.algolia.com/jekyll-algolia/options.html
+algolia:
+  files_to_exclude:
+    - guides/m1x/**/*.html
+    - guides/m1x/**/*.md
+    - swagger
+    - redoc
+  # Index HTML elements, especially code samples.
+  nodes_to_index: 'p,li,td,code'
+  # Override 10KB default and use our allowed max of 20KB
+  max_record_size: 20000
+  settings:
+    attributesForFaceting:
+      - searchable(functional_areas)
+      - searchable(guide_version)
+      - searchable(versionless)  
+
+# Disable the code blocks line numbers at indexing stage
+kramdown:
+  syntax_highlighter_opts:
+    span:
+      line_numbers: false
+    block:
+      line_numbers: false

_config.yml

@@ -19,9 +19,6 @@ baseurl: ""
 #
 version: "2.3"
 versions:
-   -
-      name: "2.0"
-      url: /guides/v2.0/
    -
       name: "2.1"
       url: /guides/v2.1/
@@ -77,7 +74,7 @@ defaults:
       path: mftf/docs
     values:
       group: mftf
-      github_files: https://github.com/magento/magento2-functional-testing-framework/blob/develop/
+      github_files: https://github.com/magento/magento2-functional-testing-framework/blob/master/
       github_repo: https://github.com/magento/magento2-functional-testing-framework/
       functional_areas:
         - Test
@@ -105,11 +102,6 @@ defaults:
       group: module-reference-guide-2_3
       github_link: false
       feedback_link: false
-  -
-    scope:
-      path: guides/v2.0
-    values:
-      sitemap: false
   -
     scope:
       path: guides/v2.1
@@ -175,25 +167,20 @@ kramdown:
   toc_levels: 2..3
   syntax_highlighter_opts:
     css_class: highlighter
+    span:
+      line_numbers: false
+    block:
+      line_numbers: true
 
 # Search engine settings. For more details, refer to https://github.com/algolia/jekyll-algolia
 #
 algolia:
   application_id: E642SEDTHL
   index_name: devdocs
   api_key: d2d0f33ab73e291ef8d88d8b565e754c
-  files_to_exclude:
-    - guides/m1x/**/*.html
-    - guides/m1x/**/*.md
-    - swagger
-    - redoc
-  # Index HTML elements, especially code samples.
-  nodes_to_index: 'p,li,td,code'
-  # Override 10KB default and use our allowed max of 20KB
-  max_record_size: 20000
 
 google:
-  analytics: UA-66243208-1
+  gtm: GTM-KRCLXBB
 
 # Toggles the _plugin/html-check-hook.rb script that checks links in the generated HTML
 #
@@ -206,10 +193,6 @@ check_links: true
 # Magento 2 repository variable
 mage2bloburl: https://github.com/magento/magento2/blob
 
-# 2.0 variables
-gdeurl: /guides/v2.0/
-githuburl: https://github.com/magento/devdocs/tree/master/guides/v2.0/
-
 # 1.x variables
 m1xgdeurl: /guides/m1x
 m1xgithuburl: https://github.com/magento/devdocs/blob/master