diff --git a/get-docker.md b/get-docker.md index a9e0f83097..9df420b250 100644 --- a/get-docker.md +++ b/get-docker.md @@ -10,9 +10,15 @@ redirect_from: --- -Docker is an open platform for developing, shipping, and running applications. Docker enables you to separate your applications from your infrastructure so you can deliver software quickly. With Docker, you can manage your infrastructure in the same ways you manage your applications. By taking advantage of Docker’s methodologies for shipping, testing, and deploying code quickly, you can significantly reduce the delay between writing code and running it in production. +Docker is an open platform for developing, shipping, and running applications. +Docker enables you to separate your applications from your infrastructure so you +can deliver software quickly. With Docker, you can manage your infrastructure in +the same ways you manage your applications. By taking advantage of Docker’s +methodologies for shipping, testing, and deploying code quickly, you can +significantly reduce the delay between writing code and running it in production. -You can download and install Docker on multiple platforms. Refer to the following section and choose the best installation path for you. +You can download and install Docker on multiple platforms. Refer to the following +section and choose the best installation path for you.
@@ -20,27 +26,27 @@ You can download and install Docker on multiple platforms. Refer to the followin
- Docker Desktop for Mac + Docker Desktop for Mac
-

Docker Desktop for Mac

+

Docker Desktop for Mac

A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.

- Docker Desktop for Windows + Docker Desktop for Windows
-

Docker Desktop for Windows

+

Docker Desktop for Windows

A native Windows application which delivers all Docker tools to your Windows computer.

- Docker for Linux + Docker for Linux
-

Docker for Linux

+

Docker for Linux

Install Docker on a computer which already has a Linux distribution installed.

diff --git a/index.md b/index.md index 4df932d012..5f564f62e0 100644 --- a/index.md +++ b/index.md @@ -25,27 +25,27 @@ production servers in the cloud. Total reading time is less than an hour.
- Docker Desktop for Mac + Docker Desktop for Mac
-

Docker Desktop for Mac

+

Docker Desktop for Mac

A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.

- Docker Desktop for Windows + Docker Desktop for Windows
-

Docker Desktop for Windows

+

Docker Desktop for Windows

A native Windows application which delivers all Docker tools to your Windows computer.

- Docker for Linux + Docker for Linux
-

Docker for Linux

+

Docker for Linux

Install Docker on a computer which already has a Linux distribution installed.

diff --git a/notary/reference/client-config.md b/notary/reference/client-config.md index 7fc29fadd9..56b825473d 100644 --- a/notary/reference/client-config.md +++ b/notary/reference/client-config.md @@ -22,14 +22,14 @@ JSON keys to learn more about the configuration section corresponding to that ke 
{
-  "trust_dir" : "~/.docker/trust",
-  "remote_server": {
+  "trust_dir" : "~/.docker/trust",
+  "remote_server": {
     "url": "https://my-notary-server.my-private-registry.com",
     "root_ca": "./fixtures/root-ca.crt",
     "tls_client_cert": "./fixtures/secure.example.com.crt",
     "tls_client_key": "./fixtures/secure.example.com.crt"
   },
-  "trust_pinning": {
+  "trust_pinning": {
     "certs": {
       "docker.com/notary": ["49cf5c6404a35fa41d5a5aa2ce539dfee0d7a2176d0da488914a38603b1f4292"]
     }
diff --git a/registry/glossary.md b/registry/glossary.md
index 2eb1626a28..b07cfc0c36 100644
--- a/registry/glossary.md
+++ b/registry/glossary.md
@@ -11,7 +11,7 @@ This page contains definitions for distribution related terms.
 	

       
A blob is any kind of content that is stored by a Registry under a content-addressable identifier (a "digest").

       

-      	Layers are a good example of "blobs".
+      	Layers are a good example of "blobs".
       

 	

 
@@ -19,9 +19,9 @@ This page contains definitions for distribution related terms.
 	

       
An image is a named set of immutable data from which a Docker container can be created.

       

-      An image is represented by a json file called a manifest, and is conceptually a set of layers.
+      An image is represented by a json file called a manifest, and is conceptually a set of layers.
 
-      Image names indicate the location where they can be pulled from and pushed to, as they usually start with a registry domain name and port.
+      Image names indicate the location where they can be pulled from and pushed to, as they usually start with a registry domain name and port.
 
       

     

@@ -30,7 +30,7 @@ This page contains definitions for distribution related terms.
 	

 	
A layer is a tar archive bundling partial content from a filesystem.

 	

-	Layers from an image are usually extracted in order on top of each other to make up a root filesystem from which containers run out.
+	Layers from an image are usually extracted in order on top of each other to make up a root filesystem from which containers run out.
 	

 	

 
@@ -45,7 +45,7 @@ This page contains definitions for distribution related terms.
 	
 
 	
Registry

-	
A registry is a service that let you store and deliver images.

+	
A registry is a service that let you store and deliver images.

 	

 
 	
Repository

@@ -57,7 +57,7 @@ This page contains definitions for distribution related terms.
 	
A scope is the portion of a namespace onto which a given authorization token is granted.

 
 	
Tag

-	
A tag is conceptually a "version" of a named image.

+	
A tag is conceptually a "version" of a named image.

 	

 	Example: `docker pull myimage:latest` instructs docker to pull the image "myimage" in version "latest".