Update upgrading documents after walking through it

1 files changed, 23 insertions, 7 deletions

diff --git a/pages/docs/platform/services/couchdb.md b/pages/docs/platform/services/couchdb.md
index 2263971..7f6a652 100644
--- a/pages/docs/platform/services/couchdb.md
+++ b/pages/docs/platform/services/couchdb.md
@@ -152,23 +152,23 @@ If you add a node, or remove one node from the cluster,
 
 Here are the steps needed to replace BigCouch with CouchDB.
 
-At the end of this process, you will have just *one* node with `services` property equal to `couchdb`. If you had a BigCouch cluster before, you will be removing all but one of those machines to consolidate them into one couchdb machine.
+At the end of this process, you will have just *one* node with `services` property equal to `couchdb`. If you had a BigCouch cluster before, you will be removing all but one of those machines to consolidate them into one CouchDB machine.
 
-1. if you have multiple nodes with the couchdb service on them, pick one of them to be your couchdb server, and remove the service from the others. If these machines were only doing couchdb, you can remove the nodes completely with `leap node rm <nodename>` and then you can decommission the servers
+1. if you have multiple nodes with the `couchdb` service on them, pick one of them to be your CouchDB server, and remove the service from the others. If these machines were only doing BigCouch before, you can remove the nodes completely with `leap node rm <nodename>` and then you can decommission the servers
 
 1. put the webapp into [[maintenance mode => webapp#maintenance-mode]]
 
 1. turn off daemons that access the database. For example:
 
     ```
-    workstation$ leap ssh soledad-nodes
+    workstation$ leap ssh <each soledad-node>
     server# /etc/init.d/soledad-server stop
 
-    workstation$ leap ssh mx-node
+    workstation$ leap ssh <mx-node>
     server# /etc/init.d/postfix stop
     server# /etc/init.d/leap-mx stop
 
-    workstation$ leap ssh webapp
+    workstation$ leap ssh <webapp-node>
     server# /etc/init.d/nickserver stop
     ```
 
@@ -181,6 +181,7 @@ At the end of this process, you will have just *one* node with `services` proper
 1. remove orphaned databases and do a backup of all remaining, active databases. This can take some time and will place several hundred megabytes of data into /var/backups/couchdb. The size and time depends on how many users there are on your system. For example, 15k users took approximately 25 minutes and 308M of space:
 
     ```
+    workstation$ leap ssh <couchdb-node>
     server# cd /srv/leap/couchdb/scripts
     server# ./cleanup-user-dbs
     server# time ./couchdb_dumpall.sh
@@ -199,12 +200,27 @@ At the end of this process, you will have just *one* node with `services` proper
     server# apt-get remove bigcouch
     ```
 
-1. configure your couch node to use plain couchdb instead of bigcouch. See section "Use plain couchdb instead of bigcouch" below for details.
+1. configure your couch node to use plain couchdb instead of bigcouch, you can do this by editing nodes/<couch-node>.json, look for this section:
+
+  ```
+  "couch": {
+    "mode": "plain"
+  }
+  ```
+
+  change it, so it looks like this instead:
+
+  ```
+  "couch": {
+    "mode": "plain",
+    "pwhash_alg": "pbkdf2"
+  }
+  ```
 
 1. deploy to the couch node:
 
     ```
-    workstation$ leap deploy couchdb
+    workstation$ leap deploy <couchdb-node>
     ```
 
     If you used the iptables method of blocking access to couchdb, you need to run it again because the deploy just overwrote all the iptables rules: