Merge pull request #462 from mstanleyjones/vnext-compose2

Merge master into vnext-compose

docs/architecture.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Architecture

docs/configuration.md

@@ -748,7 +748,8 @@ interpretation of the options.
       no
     </td>
     <td>
-      Specify a `duration` by providing an integer and a unit. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. For example, `3000s` is a valid duration; there should be no space between the integer and unit. If you do not specify a `duration` or specify an integer without a time unit, this defaults to 20 minutes.
+      {% capture text %}Specify a `duration` by providing an integer and a unit. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. For example, `3000s` is a valid duration; there should be no space between the integer and unit. If you do not specify a `duration` or specify an integer without a time unit, this defaults to 20 minutes.{% endcapture %}
+      {{ text | markdownify }}
     </td>
   </tr>
 </table>
@@ -1831,7 +1832,7 @@ conjunction with the S3 storage driver.
     <td>The storage middleware name. Currently <code>cloudfront</code> is an accepted value.</td>
   </tr>
   <tr>
-    <td><code>disabled<code></td>
+    <td><code>disabled</code></td>
     <td>Set to <code>false</code> to easily disable the middleware.</td>
   </tr>
   <tr>
@@ -1860,7 +1861,6 @@ The following example illustrates these values:
                  keypairid: asecret
                  duration: 60
 
-
 >**Note**: Cloudfront keys exist separately to other AWS keys.  See
 >[the documentation on AWS credentials](http://docs.aws.amazon.com/general/latest/gr/aws-security-credentials.html)
 >for more information.

docs/glossary.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Glossary

docs/index.md

@@ -30,7 +30,7 @@ You should use the Registry if you want to:
 
 Users looking for a zero maintenance, ready-to-go solution are encouraged to head-over to the [Docker Hub](https://hub.docker.com), which provides a free-to-use, hosted Registry, plus additional features (organization accounts, automated builds, and more).
 
-Users looking for a commercially supported version of the Registry should look into [Docker Trusted Registry](https://docs.docker.com/docker-trusted-registry/overview/).
+Users looking for a commercially supported version of the Registry should look into [Docker Trusted Registry](/docker-trusted-registry/overview/).
 
 ## Requirements
 

docs/menu.md

@@ -1,23 +0,0 @@
----
-description: High-level overview of the Registry
-keywords:
-- registry, on-prem, images, tags, repository, distribution
-menu:
-  main:
-    identifier: smn_registry
-    parent: mn_components
-title: Docker Registry
-type: menu
----
-
-# Overview of Docker Registry Documentation
-
-The Docker Registry documentation includes the following topics:
-
-* [Docker Registry Introduction](index.md)
-* [Understanding the Registry](introduction.md)
-* [Deploying a registry server](deploying.md)
-* [Registry Configuration Reference](configuration.md)
-* [Notifications](notifications.md)
-* [Recipes](recipes/index.md)
-* [Getting help](help.md)

docs/migration.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Migrating a 1.0 registry to 2.0

docs/recipes/index.md

@@ -33,5 +33,5 @@ At this point, it's assumed that:
 
  * [using Apache as an authenticating proxy](apache.md)
  * [using Nginx as an authenticating proxy](nginx.md)
- * [running a Registry on OS X](osx-setup-guide.md)
+ * [running a Registry on macOS](osx-setup-guide.md)
  * [mirror the Docker Hub](mirror.md)

docs/recipes/menu.md

@@ -1,21 +0,0 @@
----
-description: Registry Recipes
-keywords:
-- registry, on-prem, images, tags, repository, distribution
-menu:
-  main:
-    identifier: smn_recipes
-    parent: smn_registry
-    weight: 6
-title: Recipes
-type: menu
----
-
-# Recipes
-
-## The List
-
- * [using Apache as an authenticating proxy](apache.md)
- * [using Nginx as an authenticating proxy](nginx.md)
- * [running a Registry on OS X](osx-setup-guide.md)
- * [mirror the Docker Hub](mirror.md)

docs/recipes/mirror.md

@@ -62,6 +62,8 @@ In order to access private images on the Docker Hub, a username and password can
 
 > :warn: if you specify a username and password, it's very important to understand that private resources that this user has access to on the Hub will be made available on your mirror. It's thus paramount that you secure your mirror by implementing authentication if you expect these resources to stay private!
 
+> :warn: in order for the scheduler to clean up old entries, delete must be enabled in the registry configuration.  See the [Registry Configuration Reference](../configuration.md) for more details.
+
 ### Configuring the Docker daemon
 
 You will need to pass the `--registry-mirror` option to your Docker daemon on startup:

docs/recipes/osx-setup-guide.md

@@ -1,32 +1,32 @@
 ---
-description: Explains how to run a registry on OS X
+description: Explains how to run a registry on macOS
 keywords:
-- registry, on-prem, images, tags, repository, distribution, OS X, recipe, advanced
+- registry, on-prem, images, tags, repository, distribution, macOS, recipe, advanced
 menu:
   main:
     parent: smn_recipes
-title: Running on OS X
+title: Running on macOS
 ---
 
-# OS X Setup Guide
+# macOS Setup Guide
 
 ## Use-case
 
-This is useful if you intend to run a registry server natively on OS X.
+This is useful if you intend to run a registry server natively on macOS.
 
 ### Alternatives
 
-You can start a VM on OS X, and deploy your registry normally as a container using Docker inside that VM.
+You can start a VM on macOS, and deploy your registry normally as a container using Docker inside that VM.
 
 The simplest road to get there is traditionally to use the [docker Toolbox](https://www.docker.com/toolbox), or [docker-machine](/machine/index.md), which usually relies on the [boot2docker](http://boot2docker.io/) iso inside a VirtualBox VM.
 
 ### Solution
 
-Using the method described here, you install and compile your own from the git repository and run it as an OS X agent.
+Using the method described here, you install and compile your own from the git repository and run it as an macOS agent.
 
 ### Gotchas
 
-Production services operation on OS X is out of scope of this document. Be sure you understand well these aspects before considering going to production with this.
+Production services operation on macOS is out of scope of this document. Be sure you understand well these aspects before considering going to production with this.
 
 ## Setup golang on your machine
 

docs/spec/implementations.md

@@ -1,5 +1,5 @@
 ---
-draft: true
+published: false
 ---
 
 # Distribution API Implementations

docs/spec/json.md

@@ -1,6 +1,6 @@
 ---
 description: Explains registry JSON objects
-draft: true
+published: false
 keywords:
 - registry, service, images, repository,  json
 menu:

docs/spec/menu.md

@@ -1,15 +0,0 @@
----
-description: Explains registry JSON objects
-keywords:
-- registry, service, images, repository,  json
-menu:
-  main:
-    identifier: smn_registry_ref
-    parent: smn_registry
-    weight: 7
-title: Reference
-type: menu
----
-
-<![end-metadata]-->
-

docs/storage-drivers/menu.md

@@ -1,15 +0,0 @@
----
-description: Storage Drivers
-keywords:
-- registry, on-prem, images, tags, repository, distribution
-menu:
-  main:
-    identifier: smn_storagedrivers
-    parent: smn_registry
-    weight: 7
-title: Storage Drivers
-type: menu
----
-
-<![end-metadata]-->
-