Improve install instructions for laptop/PC

install-freedombone.sh

   echo "awk -F ' ' '{print $2}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo -n '  export RSYNC_PASSWORD=$(echo "${remote_server}" | ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo "awk -F ' ' '{print $3}')" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+  echo '  NOW=$(date +"%Y-%m-%d %H:%M:%S")' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
 
-  echo '  NOW=$(date +"%Y-%m-%d %H:%M:%S")' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '  logger -s "$NOW Starting backup to $RSYNC_SERVER" >> /var/log/backup_to_friends.log' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo -n '  rsync -avz -e "ssh -p $RSYNC_SSH_PORT" ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
   echo '$SERVER_DIRECTORY/backup $RSYNC_SERVER' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME

installation.org

 #+BEGIN_CENTER
 [[./images/logo.png]]
 #+END_CENTER
-| [[file:index.html][Home]] | [[Download the code]] | [[On a Beaglebone Black]] | [[On other hardware]] | [[Internet Router]] |
+| [[file:index.html][Home]] | [[Download the code]] | [[On a Beaglebone Black]] | [[On a laptop/PC/netbook]] | [[Internet Router]] |
 
 * Download the code
 Firstly you'll need to download the code as follows:
 
 Any manual post-installation setup instructions or passwords can be found in */home/username/README*. You should remove any passwords from that file and store them within a password manager such as KeepassX.
 
