Merge branch 'master' into consolidation-changes

Author: Jeffrey Morgan

apidocs/cloud-api-source/Gemfile.lock

@@ -0,0 +1,140 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.1.11)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    autoprefixer-rails (5.2.0.1)
+      execjs
+      json
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.4)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.9.1.1)
+    compass (1.0.3)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    erubis (2.7.0)
+    execjs (2.5.2)
+    ffi (1.9.8)
+    haml (4.0.6)
+      tilt
+    hike (1.2.3)
+    hitimes (1.2.2)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
+    i18n (0.7.0)
+    json (1.8.3)
+    kramdown (1.7.0)
+    libv8 (3.16.14.7)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    middleman (3.3.12)
+      coffee-script (~> 2.2)
+      compass (>= 1.0.0, < 2.0.0)
+      compass-import-once (= 1.0.5)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-core (= 3.3.12)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-autoprefixer (2.4.4)
+      autoprefixer-rails (~> 5.2.0)
+      middleman-core (>= 3.3.3)
+    middleman-core (3.3.12)
+      activesupport (~> 4.1.0)
+      bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.7.0)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
+      thor (>= 0.15.2, < 2.0)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-gh-pages (0.0.3)
+      rake (> 0.9.3)
+    middleman-sprockets (3.4.2)
+      middleman-core (>= 3.3)
+      sprockets (~> 2.12.1)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.3.0)
+    middleman-syntax (2.0.0)
+      middleman-core (~> 3.2)
+      rouge (~> 1.0)
+    minitest (5.7.0)
+    multi_json (1.11.1)
+    padrino-helpers (0.12.5)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.5)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.5)
+      activesupport (>= 3.1)
+    rack (1.6.11)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.5)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.3.2)
+    ref (1.0.5)
+    rouge (1.9.0)
+    sass (3.4.14)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.3.1)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.13)
+    uglifier (2.7.1)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  middleman (~> 3.3.10)
+  middleman-autoprefixer (~> 2.4.4)
+  middleman-gh-pages (~> 0.0.3)
+  middleman-syntax (~> 2.0.0)
+  rake (~> 10.4.2)
+  redcarpet (~> 3.3.2)
+  rouge (~> 1.9.0)
+  therubyracer (~> 0.12.1)

datacenter/dtr/2.3/guides/admin/configure/external-storage/nfs.md

@@ -31,7 +31,7 @@ mkdir /tmp/mydir && sudo mount -t nfs <nfs server>:<directory>
 One way to configure DTR to use an NFS directory is at install time:
 
 ```none
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version }} install \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} install \
   --nfs-storage-url <nfs-storage-url> \
   <other options>
 ```
@@ -50,15 +50,15 @@ If you want to start using the new DTR built-in support for NFS you can
 reconfigure DTR:
 
 ```none
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version }} reconfigure \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} reconfigure \
   --nfs-storage-url <nfs-storage-url>
 ```
 
 If you want to reconfigure DTR to stop using NFS storage, leave the option
 in blank:
 
 ```none
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version}} reconfigure \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version}} reconfigure \
   --nfs-storage-url ""
 ```
 

datacenter/dtr/2.5/guides/index.md

@@ -21,9 +21,9 @@ firewall.
 You can use DTR as part of your continuous integration, and continuous
 delivery processes to build, ship, and run your applications.
 
-DTR has a web based user interface that allows authorized users in your
-organization to browse docker images. It provides information about
-who pushed what image at what time. It even allows you to see what dockerfile
+DTR has a web user interface that allows authorized users in your
+organization to browse Docker images. It provides information about
+who pushed what image at what time. It even allows you to see what Dockerfile
 lines were used to produce the image and, if security scanning is enabled, to
 see a list of all of the software installed in your images.
 
@@ -35,27 +35,27 @@ and metadata such that if a machine fails, DTR continues to operate and can be r
 ## Efficiency
 
 DTR has the ability to [cache images closer to users](admin/configure/deploy-caches/index.md)
