Merge remote-tracking branch 'upstream/master'

1 files changed, 24 insertions, 24 deletions

diff --git a/doc/Install.md b/doc/Install.md
index 9455c62ba..8adfe3ccd 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -1,17 +1,24 @@
-Friendica Installation
+ 
+Red Installation
+===============
 
-We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Friendica is more than a simple web application. It is a complex communications system which more closely resembles an email server than a web server. For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down. This kind of functionality requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Friendica. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
+Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application.  The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
 
-Also if you encounter installation issues, please let us know via the forums at http://groups.google.com/group/friendica or file an issue at http://bugs.friendica.com . Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.   
+Also if you encounter installation issues, please let us know via the Github issue tracker (https://github.com/friendica/red/issues). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.   
 
-Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it after installation is currently not-supported. Things will break, and some of your friends may have difficulty communicating with you. We plan to address this limitation in a future release.
+Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it is currently not-supported. Things will break, and some of your friends may have difficulty communicating with you. We plan to address this limitation in a future release. 
 
+Decide if you will use SSL and obtain an SSL certificate before software installation.  You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate.  You MUST NOT use self-signed certificates!
+
+Please test your certificate prior to installation. A web tool for testing your certificate is available at "http://www.digicert.com/help/". When visiting your 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 some security issues. Although these complains are not the real truth - there are no security issues with your encryption! - the users may be confused, nerved or even worse may become scared about Red Matrix having security issues. Use one of the free certification instances!
 
 1. Requirements
     - Apache with mod-rewrite enabled and "Options All" so you can use a
 local .htaccess file
 
-    - PHP  5.2+. The later the better. You'll need 5.3 for encryption of key exchange conversations. On a Windows environment, 5.2+ might not work as the function dns_get_record() is only available with version 5.3.
+    - PHP  5.3 or later
         - PHP *command line* access with register_argc_argv set to true in the
 php.ini file
         - curl, gd, mysql, and openssl extensions
@@ -32,15 +39,21 @@ not be as convenient to use and have not been thoroughly tested.
 reasonable price. If your hosting provider doesn't allow Unix shell access,
 you might have trouble getting everything to work.]
 
-2. Unpack the Friendica files into the root of your web server document area.
+2. Unpack the Red files into the root of your web server document area.
 
     - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be 
 
-        `git clone https://github.com/friendica/friendica.git mywebsite`
+        `git clone https://github.com/friendica/red.git mywebsite`
 
     - and then you can pick up the latest changes at any time with
 
         `git pull`
+        
+    - make sure folder *view/tpl/smarty3* exists and is writable by webserver
+        
+        `mkdir view/tpl/smarty3`
+        
+        `chmod 777 view/smarty3`
     
     - For installing addons
     
@@ -50,7 +63,7 @@ you might have trouble getting everything to work.]
             
         - Then you should clone the addon repository (separtely)
         
-            `git clone https://github.com/friendica/friendica-addons.git addon`
+            `git clone https://github.com/friendica/red-addons.git addon`
             
         - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
         
@@ -81,7 +94,7 @@ database was not installed correctly. You might wish to move/rename
 .htconfig.php to another name and empty (called 'dropping') the database
 tables, so that you can start fresh.
 
-7. Set up a cron job or scheduled task to run the poller once every 5-10
+7. Set up a cron job or scheduled task to run the poller once every 15
 minutes in order to perform background processing. Example:
 
     `cd /base/directory; /path/to/php include/poller.php`
@@ -91,21 +104,8 @@ Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
 
-`*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php`
+`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php`
 
 You can generally find the location of PHP by executing "which php". If you
 have troubles with this section please contact your hosting provider for
-assistance. Friendica will not work correctly if you cannot perform this step.
-
-Alternative: You may be able to use the 'poormancron' plugin to perform this step 
-if you are using a recent Friendica release. To do this, edit the file ".htconfig.php"
-and look for a line describing your plugins. On a fresh installation, it will look like
-
-`$a->config['system']['addon'] = 'js_upload';`
-
-This indicates the "js_upload" addon module is enabled. You may add additional 
-addons/plugins using this same line in the configuration file. Change it to read
-
-`$a->config['system']['addon'] = 'js_upload,poormancron';`
-
-and save your changes.    
+assistance. Red will not work correctly if you cannot perform this step.