From 25ee6a4d14cf93f50a247248cdcf2fb78f341879 Mon Sep 17 00:00:00 2001
From: Docker Library Bot <github+dockerlibrarybot@infosiftr.com>
Date: Wed, 6 Jul 2016 14:46:32 -0700
Subject: [PATCH] Run update.sh

---
 sentry/README.md    |  4 ++--
 wordpress/README.md | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/sentry/README.md b/sentry/README.md
index 02e9a97d4..7951ed222 100644
--- a/sentry/README.md
+++ b/sentry/README.md
@@ -38,7 +38,7 @@ Sentry is a realtime event logging and aggregation platform. It specializes in m
 3.	Generate a new secret key to be shared by all `sentry` containers. This value will then be used as the `SENTRY_SECRET_KEY` environment variable.
 
 	```console
-	$ docker run --rm sentry generate-secret-key
+	$ docker run --rm sentry config generate-secret-key
 	```
 
 4.	If this is a new database, you'll need to run `upgrade`
@@ -83,7 +83,7 @@ When you start the `sentry` image, you can adjust the configuration of the Sentr
 A secret key used for cryptographic functions within Sentry. This key should be unique and consistent across all running instances. You can generate a new secret key doing something like:
 
 ```console
-$ docker run --rm sentry generate-secret-key
+$ docker run --rm sentry config generate-secret-key
 ```
 
 ### `SENTRY_POSTGRES_HOST`, `SENTRY_POSTGRES_PORT`, `SENTRY_DB_NAME`, `SENTRY_DB_USER`, `SENTRY_DB_PASSWORD`
diff --git a/wordpress/README.md b/wordpress/README.md
index d7de9c7ca..5405a20f2 100644
--- a/wordpress/README.md
+++ b/wordpress/README.md
@@ -54,17 +54,21 @@ $ docker run --name some-wordpress -e WORDPRESS_DB_HOST=10.1.2.3:3306 \
 Example `docker-compose.yml` for `wordpress`:
 
 ```yaml
-wordpress:
-  image: wordpress
-  links:
-    - db:mysql
-  ports:
-    - 8080:80
+version: '2'
 
-db:
-  image: mariadb
-  environment:
-    MYSQL_ROOT_PASSWORD: example
+services:
+
+  wordpress:
+    image: wordpress
+    ports:
+      - 8080:80
+    environment:
+      WORDPRESS_DB_PASSWORD: example
+
+  mysql:
+    image: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD: example
 ```
 
 Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.