Merge small-changes branch into master (#8418)

* Use "jekyll/jekyll:3.8.6" so it is locked, rather than "latest", refs #8370 * Update README.md * Updated the linux kernel info in software pgae * added a missing code-fence * fixed lint * fixed lint * Apply suggestions from code review Co-authored-by: Barny Shergold <barny.shergold@vaimo.com> * shipment-email-notify (#8399) * shipment-email-notify * Update order-create-shipment.md Co-authored-by: Julian van den Berkmortel <julian@weprovide.com> Co-authored-by: hguthrie <hguthrie@users.noreply.github.com> Co-authored-by: CJ <cperumal@ztech.io> Co-authored-by: Sathiya Prakash <Sathiya.Prakash@gds.ey.com> Co-authored-by: chiranjeevi <52098385+chiranjeevi-cj@users.noreply.github.com> Co-authored-by: Barny Shergold <barny.shergold@vaimo.com> Co-authored-by: Jeff Matthews <matthews.jeffery@gmail.com> Co-authored-by: Rakesh Jesadiya <jesadiya.rakesh@gmail.com>
magento · Dec 18, 2020 · dec2142 · dec2142
1 parent 97998f2
commit dec2142
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This site is built by [Jekyll](https://jekyllrb.com/), which is an open-source t
 You can build the site locally in the following ways:
 
 -  [Installing the project dependencies locally](#build-locally) (Mac, Linux)
--  [Using Docker (docker-compose)](#docker-docker-compose) (Mac, Linux, Windows)
+-  [Using Docker (docker-compose)](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker) (Mac, Linux, Windows)
 -  [Using a Vagrant virtual machine](https://github.com/magento-devdocs/vagrant-for-magento-devdocs) (Mac, Linux, Windows)
 -  [Build DevDocs in Windows](https://github.com/magento/devdocs/wiki/Build-DevDocs-in-Windows) (Windows 7 & 10)
 -  [Building older versions of the documentation](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker)

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   jekyll:
-    image: jekyll/jekyll:latest
+    image: jekyll/jekyll:3.8.6
     command: jekyll serve --watch --incremental --open-url --livereload
     ports:
       - 4000:4000

diff --git a/src/guides/v2.3/javascript-dev-guide/javascript/js_init.md b/src/guides/v2.3/javascript-dev-guide/javascript/js_init.md
@@ -44,6 +44,7 @@ Consider the example of adding a custom carousel JS:
             $(element).<carousel_name>(config);
         };
     });
+   ```
 
 1. Add the RequireJS config to the `app/design/frontend/<package_name>/<theme_name>/requirejs-config.js` file.
 

diff --git a/src/guides/v2.3/performance-best-practices/software.md b/src/guides/v2.3/performance-best-practices/software.md
@@ -24,10 +24,12 @@ See [Magento 2.2.x technology stack requirements]({{page.baseurl}}/install-gde/s
 
 ## Operating system
 
-Operating system configurations and optimizations are similar for Magento as other high-load web applications. As the number of concurrent connections handled by the server increases, the number of available sockets can become fully allocated. The Linux kernel supports a mechanism to "reuse" and "recycle" TCP connections. Be aware that more aggressive recycling than re-use may cause issues on the load balancers. To enable these kernel settings, set the following values in `/etc/sysctl.conf`:
+Operating system configurations and optimizations are similar for Magento as compared to other high-load web applications. As the number of concurrent connections handled by the server increases, the number of available sockets can become fully allocated. The Linux kernel supports a mechanism to "reuse" TCP connections. To enable this mechanism, set the following value in `/etc/sysctl.conf`:
+
+{:.bs-callout-info}
+Enabling net.ipv4.tcp_tw_reuse has no effect on incoming connections.
 
 ```terminal
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.tcp_tw_reuse = 1
 ```
 

diff --git a/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md b/src/guides/v2.3/rest/tutorials/orders/order-create-shipment.md
@@ -37,7 +37,7 @@ where `3` is the order id.
 
 **Payload:**
 
-The `tracks` array optionally allows you to include one or more tracking numbers for the [shipment](https://glossary.magento.com/shipment).
+The `notify` field is used to trigger Magento to send the shipment email. The `tracks` array optionally allows you to include one or more tracking numbers for the [shipment](https://glossary.magento.com/shipment).
 
 {% collapsible Show code sample %}
 
@@ -57,6 +57,7 @@ The `tracks` array optionally allows you to include one or more tracking numbers
       "qty": 1
     }
   ],
+  "notify": true,
   "tracks": [
     {
       "track_number": "1Y-9876543210",
@@ -75,4 +76,4 @@ A shipment ID, such as `3`.
 
 ## Verify this step
 
-Log in to [Admin](https://glossary.magento.com/admin). Click **Sales** > **Shipments**. The shipment is displayed in the grid. Then click **Sales** > **Orders**. The status is Complete.
+Log in to [Admin](https://glossary.magento.com/admin). Click **Sales** > **Shipments**. The shipment is displayed in the grid. Then click **Sales** > **Orders**. The order status is Complete.
diff --git a/src/guides/v2.4/performance-best-practices/software.md b/src/guides/v2.4/performance-best-practices/software.md
@@ -24,10 +24,12 @@ See [Magento technology stack requirements]({{page.baseurl}}/install-gde/system-
 
 ## Operating system
 
-Operating system configurations and optimizations are similar for Magento as other high-load web applications. As the number of concurrent connections handled by the server increases, the number of available sockets can become fully allocated. The Linux kernel supports a mechanism to "reuse" and "recycle" TCP connections. Be aware that more aggressive recycling than re-use may cause issues on the load balancers. To enable these kernel settings, set the following values in `/etc/sysctl.conf`:
+Operating system configurations and optimizations are similar for Magento as compared to other high-load web applications. As the number of concurrent connections handled by the server increases, the number of available sockets can become fully allocated. The Linux kernel supports a mechanism to "reuse" TCP connections. To enable this mechanism, set the following value in `/etc/sysctl.conf`:
+
+{:.bs-callout-info}
+Enabling net.ipv4.tcp_tw_reuse has no effect on incoming connections.
 
 ```terminal
-net.ipv4.tcp_tw_recycle = 1
 net.ipv4.tcp_tw_reuse = 1
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ Consider the example of adding a custom carousel JS: @@
                 $(element).<carousel_name>(config);
             };
         });
+       ```
 . Add the RequireJS config to the `app/design/frontend/<package_name>/<theme_name>/requirejs-config.js` file.
@@ Expand Down @@