- {% highlight nginx %}
-
-
+
+```conf
user nginx;
worker_processes 1;
@@ -129,14 +127,10 @@ stream {
proxy_pass dtr_80;
}
}
-
-
- {% endhighlight %}
+```
-
- {% highlight none %}
-
-
+ HAProxy
+```conf
global
log /dev/log local0
log /dev/log local1 notice
@@ -180,14 +174,10 @@ backend dtr_upstream_servers_443
server node01 :443 weight 100 check check-ssl verify none
server node02 :443 weight 100 check check-ssl verify none
server node03 :443 weight 100 check check-ssl verify none
-
-
- {% endhighlight %}
+```
-
- {% highlight json %}
-
-
+
@@ -263,9 +251,8 @@ You can deploy your load balancer using:
+```json
{
"Subnets": [
"subnet-XXXXXXXX",
@@ -249,9 +239,7 @@ backend dtr_upstream_servers_443
"GroupName": "XXXXXXXXXXXX"
}
}
-
-
- {% endhighlight %}
+```
-
- {% highlight none %}
-
+ / .
# Example:
$ docker build --tag my/repo .
diff --git a/engine/examples/postgresql_service.md b/engine/examples/postgresql_service.md
index e864ef22c0..cb7b0b2c3d 100644
--- a/engine/examples/postgresql_service.md
+++ b/engine/examples/postgresql_service.md
@@ -20,7 +20,7 @@ This PostgreSQL setup is for development-only purposes. Refer to the
PostgreSQL documentation to fine-tune these settings so that it is
suitably secure.
-```dockerfile
+```conf
#
# example Dockerfile for https://docs.docker.com/examples/postgresql_service/
#
diff --git a/engine/examples/running_redis_service.md b/engine/examples/running_redis_service.md
index 473971fb95..836daead93 100644
--- a/engine/examples/running_redis_service.md
+++ b/engine/examples/running_redis_service.md
@@ -12,7 +12,7 @@ using a link.
Firstly, we create a `Dockerfile` for our new Redis
image.
-```dockerfile
+```conf
FROM ubuntu:14.04
RUN apt-get update && apt-get install -y redis-server
EXPOSE 6379
diff --git a/engine/swarm/admin_guide.md b/engine/swarm/admin_guide.md
index e4a13569f7..a40eb27f52 100644
--- a/engine/swarm/admin_guide.md
+++ b/engine/swarm/admin_guide.md
@@ -338,7 +338,7 @@ If you lose the quorum of managers, you cannot administer the swarm. If you have
lost the quorum and you attempt to perform any management operation on the swarm,
an error occurs:
-```no-highlight
+```none
Error response from daemon: rpc error: code = 4 desc = context deadline exceeded
```
diff --git a/engine/userguide/eng-image/dockerfile_best-practices.md b/engine/userguide/eng-image/dockerfile_best-practices.md
index 79fd747a49..31ebdde1ae 100644
--- a/engine/userguide/eng-image/dockerfile_best-practices.md
+++ b/engine/userguide/eng-image/dockerfile_best-practices.md
@@ -163,7 +163,7 @@ are included inline.
must be escaped. If your string contains inner quote characters (`"`), escape
them as well.
-```dockerfile
+```conf
# Set one or more individual labels
LABEL com.example.version="0.0.1-beta"
LABEL vendor="ACME Incorporated"
diff --git a/engine/userguide/networking/work-with-networks.md b/engine/userguide/networking/work-with-networks.md
index 1f0b494acc..786ef45659 100644
--- a/engine/userguide/networking/work-with-networks.md
+++ b/engine/userguide/networking/work-with-networks.md
@@ -997,7 +997,7 @@ multi-host network, the daemon cannot clean up stale connectivity endpoints.
Such stale endpoints may cause an error if a new container is connected
to that network with the same name as the stale endpoint:
-```no-highlight
+```none
ERROR: Cannot start container bc0b19c089978f7845633027aa3435624ca3d12dd4f4f764b61eac4c0610f32e: container already connected to network multihost
```
diff --git a/landing.md b/landing.md
deleted file mode 100644
index 6b238a150d..0000000000
--- a/landing.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-description: Home page for Docker's documentation
-keywords: Docker, documentation, manual, guide, reference, api
-landing: true
-title: Docker Documentation
-notoc: true
----
-
-Docker packages your app with its dependencies, freeing you from worrying about your
-system configuration, and making your app more portable.
-
-
-
-
-## Components
-
diff --git a/opensource/project/test-and-docs.md b/opensource/project/test-and-docs.md
index ad06df7037..df63304cc2 100644
--- a/opensource/project/test-and-docs.md
+++ b/opensource/project/test-and-docs.md
@@ -95,7 +95,7 @@ hour. To run the test suite, do the following:
value on the basis of your host performance. When they complete
successfully, you see the output concludes with something like this:
- ```no-highlight
+ ```none
Ran 68 tests in 79.135s
```
diff --git a/swarm/scheduler/rescheduling.md b/swarm/scheduler/rescheduling.md
index 57c8f583e1..35a4c41334 100644
--- a/swarm/scheduler/rescheduling.md
+++ b/swarm/scheduler/rescheduling.md
@@ -42,7 +42,7 @@ docker logs SWARM_MANAGER_CONTAINER_ID
When a container is successfully rescheduled, it generates a message similar to
the following:
-```no-highlight
+```none
Rescheduled container 2536adb23 from node-1 to node-2 as 2362901cb213da321
Container 2536adb23 was running, starting container 2362901cb213da321
```
@@ -50,7 +50,7 @@ Container 2536adb23 was running, starting container 2362901cb213da321
If for some reason, the new container fails to start on the new node, the log
contains:
-```no-highlight
+```none
Failed to start rescheduled container 2362901cb213da321
```
diff --git a/test.md b/test.md
index 7ea3781a9a..7f0103b70e 100644
--- a/test.md
+++ b/test.md
@@ -160,9 +160,8 @@ This is also the case if you need to use rowspans or colspans. Try to avoid
setting styles directly on your tables! If you set the width on a ``, you
only need to do it on the first one. If you have a ` `, set it there.
-> **Note**: If you need to have **markdown** in a **HTML** table, you need to
-> capture the table and then filter it through `markdownify`. See [tabs](#tabs)
-> for an example. Here, I avoid that by using HTML throughout.
+> **Note**: If you need to have **markdown** in a **HTML** table, add
+> `markdown="1"` to the HTML for the ` ` cells that contain the Markdown.
+```conf
# Create the nginx.conf file, then
# deploy the load balancer
@@ -276,12 +263,10 @@ docker run --detach \
--publish 443:443 \
--volume ${PWD}/nginx.conf:/etc/nginx/nginx.conf:ro \
nginx:stable-alpine
-
- {% endhighlight %}
+```
-
- {% highlight none %}
-
+
diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md
index ce93728c0a..221dcc6cec 100644
--- a/docker-for-windows/troubleshoot.md
+++ b/docker-for-windows/troubleshoot.md
@@ -262,11 +262,11 @@ Windows containers without Docker for Windows. However, if you install Docker
this way, you cannot develop or run Linux containers. If you try to run a Linux
container on the native Docker daemon, an error occurs:
- ```no-highlight
+ ```none
C:\Program Files\Docker\docker.exe:
image operating system "linux" cannot be used on this platform.
See 'C:\Program Files\Docker\docker.exe run --help'.
- ```
+ ```
### Limitations of Windows containers for `localhost` and published ports
@@ -284,7 +284,7 @@ So, in a scenario where you use Docker to pull an image and run a webserver with
a command like this:
```
-docker run -d -p 80:80 --name webserver nginx
+docker run -d -p 80:80 --name webserver nginx
```
Using `curl http://localhost`, or pointing your web browser at
diff --git a/engine/examples/mongodb.md b/engine/examples/mongodb.md
index a214ddfa9f..e3edf44cb2 100644
--- a/engine/examples/mongodb.md
+++ b/engine/examples/mongodb.md
@@ -34,7 +34,7 @@ $ nano Dockerfile
Although optional, it is handy to have comments at the beginning of a
`Dockerfile` explaining its purpose:
-```dockerfile
+```conf
# Dockerizing MongoDB: Dockerfile for building MongoDB images
# Based on ubuntu:latest, installs MongoDB following the instructions from:
# http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
@@ -47,7 +47,7 @@ the *parent* of your *Dockerized MongoDB* image.
We will build our image using the latest version of Ubuntu from the
[Docker Hub Ubuntu](https://hub.docker.com/_/ubuntu/) repository.
-```dockerfile
+```conf
# Format: FROM repository[:version]
FROM ubuntu:latest
```
@@ -59,7 +59,7 @@ FROM ubuntu:latest
We will begin with importing the MongoDB public GPG key. We will also create
a MongoDB repository file for the package manager.
-```dockerfile
+```conf
# Installation:
# Import MongoDB public GPG key AND create a MongoDB list file
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927
@@ -69,21 +69,21 @@ RUN echo "deb http://repo.mongodb.org/apt/ubuntu $(cat /etc/lsb-release | grep D
After this initial preparation we can update our packages and install MongoDB.
-```dockerfile
+```conf
# Update apt-get sources AND install MongoDB
RUN apt-get update && apt-get install -y mongodb-org
```
> **Tip**: You can install a specific version of MongoDB by using a list of required packages with versions, e.g.:
>
-> ```dockerfile
+> ```conf
> RUN apt-get update && apt-get install -y mongodb-org=3.0.1 mongodb-org-server=3.0.1 mongodb-org-shell=3.0.1 mongodb-org-> mongos=3.0.1 mongodb-org-tools=3.0.1
```
MongoDB requires a data directory. Let's create it as the final step of our
installation instructions.
-```dockerfile
+```conf
# Create the MongoDB data directory
RUN mkdir -p /data/db
```
@@ -92,7 +92,7 @@ Lastly we set the `ENTRYPOINT` which will tell Docker to run `mongod` inside
the containers launched from our MongoDB image. And for ports, we will use
the `EXPOSE` instruction.
-```dockerfile
+```conf
# Expose port 27017 from the container to the host
EXPOSE 27017
@@ -110,7 +110,7 @@ With our `Dockerfile`, we can now build the MongoDB image using Docker. Unless
experimenting, it is always a good practice to tag Docker images by passing the
`--tag` option to `docker build` command.
-```dockerfile
+```conf
# Format: docker build --tag/-t
+```conf
# Create the haproxy.cfg file, then
# deploy the load balancer
@@ -293,8 +278,7 @@ docker run --detach \
--restart=unless-stopped \
--volume ${PWD}/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro \
haproxy:1.7-alpine haproxy -d -f /usr/local/etc/haproxy/haproxy.cfg
-
- {% endhighlight %}
+```
| -{% capture basics %} -### Learn the basics of Docker - -The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push, -and pull Docker images, and run them as containers. This -tutorial stops short of teaching you how to deploy applications. -{% endcapture %}{{ basics | markdownify }} - | -- -{% capture apps %} -### Define and deploy applications - -The define-and-deploy tutorial shows how to relate -containers to each other and define them as services in an application that is ready to deploy at scale in a -production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode. -{% endcapture %}{{ apps | markdownify }} - - |
| {% capture basics %}[Start the basic tutorial](/engine/getstarted/){: class="button primary-btn"}{% endcapture %}{{ basics | markdownify }} - | -{% capture apps %}[Start the application tutorial](/engine/getstarted-voting-app/){: class="button primary-btn"}{% endcapture %}{{ apps | markdownify }} - | -
-
diff --git a/learn.md b/learn.md
index d0c9e1e402..ac24fa2eaf 100644
--- a/learn.md
+++ b/learn.md
@@ -9,37 +9,27 @@ Docker workflows.
Components
-
-
-
-
-
-
-
-
-
- 
-
-
- Docker for Mac
-A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.
-
-
-
-
-
- 
-
-
- Docker for Windows
-A native Windows application which delivers all Docker tools to your Windows computer.
-
-
-
-
-
-
- 
-
-
- Docker for Linux
-Install Docker on a computer which already has a Linux distribution installed.
-
-
-
-
-
-
-
-
- 
-
-
-
-
- Docker Engine
-Create Docker images and run Docker containers. As of v1.12.0, Engine includes swarm mode container orchestration features.
-
-
-
-
- 
-
-
-
-
- Docker Cloud
-A hosted service for building, testing, and deploying Docker images to your hosts.
-
-
-
-
- 
-
-
-
-
- Docker Universal Control Plane
-(UCP) Manage a cluster of on-premises Docker hosts as if they were a single machine.
-
-
-
-
- 
-
-
-
-
- Docker Compose
-Define applications built using multiple containers.
-
-
-
-
- 
-
-
-
-
- Docker Hub
-A hosted registry service for managing and building images.
-
-
-
-
- 
-
-
-
-
- Docker Trusted Registry
-(DTR) stores and signs your images.
-
-
-
-
- 
-
-
-
-
- Docker Machine
-Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.
-| -{% capture basics %} + | ## Learn the basics of Docker The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push, and pull Docker images, and run them as containers. This tutorial stops short of teaching you how to deploy applications. -{% endcapture %}{{ basics | markdownify }} | -- -{% capture apps %} + | ## Define and deploy applications The define-and-deploy tutorial shows how to relate containers to each other and define them as services in an application that is ready to deploy at scale in a production environment. Highlights Compose Version 3 new features and swarm mode. -{% endcapture %}{{ apps | markdownify }} - |
| -{% capture basics %} + | [Start the basic tutorial](/engine/getstarted/){: class="button primary-btn"} -{% endcapture %}{{ basics | markdownify }} | --{% capture apps %} + | [Start the application tutorial](/engine/getstarted-voting-app/){: class="button primary-btn"} -{% endcapture %}{{ apps | markdownify }} |