Merge branch 'master' into name-change-for-Docker-Desktop

Author: paigehargrave

404.md

@@ -6,11 +6,5 @@ notoc: true
 tree: false
 ---
 
-It seems the page you're looking for doesn't exist. Maybe you're on the wrong
-track, maybe you found a broken link. Who knows?
-
-Either way, here's a couple of options for you:
-
-* [Open an issue](https://github.com/docker/docker.github.io/issues/new?title=I%20found%20a%20broken%20link&body=%3CDescribe%20how%20you%20got%20there%3E)
-* [Go to back](/)
-* [Tweet us something](https://twitter.com/docker)
+![https://docs.docker.com/](/images/404-docs.png)
+Please file an issue at [https://github.com/docker/docker.github.io](https://github.com/docker/docker.github.io/issues/new).

CONTRIBUTING.md

@@ -121,8 +121,5 @@ know.
 
 ## Style guide
 
-If you have questions about how to write for Docker's documentation, have a look
-at the [style guide](/opensource/doc-style/). The style
-guide provides guidance about grammar, syntax, formatting, styling, language, or
-tone. If something isn't clear in the guide, submit an issue to let us
-know or submit a pull request to help us improve it.
+Docker does not currently maintain a style guide. Use your best judgment, and 
+try to follow the example set by the existing documentation.

README.md

@@ -174,7 +174,8 @@ You have two options:
 
 To read the docs offline, you can use either a standalone container or a swarm service.
 To see all available tags, go to
-[Docker Hub](https://hub.docker.com/r/docs/docker.github.io/tags/).
+[Docker Hub](https://docs.docker.com/docker-hub/).
+
 The following examples use the `latest` tag:
 
 - Run a single container:
@@ -197,7 +198,7 @@ Either way, you can now access the docs at port 4000 on your Docker host.
 
 - `/_data/toc.yaml` defines the left-hand navigation for the docs
 - `/js/menu.js` defines most of the docs-specific JS such as TOC generation and menu syncing
-- `/css/documentation.css` defines the docs-specific style rules
+- `/css/style.scss` defines the docs-specific style rules
 - `/_layouts/docs.html` is the HTML template file, which defines the header and footer, and includes all the JS/CSS that serves the docs content
 
 ## Relative linking for GitHub viewing

_config.yml

@@ -23,7 +23,7 @@ latest_stable_docker_engine_api_version: "1.39"
 docker_ce_stable_version: "18.09"
 docker_ce_edge_version: "18.09"
 docker_ee_version: "18.09"
-compose_version: "1.23.1"
+compose_version: "1.23.2"
 machine_version: "0.16.0"
 distribution_version: "2.6"
 dtr_version: "2.6"

_data/toc.yaml

@@ -487,6 +487,8 @@ guides:
       title: NIST SP 800-53
     - path: /compliance/nist/800_190/
       title: NIST SP 800-190
+    - path: /compliance/nist/fips140_2/
+      title: FIPS 140-2
     - path: /compliance/nist/nistir_8176/
       title: NISTIR 8176
     - path: /compliance/nist/itl_october2017/
@@ -526,9 +528,6 @@ reference:
   - title: Compose file reference
     path: /compose/compose-file/
     nosync: true
-  - title: Cloud stack file reference
-    path: /docker-cloud/apps/stack-yaml-reference/
-    nosync: true
 
 - sectiontitle: Command-Line Interfaces (CLIs)
   section:
@@ -2489,8 +2488,10 @@ manuals:
             path: /ee/dtr/admin/configure/deploy-caches/
           - title: Cache deployment strategy
             path: /ee/dtr/admin/configure/deploy-caches/strategy/
-          - title: Deploy a DTR cache
+          - title: Deploy a DTR cache with Docker Swarm
             path: /ee/dtr/admin/configure/deploy-caches/simple/
+          - title: Deploy a DTR cache with Kubernetes
+            path: /ee/dtr/admin/configure/deploy-caches/simple-kube/
           - title: Configure caches for high availability
             path: /ee/dtr/admin/configure/deploy-caches/high-availability/
           - title: Cache configuration reference

_includes/content/compose-extfields-sub.md

@@ -9,7 +9,7 @@ your Compose file and their name start with the `x-` character sequence.
 > of service, volume, network, config and secret definitions.
 
 ```none
-version: '2.1'
+version: '3.4'
 x-custom:
   items:
     - a

_includes/kubernetes-mac-win.md

@@ -13,7 +13,7 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %}
   {% assign product = "Docker Desktop for Mac" %}
 
   {% capture min-version %}{{ product }} **17.12 CE Edge**{% endcapture %}
-  
+
   {% capture version-caveat %}
   Kubernetes is available in {{ min-version }} and higher, and **18.06 Stable** and higher
   {% endcapture%}
@@ -88,25 +88,32 @@ Run `kubectl get services -n my-app` to see only the services deployed in the
 ### Override the default orchestrator
 
 While testing Kubernetes, you may want to deploy some workloads in swarm mode.
-Use the `DOCKER_ORCHESTRATOR` variable to override the default orchestrator for
+Use the `DOCKER_STACK_ORCHESTRATOR` variable to override the default orchestrator for
 a given terminal session or a single Docker command. This variable can be unset
 (the default, in which case Kubernetes is the orchestrator) or set to `swarm` or
 `kubernetes`. The following command overrides the orchestrator for a single
 deployment, by setting the variable{% if platform == "mac"" %}
 at the start of the command itself.
 
 ```bash
-DOCKER_ORCHESTRATOR=swarm docker stack deploy --compose-file /path/to/docker-compose.yml mystack
+DOCKER_STACK_ORCHESTRATOR=swarm docker stack deploy --compose-file /path/to/docker-compose.yml mystack
 ```{% elsif platform == "windows" %}
 before running the command.
 
 ```shell
-set DOCKER_ORCHESTRATOR=swarm
+set DOCKER_STACK_ORCHESTRATOR=swarm
 docker stack deploy --compose-file /path/to/docker-compose.yml mystack
 ```
 
 {% endif %}
 
+Alternatively, the `--orchestrator` flag may be set to `swarm` or `kubernetes`
+when deploying to override the default orchestrator for that deployment.
+
+```bash
+docker stack deploy --orchestrator swarm --compose-file /path/to/docker-compose.yml mystack
+```
+
 > **Note**: Deploying the same app in Kubernetes and swarm mode may lead to
 > conflicts with ports and service names.
 

_includes/toc_pure_liquid.html

@@ -2,7 +2,7 @@
     {% comment %}
         "...like all things liquid - where there's a will, and ~36 hours to spare, there's usually a/some way" ~jaybe
         Usage:
-            {% include toc_pure_liquid.html html=content sanitize=true class="inline_toc" id="my_toc" toc_min=2 toc_max=3 my_name="unnamed" %}
+            {% include toc_pure_liquid.html html=content sanitize=true class="inline_toc" id="my_toc" toc_min=2 toc_max=3 %}
 
         Variables:
             * html (string) - the HTML of compiled markdown generated by kramdown in Jekyll
@@ -11,7 +11,6 @@
             * id (string) - an ID to assigned to the TOC
             * toc_min (int) - the minimum TOC header level to use (if not set, check page, then site, then default to 2)
             * toc_max (int) - the maximum TOC header level to use (if not set, check page, then site, then default to 3)
-            * page_name (string) - the URL of the page
 
         Output:
             An unordered list representing the table of contents of a markdown block. This snippet will only generate the table of contents and will NOT output the markdown given to it
@@ -20,7 +19,6 @@
     {% capture my_toc %}{% endcapture %}
     {% assign minHeader = include.toc_min | default: 2 %}
     {% assign maxHeader = include.toc_max | default: 3 %}
-    {% assign my_name = include.page_name | default: "unnamed" %}
     {% assign nodes = include.html | split: '<h' %}
 
     {% for node in nodes %}
@@ -53,7 +51,7 @@
         {% endfor %}
 
         {% capture my_toc %}{{ my_toc }}
-{{ space }}- [{% if include.sanitize %}{{ header | strip_html }}{% else %}{{ header }}{% endif %}]({{ my_name }}#{{ html_id }}){: class="nomunge" }{% endcapture %}
+{{ space }}- [{% if include.sanitize %}{{ header | strip_html }}{% else %}{{ header }}{% endif %}](#{{ html_id }}){: class="nomunge" }{% endcapture %}
 
     {% endfor %}
 

_scss/_navigation.scss

@@ -94,6 +94,11 @@
 *
 */
 
+// Some links don't have 'href' attr, hence no mouse pointer
+.nav-sidebar li a {
+    cursor: pointer;
+}
+
 .nav-sidebar>li>a {
     padding-right: 20px;
     padding-left: 20px;