-to reduce the amount of bandwidth used during docker pulls.
+to reduce the amount of bandwidth used when pulling Docker images.
 
 DTR has the ability to [clean up unreferenced manifests and layers](admin/configure/garbage-collection.md).
 
 ## Built-in access control
 
 DTR uses the same authentication mechanism as Docker Universal Control Plane.
-Users can be managed manually or synched from LDAP or Active Directory. DTR
+Users can be managed manually or synchronized from LDAP or Active Directory. DTR
 uses [Role Based Access Control](admin/manage-users/index.md) (RBAC) to allow you to implement fine-grained
-access control policies for who has access to your Docker images.
+access control policies for your Docker images.
 
 ## Security scanning
 
-DTR has a built in security scanner that can be used to discover what versions
+DTR has a built-in security scanner that can be used to discover what versions
 of software are used in your images. It scans each layer and aggregates the
 results to give you a complete picture of what you are shipping as a part of
-your stack. Most importantly, it co-relates this information with a
-vulnerability database that is kept up to date through
-[periodic updates](admin/configure/set-up-vulnerability-scans.md). This
-gives you
-[unprecedented insight into your exposure to known security threats](user/manage-images/scan-images-for-vulnerabilities.md).
+your stack. Most importantly, it correlates this information with a
+vulnerability database that is kept up to date through [periodic
+updates](admin/configure/set-up-vulnerability-scans.md). This
+gives you [unprecedented insight into your exposure to known security
+threats](user/manage-images/scan-images-for-vulnerabilities.md).
 
 ## Image signing
 
@@ -69,3 +69,4 @@ the [DTR-specific notary documentation](user/manage-images/sign-images/index.md)
 
 * [DTR architecture](architecture.md)
 * [Install DTR](admin/install/index.md)
+

ee/dtr/admin/configure/external-storage/nfs.md

@@ -31,7 +31,7 @@ mkdir /tmp/mydir && sudo mount -t nfs <nfs server>:<directory> /tmp/mydir
 One way to configure DTR to use an NFS directory is at install time:
 
 ```bash
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version }} install \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} install \
   --nfs-storage-url <nfs-storage-url> \
   <other options>
 ```
@@ -51,15 +51,15 @@ To take advantage of the new DTR built-in support for NFS, you can
 reconfigure DTR to use NFS:
 
 ```bash
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version }} reconfigure \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} reconfigure \
   --nfs-storage-url <nfs-storage-url>
 ```
 
 To reconfigure DTR to stop using NFS storage, leave the `--nfs-storage-url` option
 blank:
 
 ```bash
-docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ dtr_version}} reconfigure \
+docker run -it --rm {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version}} reconfigure \
   --nfs-storage-url ""
 ```
 

ee/dtr/admin/monitor-and-troubleshoot/index.md

@@ -41,10 +41,10 @@ replicas.
 
 ## Cluster status
 
