docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
John Mulhausen 2016-10-26 17:48:06 -07:00
parent 9e96e483bc 7b04a910bc
commit 0dd1cf261e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/wordpress.md
View File

@ -62,7 +62,7 @@ with Docker containers. This quick-start guide demonstrates how to use Compose t
WORDPRESS_DB_PASSWORD: wordpress
```
>**NOTE**: The folder `./.data/db` will be automatically created in the project directory
**NOTE**: The folder `./.data/db` will be automatically created in the project directory
alongside the `docker-compose.yml` which will persist any updates made by wordpress to the
database.

4
docker-for-mac/index.md
View File

@ -55,9 +55,9 @@ For more about stable and beta channels, see the [FAQs](faqs.md#stable-and-beta-
>**Important Notes**:
>
>* Docker for Mac requires macOS 10.10.3 Yosemite or newer running on a 2010 or newer Mac, with Intel's hardware support for MMU virtualization. Please see [What to know before you install](index.md#what-to-know-before-you-install) for a full list of prerequisites.
> * Docker for Mac requires macOS 10.10.3 Yosemite or newer running on a 2010 or newer Mac, with Intel's hardware support for MMU virtualization. Please see [What to know before you install](index.md#what-to-know-before-you-install) for a full list of prerequisites.
>
>* <font color="#CC3366">You can switch between beta and stable versions, but _you must have only one app installed at a time_.</font> Also, you will need to save images and export containers you want to keep before uninstalling the current version before installing another. For more about this, see the [FAQs about beta and stable channels](faqs.md#stable-and-beta-channels).
> * <font color="#CC3366">You can switch between beta and stable versions, but _you must have only one app installed at a time_.</font> Also, you will need to save images and export containers you want to keep before uninstalling the current version before installing another. For more about this, see the [FAQs about beta and stable channels](faqs.md#stable-and-beta-channels).
## What to know before you install