move useful notes to the right place, minor title changes, and use ta…

…gs when running setup-offline-sources. (#575)

offline/upgrading.md

@@ -130,14 +130,15 @@ The following is a list of important artifacts which are provided:
 
 ## Comparing the inventory
 
+Diff outputs differences between the two files. lines that start with `@@` specify a position. lines with `-` are from the old file, lines with `+` are from the new inventory, and lines starting with ` ` are the same in both files. We are going to use diff to compare files from your old install with your new install.
+
 Copy `ansible/inventory/offline/99-static` to `ansible/inventory/offline/hosts.ini`.
 
 Compare the inventory from your old install to the inventory of your new install.
 ```
 diff -u ../<OLD_PACKAGE_DIR>/ansible/inventory/offline/99-static ansible/inventory/offline/hosts.ini
 ```
 
-
 Your old install may use a `hosts.ini` instead of `99-static`.
 check to see if a hosts.ini is present:
 ```
@@ -154,8 +155,6 @@ otherwise, compare hosts.ini from both installation directories.
 diff -u ../<OLD_PACKAGE_DIR>/ansible/inventory/offline/hosts.ini ansible/inventory/offline/hosts.ini
 ```
 
-Diff outputs differences between the two files. lines that start with `@@` specify a position. lines with `-` are from the old file, lines with `+` are from the new inventory, and lines starting with ` ` are the same in both files.
-
 Using a text editor, make sure your new hosts.ini has all of the work you did on the first installation.
 
 There are instructions in the comments on how to set everything up. You can also refer to extra information at https://docs.wire.com/how-to/install/ansible-VMs.html .
@@ -235,7 +234,7 @@ some ubuntu systems do not have GPG by default. wire assumes this is already pre
 Since docker is already installed on all nodes that need it, push the new container images to the assethost, and seed all container images:
 
 ```
-d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/setup-offline-sources.yml
+d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/setup-offline-sources.yml --tags "debs,containers-helm"
 d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/seed-offline-docker.yml
 ```
 
@@ -298,7 +297,7 @@ d helm upgrade databases-ephemeral ./charts/databases-ephemeral/ --values ./valu
 d helm upgrade reaper ./charts/reaper/
 ```
 
-#### Demo-SMTP service
+#### Upgrading the demo SMTP service
 
 Compare your demo-smtp configuration files, and decide whether you need to change them or not.
 ```
@@ -314,7 +313,7 @@ cp ../<OLD_PACKAGE_DIR>/values/demo-smtp/values.yaml values/demo-smtp/values.yam
 d helm upgrade demo-smtp ./charts/demo-smtp/ --values ./values/demo-smtp/values.yaml
 ```
 
-#### Upgrading the demo SMTP service
+#### Upgrading the NginX ingress
 
 Compare your demo-smtp configuration files, and decide whether you need to change them or not.
 ```