Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index aad21756fe1c3f1976e97dcf956491604e626c95..64f30139bf92eea2c673bdc4bccbabe9567d45e6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,7 @@ PHP modules
 The following software packages are *required* for this software to
 run correctly.
 
-- PHP 5.4+      For newer versions, some functions that are used may be
+- PHP 5.5+      For newer versions, some functions that are used may be
                 disabled by default, such as the pcntl_* family. See the
                 section on 'Queues and daemons' for more information.
 - MariaDB 5+    GNU Social uses, by default, a MariaDB server for data
@@ -196,7 +196,9 @@ your server (like lighttpd or nginx).
         file is well commented. 
     * For lighttpd, inspect the lighttpd.conf.example file and apply the
         appropriate changes in your virtualhost configuration for lighttpd.
-    * For nginx and other webservers, we gladly accept contributions of
+    * For nginx, inspect the nginx.conf.sample file and apply the appropriate
+        changes.
+    * For other webservers, we gladly accept contributions of
         server configuration examples.
 
 2. Assuming your webserver is properly configured and have its settings