7 files changed, 38 insertions, 17 deletions
diff --git a/.homeinstall/README.md b/.homeinstall/README.md
index 62c860cd5..c147f92bc 100644
--- a/.homeinstall/README.md
+++ b/.homeinstall/README.md
@@ -2,7 +2,10 @@
 
 Run hubzilla-setup.sh for an unattended installation of hubzilla.
 
-The script is known to work with Debian stable (Jessie).
+The script is known to work with Debian 8.3 stable (Jessie)
+
++ Home-PC (Debian-8.3.0-amd64)
++ DigitalOcean droplet (Debian 8.3 x64 / 512 MB Memory / 20 GB Disk / NYC3)
 
 # Step-by-Step Overwiew
 
@@ -19,13 +22,20 @@ Software
 + Fresh installation of Debian on your mini-pc
 + Router with open ports 80 and 443 for your Debian
 
-## The basic steps
+## The basic steps (quick overview)
 
 + Register your own domain (for example at selfHOST) or a free subdomain (for example at freeDNS)
-+ Clone hubzilla to /var/www/html
-+ Copy hubzilla-config.txt and hubzilla-setup.sh to your Debian (future hub)
-+ Edit hubzilla-config.txt. Enter your values there: db pass, domain, values for dyn DNS
-+ Run hubzilla-setup.sh as root ... wait, wait, wait until the script is finised
++ Log on to your new debian (server)
+  - apt-get install git
+  - mkdir -p /var/www/html
+  - cd /var/www/html
+  - git clone https://github.com/redmatrix/hubzilla.git .
+  - cp .homeinstall/hubzilla-config.txt.template .homeinstall/hubzilla-config.txt
+  - nano .homeinstall/hubzilla-config.txt
+    - Enter your values there: db pass, domain, values for dyn DNS
+  - hubzilla-setup.sh as root
+    - ... wait, wait, wait until the script is finised
+  - reboot
 + Open your domain with a browser and step throught the initial configuration of hubzilla.
 
 # Step-by-Step in Detail
@@ -76,6 +86,8 @@ There are two way to get a domain
 
 ### Method 1: Get yourself an own Domain (recommended)
 
+...for example at selfHOST.de
+
 ### Method 2 Register a (free) Subdomain
 
 Register a free subdomain for example at
@@ -118,8 +130,12 @@ Clone hubzilla from git ("git pull" will update it later)
 Change to the install script
 
     cd html/.homeinstall/
+    
+Copy the template file
+    
+    cp hubzilla-config.txt.template hubzilla-config.txt
 
-Change the file "hubzilla-config.txt". Enter your values there.
+Change the file "hubzilla-config.txt". Read the instructions there and enter your values.
 
     nano hubzilla-config.txt
 
@@ -146,10 +162,3 @@ Leave db type "MySQL" untouched.
 
 Follow the instructions in the next pages.
 
-# The Script explained
-
-This chapter shows you
-
-- What the script does exactly
-- Explanations on technical details. May be this will encourage you to play with bash scripts?
-
diff --git a/doc/cloud.bb b/doc/cloud.bb
index d5195c0f5..3e0ac1fd3 100644
--- a/doc/cloud.bb
+++ b/doc/cloud.bb
@@ -10,7 +10,7 @@ On many public servers there may be limits on disk usage.
 
 The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending.
 
-To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/filestorage/{{username}}&quot; replacing {{username}} with the nickname you provided during channel creation.
+To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/cloud/{{username}}&quot; replacing {{username}} with the nickname you provided during channel creation.
 
 [b]Web Access[/b]
 
diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb
index b0a623104..80c11024b 100644
--- a/doc/git_for_non_developers.bb
+++ b/doc/git_for_non_developers.bb
@@ -14,7 +14,7 @@ Once you've done that, cd into the directory, and add an upstream.
 
 [code]
 cd red
-git remote add upstream https://github.com/redmatrix/redmatrix
+git remote add upstream https://github.com/redmatrix/hubzilla
 [/code]
 
 From now on, you can pull upstream changes with the command
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index 3b79d2791..285a65ade 100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
@@ -29,4 +29,7 @@ Login Name:	{{$email}}
 Sincerely,
 	{{$sitename}} Administrator
 
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
  
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 0d94be3c2..61bf27943 100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
@@ -18,3 +18,8 @@ Sincerely,
 	{{$sitename}} Administrator
 
  
+
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
+
diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl
index d1e34be67..71f0964d4 100644
--- a/view/en/register_verify_member.tpl
+++ b/view/en/register_verify_member.tpl
@@ -23,3 +23,8 @@ To deny the request and remove the account, please visit:
 
 Thank you.
 
+
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
+
diff --git a/view/es b/view/es
deleted file mode 120000
index c8ba7666b..000000000
--- a/view/es
+++ /dev/null
@@ -1 +0,0 @@
-es-es
-\ No newline at end of file