Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 26 insertions, 16 deletions

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index f5edf009f..58ec365cb 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -42,10 +42,16 @@ site for the first time, please use the SSL ("https://") URL if SSL is
 available. This will avoid problems later. The installation routine will not
 allow you to use a non browser-valid certificate.
 
-This restriction is incorporated because public posts from you may for example
-contain references to images on your own hub. If your certificate is not known
-by the internet browser of users they get a warning message complaining about
-the invalid certificate. 
+This restriction is incorporated because public posts from you may contain 
+references to images on your own hub. Other members viewing their stream on
+other hubs will get warnings if your certificate is not trusted by their web
+browser. This will confuse many people because this is a decentralised network
+and they will get the warning about your hub while viewing their own hub and may 
+think their own hub has an issue. These warnings are very technical and scary to 
+some folks, many of whom will not know how to proceed except to follow the browser
+advice. This is disruptive to the community. That said, we recognise the issues
+surrounding the current certificate infrastructure and agree there are many
+problems, but that doesn't change the requirement. 
 
 Free "browser-valid" certificates are available from providers such as StartSSL. 
 
@@ -57,9 +63,11 @@ use SSL, your webserver must not listen on port 443 at all.
 
 1. Requirements
     - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
-    local .htaccess file
+    local .htaccess file. Some folks have successfully used nginx and lighttpd.
+	Example config scripts are available for these platforms in doc/install.
+	Apache and nginx have the most support. 
 
-    - PHP 5.3+. The later the better. 
+    - PHP 5.4 or later. The later the better. 
 
     - PHP *command line* access with register_argc_argv set to true in the 
     php.ini file - and with no hosting provider restrictions on the use of 
@@ -70,7 +78,7 @@ use SSL, your webserver must not listen on port 443 at all.
 
     - some form of email server or email gateway such that PHP mail() works
 
-    - Mysql 5.x or MariaDB
+    - Mysql 5.x or MariaDB or postgres database server.
     
     - ability to schedule jobs with cron.
 
@@ -88,7 +96,7 @@ use SSL, your webserver must not listen on port 443 at all.
     software much easier to update. The Linux command to clone the repository 
     into a directory "mywebsite" would be
 
-        git clone https://github.com/friendica/red.git mywebsite
+        git clone https://github.com/redmatrix/redmatrix.git mywebsite
 
     - and then you can pick up the latest changes at any time with
 
@@ -115,15 +123,17 @@ use SSL, your webserver must not listen on port 443 at all.
 
             cd mywebsite
 
-    - Then you should clone the addon repository (separately)
+    - Then you should clone the addon repository (separately). We'll give this repository
+         a nickname of 'matrix'. You can pull in other redmatrix addon repositories by 
+         giving them different nicknames.
 
-        git clone https://github.com/friendica/red-addons.git addon
+            util/add_addon_repo https://github.com/redmatrix/redmatrix-addons.git matrix
 
-    - For keeping the addon tree updated, you should be on you addon tree and 
-    issue a git pull
+    - For keeping the addon tree updated, you should be on your top level website 
+		directory and issue an update command for that repository.
 
-            cd mywebsite/addon
-            git pull
+            cd mywebsite
+            util/update_addon_repo matrix
 
 
 3. Create an empty database and note the access details (hostname, username, 
@@ -144,8 +154,8 @@ website.
         If not, edit htconfig.php and change system settings. Rename 
     to .htconfig.php
 	-  Database is populated.
-        If not, import the contents of "database.sql" with phpmyadmin 
-        or mysql command line
+        If not, import the contents of "install/schema_xxxxx.sql" with phpmyadmin 
+        or mysql command line (replace 'xxxxx' with your DB type).
 
 7. At this point visit your website again, and register your personal account. 
 Registration errors should all be recoverable automatically.