Merge branch 'master' into small-changes

Author: dobooth

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: d2a43eecfe4fcf0586cc08ebe342bd9d5de8b41f
+  revision: 84a3ed7f0df264a2c2086167efbd7d0545d329c4
   specs:
-    devdocs (3)
+    devdocs (4)
       jekyll (>= 3.3)
 
 GEM

_checks/styles/style-rules-prod

@@ -1,4 +1,4 @@
-exclude_rule 'MD001'
+rule 'MD001'
 exclude_rule 'MD002'
 rule 'MD003', :style => :atx
 exclude_rule 'MD004'
@@ -11,7 +11,7 @@ exclude_rule 'MD011'
 rule 'MD012'
 exclude_rule 'MD013'
 exclude_rule 'MD014'
-exclude_rule 'MD018'
+rule 'MD018'
 rule 'MD019'
 exclude_rule 'MD020'
 exclude_rule 'MD021'

_data/toc/installation-guide.yml

@@ -410,9 +410,6 @@ pages:
             - label: PHP settings errors
               url: /install-gde/trouble/php/tshoot_php-set.html
 
-            - label: The PHP mcrypt extension is not installed properly
-              url: /install-gde/trouble/php/tshoot_mcrypt.html
-
             - label: During installation, PHP date warning
               url: /install-gde/trouble/php/tshoot_php-date.html
 

_includes/install/web/install-web_4-customize-store.md

@@ -17,7 +17,7 @@
 
 1.  Click **Next**.
 
-#### General module configuration options   {#instgde-install-magento-web-step4-depend1}
+### General module configuration options   {#instgde-install-magento-web-step4-depend1}
 
 Modules are listed in **Advanced Modules Configuration** in alphabetical order; the order has nothing to do with dependencies.
 
@@ -37,7 +37,7 @@ The following figure shows an example of disabling the `Magento_GoogleAnalytics`
 
 ![Disabling a module]({{ site.baseurl }}/common/images/install_wizard_disable-google.png)
 
-#### Module dependency errors   {#instgde-install-magento-web-step4-depend2}
+### Module dependency errors   {#instgde-install-magento-web-step4-depend2}
 
 A dependency error occurs when two inter-dependent modules are disabled at the same time.
 

_videos/fundamentals/create-a-new-module.md

@@ -21,11 +21,11 @@ Let’s go through each of these steps in detail.
 
 ## Create the module folder
 
-#### There are two possible locations for modules in Magento 2: the app/code folder and the vendor folder
+### There are two possible locations for modules in Magento 2: the app/code folder and the vendor folder
 
 Depending on how Magento 2 has been installed, core modules can either be located in the `vendor/magento/magento-*`folders (for composer installation) or in the `app/code/Magento/` folder (for cloning GitHub).
 
-#### Which of these locations should you choose for your new module?
+### Which of these locations should you choose for your new module?
 
 If you build a module for a specific project, it is best to choose the app/code folder and commit to the project's repository.
 

_videos/fundamentals/create-a-new-page.md

@@ -49,7 +49,7 @@ Learning/HelloPage/registration.php
 Learning/HelloPage/etc/module.xml
 ```
 
-#### registration.php
+### registration.php
 ```php
 <?php /**
 * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details.
@@ -59,7 +59,7 @@ __DIR__
 );
 ```
 
-#### module.xml
+### module.xml
 ```xml
 <?xml version="1.0"?>
 <!--

common/css/devdocs.css

@@ -1,8 +1,15 @@
+/* Banner on top of the site header */
 .message-banner {
   margin: 0;
   padding: 10px;
 }
 
+/* Banner on top of the page for older versions */
+.message-banner.version-banner {
+  margin-bottom: 15px;
+}
+
+/* Info box on when the page was updated */
 .page-updated {
   margin: 0 0 10px 0;
   color: #767676;
@@ -13,6 +20,7 @@
   width: 18px;
   height: 18px;
 }
+
 /* Reference styles */
 .ref-list {
   margin-bottom: 2.5em;
@@ -22,12 +30,9 @@
   font-weight:500;
 }
 
-/* Paragraph that represents a beginning of a procedure - should have an ordered list of steps following */
-.procedure {
+/* Paragraph that introduces important reference information (e.g., Related topics, Next step, Previous step), but does not qualify as a proper heading. Mimics the current H3 style */
+.ref-header {
   font-weight: bold;
-  margin-left: 1.0em;
+  font-size: 1.3em;
+  margin: 1.5em 0 0.5em 0;
 }
-
-.message-banner.version-banner {
-  margin-bottom: 15px;
-}

guides/v2.2/advanced-reporting/data-collection.md

@@ -196,7 +196,8 @@ It cannot contain any parameters.
 ...
 ```
 
-## Related topics
+{:.ref-header}
+Related topics
 
  [Modules providing advanced reporting][modules]
 

guides/v2.2/advanced-reporting/overview.md

@@ -30,7 +30,8 @@ To avoid system overload during its prime time, you can set the preferable time
 
 Though the Analytics module provides API, it is used specifically to interchange data with the MBI. We do not recommend to extend the advanced reporting functionality in this version.
 
-## Related topics
+{:.ref-header}
+Related topics
 
 [Magento modules that implement the functionality][modules]{:target="_blank"}
 

guides/v2.2/architecture/archi_perspectives/ABasics_intro.md

@@ -15,7 +15,8 @@ The following discussion focuses on how these topics apply directly to Magento:
 * Event-driven architecture
 * Security
 
-## Related topics
+{:.ref-header}
+Related topics
 
 [Architectural diagrams]({{page.baseurl}}/architecture/archi_perspectives/arch_diagrams.html)