Merge branch 'master' of github.com:docker/docker.github.io

compose/compose-file/index.md

@@ -1727,6 +1727,7 @@ expressed in the short form.
     created
 - `tmpfs`: configure additional tmpfs options
   - `size`: the size for the tmpfs mount in bytes
+- `consistency`: the consistency requirements of the mount, one of `consistent` (host and container have identical view), `cached` (read cache, host view is authoritative) or `delegated` (read-write cache, container's view is authoritative)
 
 ```none
 version: "3.2"

docker-for-mac/edge-release-notes.md

@@ -1250,7 +1250,7 @@ events or unexpected unmounts.
 * osxfs: fixed an issue causing `inotify` creation events to fail
 * osxfs: increased the `fs.inotify.max_user_watches` limit in Moby to 524288
 * The UI shows documentation link for sharing volumes
-* Clearer error message when running with outdated Virtualbox version
+* Clearer error message when running with outdated VirtualBox version
 * Added link to sources for qemu-img
 
 **Known issues**
@@ -1670,7 +1670,7 @@ lead to `Docker.app` not starting on reboot
 - Fixed RAM amount error message
 - Fixed wording of CPU error dialog
 - Removed status from Preferences
-- Check for incompatible versions of Virtualbox
+- Check for incompatible versions of VirtualBox
 
 ### Beta 4 Release (2016-03-22 1.10.3-beta4)
 

docker-for-mac/faqs.md

@@ -334,7 +334,7 @@ HyperKit is a hypervisor built on top of the Hypervisor.framework in macOS. It r
 dependencies.
 
 We use HyperKit to eliminate the need for other VM products, such as Oracle
-Virtualbox or VMWare Fusion.
+VirtualBox or VMWare Fusion.
 
 ### What is the benefit of HyperKit?
 

ee/ucp/kubernetes/ucp-secureoverlay.yml

@@ -120,7 +120,7 @@ spec:
       serviceAccountName: ucp-secureoverlay-agent
       containers:
       - name: ucp-secureoverlay-agent
-        image: ucp-secureoverlay-agent:3.1.0
+        image: docker/ucp-secureoverlay-agent:3.1.0
         securityContext:
           capabilities:
             add: ["NET_ADMIN"]
@@ -162,4 +162,4 @@ spec:
       restartPolicy: Always
       containers:
       - name: ucp-secureoverlay-mgr
-        image: ucp-secureoverlay-mgr:3.1.0
+        image: docker/ucp-secureoverlay-mgr:3.1.0

machine/reference/create.md

@@ -156,7 +156,7 @@ $ docker-machine create -d virtualbox \
     foobarmachine
 ```
 
-This creates a virtual machine running locally in Virtualbox which uses the
+This creates a virtual machine running locally in VirtualBox which uses the
 `overlay` storage backend, has the key-value pairs `foo=bar` and `spam=eggs` as
 labels on the engine, and allows pushing / pulling from the insecure registry
 located at `registry.myco.com`. You can verify much of this by inspecting the

release-notes/docker-machine.md

@@ -523,7 +523,7 @@ toc_max: 2
   - Update Boot2Docker cache in PreCreateCheck phase
 - OpenStack
  - Filter floating IPs by tenant ID
-- Virtualbox
+- VirtualBox
   - Reject duplicate hostonlyifs Name/IP with clear message
   - Detect when hostonlyif can't be created. Point to known working version of VirtualBox
   - Don't create the VM if no hardware virtualization is available and add a flag to force create
@@ -581,7 +581,7 @@ Non-core driver plugins should still work as intended (in externally distributed
 - Generic
 	- Support password protected ssh keys though ssh-agent
 	- Support DNS names
-- Virtualbox
+- VirtualBox
 	- Show a warning if virtualbox is too old
 	- Recognize yet another Hardware Virtualization issue pattern
 	- Fix Hardware Virtualization on Linux/AMD