-* On other hardware
-It's also possible to install Freedombone onto other hardware, such as an old laptop or other type of single board computer. Any system with a fresh installation of Debian Jessie will do. Just make sure that you change the variable INSTALLING_ON_BBB to "no" within *freedombone.cfg* or the *install-freedombone.sh* script. Obviously, you don't need to run the *initial_setup.sh* script on non-Beaglebone systems.
+* On a laptop/PC/netbook
+It's also possible to install Freedombone onto other hardware, including other types of single board computer. Any system with a fresh installation of Debian Jessie will do. Just make sure that you change the variable INSTALLING_ON_BBB to "no" within *freedombone.cfg* or the *install-freedombone.sh* script. Obviously, you don't need to run the *initial_setup.sh* script on non-Beaglebone systems.
+
+ * Download the [[https://www.debian.org/devel/debian-installer][Debian Jessie "netinst" installer]]
+ * Use [[https://apps.ubuntu.com/cat/applications/usb-creator-gtk/][Startup Disk Creator]] or [[https://en.wikipedia.org/wiki/UNetbootin][Unetbootin]] to copy the netinst image to a USB thumb drive
+ * On the target machine boot from the USB drive and go through the installation. It's a good idea to use LVM and disk encryption together with a long passphrase which will be hard to crack by brute force methods. Keep a note of the passphrase in your password manager.
+ * Within the installer unselect the *print server* and select the *ssh server*
+ * After installation use ssh to access the machine and become the root user
+#+BEGIN_SRC bash
+ssh username@192.168.1.60
+su
+#+END_SRC
+ * If you have GPG keys you may wish to transfer them to the */home/usernname* directory. If the machine has a second USB socket or an SD card slot then that may be the most secure way to do it.
+ * Run the following commands:
+#+BEGIN_SRC bash
+cd /home/<username>
+apt-get install git
+git clone https://github.com/bashrc/freedombone
+cd freedombone
+nano freedombone.cfg
+#+END_SRC
+
+ * Now create a configuration file, such as the following, filling in the details for your [[https://freedns.afraid.org/][FreeDNS domains]].
+#+BEGIN_SRC bash
+INSTALLING_ON_BBB=no
+MY_EMAIL_ADDRESS=<your email>
+MY_NAME=<your name>
+MY_BLOG_TITLE=<your blog title>
+MY_BLOG_SUBTITLE=<your blog subtitle>
+SSH_PORT=2222
+FULLBLOG_DOMAIN_NAME=<your blog domain name
+FULLBLOG_FREEDNS_SUBDOMAIN_CODE=<your blog FreeDNS code>
+MICROBLOG_DOMAIN_NAME=<your GNU Social domain name>
+MICROBLOG_FREEDNS_SUBDOMAIN_CODE=<your GNU social FreeDNS domain code>
+REDMATRIX_DOMAIN_NAME=<your Red Matrix domain name>
+REDMATRIX_FREEDNS_SUBDOMAIN_CODE=1234
+OWNCLOUD_DOMAIN_NAME=<your Owncloud domain name>
+OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=<your Owncloud FreeDNS domain code>
+WIKI_DOMAIN_NAME=<your wiki domain name>
+WIKI_FREEDNS_SUBDOMAIN_CODE=<your wiki FreeDNS domain code>
+WIKI_TITLE=<your wiki title>
+ROUTE_THROUGH_TOR=no
+LOCAL_NETWORK_STATIC_IP_ADDRESS=192.168.1.60
+#+END_SRC
+
+ * Save and exit, then run:
+#+BEGIN_SRC bash
+./install-freedombone.sh <your wiki domain name> <your username> <your wiki FreeDNS domain code>
+#+END_SRC
+
 * Internet Router
 On your internet router, typically under firewall settings, open the following ports and forward them to the Freedombone.
 

website/installation.html

 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title></title>
-<!-- 2014-10-26 Sun 22:02 -->
+<!-- 2014-12-20 Sat 11:04 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <meta  name="author" content="Bob Mottram" />
 <td class="left"><a href="index.html">Home</a></td>
 <td class="left"><a href="#unnumbered-1">Download the code</a></td>
 <td class="left"><a href="#unnumbered-2">On a Beaglebone Black</a></td>
-<td class="left"><a href="#unnumbered-3">On other hardware</a></td>
+<td class="left"><a href="#unnumbered-3">On a laptop/PC/netbook</a></td>
 <td class="left"><a href="#unnumbered-4">Internet Router</a></td>
 </tr>
 </tbody>
 </div>
 
 <div id="outline-container-unnumbered-3" class="outline-2">
-<h2 id="unnumbered-3">On other hardware</h2>
+<h2 id="unnumbered-3">On a laptop/PC/netbook</h2>
 <div class="outline-text-2" id="text-unnumbered-3">
 <p>
-It's also possible to install Freedombone onto other hardware, such as an old laptop or other type of single board computer. Any system with a fresh installation of Debian Jessie will do. Just make sure that you change the variable INSTALLING_ON_BBB to "no" within <b>freedombone.cfg</b> or the <b>install-freedombone.sh</b> script. Obviously, you don't need to run the <b>initial_setup.sh</b> script on non-Beaglebone systems.
+It's also possible to install Freedombone onto other hardware, including other types of single board computer. Any system with a fresh installation of Debian Jessie will do. Just make sure that you change the variable INSTALLING_ON_BBB to "no" within <b>freedombone.cfg</b> or the <b>install-freedombone.sh</b> script. Obviously, you don't need to run the <b>initial_setup.sh</b> script on non-Beaglebone systems.
 </p>
+
+<ul class="org-ul">
+<li>Download the <a href="https://www.debian.org/devel/debian-installer">Debian Jessie "netinst" installer</a>
+</li>
+<li>Use <a href="https://apps.ubuntu.com/cat/applications/usb-creator-gtk/">Startup Disk Creator</a> or <a href="https://en.wikipedia.org/wiki/UNetbootin">Unetbootin</a> to copy the netinst image to a USB thumb drive
+</li>
+<li>On the target machine boot from the USB drive and go through the installation. It's a good idea to use LVM and disk encryption together with a long passphrase which will be hard to crack by brute force methods. Keep a note of the passphrase in your password manager.
+</li>
+<li>Within the installer unselect the <b>print server</b> and select the <b>ssh server</b>
+</li>
+<li>After installation use ssh to access the machine and become the root user
+</li>
+</ul>
+<div class="org-src-container">
+
+<pre class="src src-bash">ssh username@192.168.1.60
+su
+</pre>
 </div>
+<ul class="org-ul">
+<li>If you have GPG keys you may wish to transfer them to the <b>/home/usernname</b> directory. If the machine has a second USB socket or an SD card slot then that may be the most secure way to do it.
+</li>
+<li>Run the following commands:
+</li>
+</ul>
+<div class="org-src-container">
+
+<pre class="src src-bash"><span class="org-builtin">cd</span> /home/&lt;username&gt;
+apt-get install git
+git clone https://github.com/bashrc/freedombone
+<span class="org-builtin">cd</span> freedombone
+nano freedombone.cfg
+</pre>
 </div>
+
+<ul class="org-ul">
+<li>Now create a configuration file, such as the following, filling in the details for your <a href="https://freedns.afraid.org/">FreeDNS domains</a>.
+</li>
+</ul>
+<div class="org-src-container">
+
+<pre class="src src-bash"><span class="org-variable-name">INSTALLING_ON_BBB</span>=no
+<span class="org-variable-name">MY_EMAIL_ADDRESS</span>=&lt;your email&gt;
+<span class="org-variable-name">MY_NAME</span>=&lt;your name&gt;
+<span class="org-variable-name">MY_BLOG_TITLE</span>=&lt;your blog title&gt;
+<span class="org-variable-name">MY_BLOG_SUBTITLE</span>=&lt;your blog subtitle&gt;
+<span class="org-variable-name">SSH_PORT</span>=2222
+<span class="org-variable-name">FULLBLOG_DOMAIN_NAME</span>=&lt;your blog domain name
+<span class="org-variable-name">FULLBLOG_FREEDNS_SUBDOMAIN_CODE</span>=&lt;your blog FreeDNS code&gt;
+<span class="org-variable-name">MICROBLOG_DOMAIN_NAME</span>=&lt;your GNU Social domain name&gt;
+<span class="org-variable-name">MICROBLOG_FREEDNS_SUBDOMAIN_CODE</span>=&lt;your GNU social FreeDNS domain code&gt;
+<span class="org-variable-name">REDMATRIX_DOMAIN_NAME</span>=&lt;your Red Matrix domain name&gt;
+<span class="org-variable-name">REDMATRIX_FREEDNS_SUBDOMAIN_CODE</span>=1234
+<span class="org-variable-name">OWNCLOUD_DOMAIN_NAME</span>=&lt;your Owncloud domain name&gt;
+<span class="org-variable-name">OWNCLOUD_FREEDNS_SUBDOMAIN_CODE</span>=&lt;your Owncloud FreeDNS domain code&gt;
+<span class="org-variable-name">WIKI_DOMAIN_NAME</span>=&lt;your wiki domain name&gt;
+<span class="org-variable-name">WIKI_FREEDNS_SUBDOMAIN_CODE</span>=&lt;your wiki FreeDNS domain code&gt;
+<span class="org-variable-name">WIKI_TITLE</span>=&lt;your wiki title&gt;
+<span class="org-variable-name">ROUTE_THROUGH_TOR</span>=no
+<span class="org-variable-name">LOCAL_NETWORK_STATIC_IP_ADDRESS</span>=192.168.1.60
+</pre>
+</div>
+
+<ul class="org-ul">
+<li>Save and exit, then run:
+</li>
+</ul>
+<div class="org-src-container">
+
+<pre class="src src-bash">./install-freedombone.sh &lt;your wiki domain name&gt; &lt;your username&gt; &lt;your wiki FreeDNS domain code&gt;
+</pre>
+</div>
+</div>
+</div>
+
 <div id="outline-container-unnumbered-4" class="outline-2">
 <h2 id="unnumbered-4">Internet Router</h2>
 <div class="outline-text-2" id="text-unnumbered-4">