From 53f24f763c0991ef0d73841de27bee1a8db183d3 Mon Sep 17 00:00:00 2001
From: Joao Fernandes <joao.fernandes@docker.com>
Date: Thu, 5 Jan 2017 14:00:42 -0800
Subject: [PATCH] Add flag to ucp 2.0 restore instructions

---
 .../backups-and-disaster-recovery.md          | 20 +++++++++++++++----
 .../backups-and-disaster-recovery.md          | 15 +++-----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/datacenter/ucp/1.1/high-availability/backups-and-disaster-recovery.md b/datacenter/ucp/1.1/high-availability/backups-and-disaster-recovery.md
index 34956a5499e..325d855e474 100644
--- a/datacenter/ucp/1.1/high-availability/backups-and-disaster-recovery.md
+++ b/datacenter/ucp/1.1/high-availability/backups-and-disaster-recovery.md
@@ -62,12 +62,24 @@ Enter passphrase: secret
 ## Restore command
 
 The example below shows how to restore a UCP controller node from an existing
-backup:
+backup.
 
-```bash
+First find out the Id of the UCP replica you want to restore:
+
+```none
+$ docker run --rm --name ucp \
+  -v /var/run/docker.sock:/var/run/docker.sock  \
+  docker/ucp id
+```
+
+Then, run the restore command:
+
+```none
 $ docker run --rm -i --name ucp \
   -v /var/run/docker.sock:/var/run/docker.sock  \
-  docker/ucp restore < backup.tar
+  docker/ucp restore \
+    --passphrase "secret" \
+    --id <replica-id> < backup.tar
 ```
 
 
@@ -91,4 +103,4 @@ You should now have your cluster up and running.
 ## Where to go next
 
 * [Set up high availability](set-up-high-availability.md)
-* [UCP architecture](../architecture.md)
\ No newline at end of file
+* [UCP architecture](../architecture.md)
diff --git a/datacenter/ucp/2.0/guides/high-availability/backups-and-disaster-recovery.md b/datacenter/ucp/2.0/guides/high-availability/backups-and-disaster-recovery.md
index 815a204e880..926bfad466c 100644
--- a/datacenter/ucp/2.0/guides/high-availability/backups-and-disaster-recovery.md
+++ b/datacenter/ucp/2.0/guides/high-availability/backups-and-disaster-recovery.md
@@ -37,7 +37,7 @@ across multiple UCP controller nodes.
 
 The example below shows how to create a backup of a UCP controller node:
 
-```bash
+```none
 # Create a backup, encrypt it, and store it on /tmp/backup.tar
 $ docker run --rm -i --name ucp \
   -v /var/run/docker.sock:/var/run/docker.sock \
@@ -53,19 +53,10 @@ $ gpg --decrypt /tmp/backup.tar | tar --list
 The example below shows how to restore a UCP controller node from an existing
 backup:
 
-```bash
+```none
 $ docker run --rm -i --name ucp \
   -v /var/run/docker.sock:/var/run/docker.sock  \
-  docker/ucp restore < backup.tar
-```
-
-The restore command may also be invoked in interactive mode:
-
-```bash
-$ docker run --rm -i --name ucp \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  -v /path/to/backup.tar:/config/backup.tar \
-  docker/ucp restore -i
+  docker/ucp restore --passphrase "secret" < backup.tar
 ```
 
 ## Restore your cluster