-The `/api/v0/meta/cluster_status` [endpoint](/reference/dtr/2.5/api/)
-requires administrator credentials, and returns a JSON object for the entire
-cluster as observed by the replica being queried. You can authenticate your
-requests using HTTP basic auth.
+The `/api/v0/meta/cluster_status` [endpoint](/reference/dtr/{{ site.dtr_version
+}}/api/) requires administrator credentials, and returns a JSON object for the
+entire cluster as observed by the replica being queried. You can authenticate
+your requests using HTTP basic auth.
 
 ```bash
 curl -ksL -u <user>:<pass> https://<dtr-domain>/api/v0/meta/cluster_status
@@ -72,4 +72,4 @@ troubleshoot, try [troubleshooting using logs](troubleshoot-with-logs.md).
 
 ## Where to go next
 
-- [Troubleshoot with logs](troubleshoot-with-logs.md)
+- [Troubleshoot with logs](troubleshoot-with-logs.md)

ee/dtr/index.md

@@ -8,7 +8,7 @@ Docker Trusted Registry (DTR) is the enterprise-grade image storage solution
 from Docker. You install it behind your firewall so that you can securely store
 and manage the Docker images you use in your applications.
 
-## Image management
+## Image and job management
 
 DTR can be installed on-premises, or on a virtual private
 cloud. And with it, you can store your Docker images securely, behind your
@@ -17,11 +17,10 @@ firewall.
 You can use DTR as part of your continuous integration, and continuous
 delivery processes to build, ship, and run your applications.
 
-DTR has a web based user interface that allows authorized users in your
-organization to browse docker images. It provides information about
-who pushed what image at what time. It even allows you to see what dockerfile
+DTR has a web user interface that allows authorized users in your
+organization to browse Docker images and [review repository events](/ee/dtr/user/audit-repository-events/). It even allows you to see what Dockerfile
 lines were used to produce the image and, if security scanning is enabled, to
-see a list of all of the software installed in your images.
+see a list of all of the software installed in your images. Additionally, you can now [review and audit jobs on the web interface](/ee/dtr/admin/manage-jobs/audit-jobs-via-ui/).
 
 ## Availability
 
@@ -31,23 +30,23 @@ and metadata such that if a machine fails, DTR continues to operate and can be r
 ## Efficiency
 
 DTR has the ability to [cache images closer to users](admin/configure/deploy-caches/index.md)
-to reduce the amount of bandwidth used during docker pulls.
+to reduce the amount of bandwidth used when pulling Docker images.
 
 DTR has the ability to [clean up unreferenced manifests and layers](admin/configure/garbage-collection.md).
 
 ## Built-in access control
 
 DTR uses the same authentication mechanism as Docker Universal Control Plane.
-Users can be managed manually or synched from LDAP or Active Directory. DTR
+Users can be managed manually or synchronized from LDAP or Active Directory. DTR
 uses [Role Based Access Control](admin/manage-users/index.md) (RBAC) to allow you to implement fine-grained
-access control policies for who has access to your Docker images.
+access control policies for your Docker images.
 
 ## Security scanning
 
-DTR has a built in security scanner that can be used to discover what versions
+DTR has a built-in security scanner that can be used to discover what versions
 of software are used in your images. It scans each layer and aggregates the
 results to give you a complete picture of what you are shipping as a part of
-your stack. Most importantly, it co-relates this information with a
+your stack. Most importantly, it correlates this information with a
 vulnerability database that is kept up to date through [periodic
 updates](admin/configure/set-up-vulnerability-scans.md). This
 gives you [unprecedented insight into your exposure to known security

ee/dtr/release-notes.md

@@ -30,7 +30,7 @@ to upgrade your installation to the latest release.
 * Web Interface
   * Online garbage collection is no longer an experimental feature. Users can now write to DTR and push images during garbage collection. [Learn about garbage collection](/ee/dtr/admin/configure/garbage-collection/).
   * Repository admins can now enable tag pruning for every repository that they manage by adding a pruning policy or setting a tag limit. [Learn about tag pruning](/ee/dtr/user/tag-pruning).
-  * Users can now review and audit repository events on the web interface with the addition of the **Activity** tab on each repository.[Learn about repository event audits](/ee/dtr/user/audit-repository-events/).
+  * Users can now review and audit repository events on the web interface with the addition of the **Activity** tab on each repository. [Learn about repository event audits](/ee/dtr/user/audit-repository-events/).
   * DTR admins can now enable auto-deletion of repository events based on specified conditions. [Learn about repository event auto-deletion](/ee/dtr/admin/configure/auto-delete-repo-events/).
   * DTR admins can now review and audit jobs on the web interface with the addition of **Job Logs** within System settings. [Learn about job audits on the web interface](/ee/dtr/admin/manage-jobs/audit-jobs-via-ui/).
   * DTR admins can now enable auto-deletion of job logs based on specified conditions. [Learn about job log auto-deletion](/ee/dtr/admin/manage-jobs/auto-delete-job-logs/).