Degrade priority step by step

[friendica.git] / doc / Install.md

diff --git a/doc/Install.md b/doc/Install.md
index 6c4d79287acb8bf383231a18abc8ba7d5a197a3a..53df55be067c8535291119d110e910f5608cb800 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -28,9 +28,8 @@ Requirements
 * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
 * PHP 5.4+.
 * PHP *command line* access with register_argc_argv set to true in the php.ini file
 * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
 * PHP 5.4+.
 * PHP *command line* access with register_argc_argv set to true in the php.ini file

-* curl, gd, mysql, hash and openssl extensions
+* Curl, GD, PDO, MySQLi, hash and OpenSSL extensions

 * some form of email server or email gateway such that PHP mail() works
 * some form of email server or email gateway such that PHP mail() works

-* mcrypt (optional; used for server-to-server message encryption)

 * Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.)
 * Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested.
 * Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.)
 * Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested.


@@ -73,7 +72,7 @@ With newer releases of MySQL (5.7.17 or newer), you might need to set the sql_mo
 Use this setting when the installer is unable to create all the needed tables due to a timestamp format problem.
 In this case find the [mysqld] section in your my.cnf file and add the line :
 
 Use this setting when the installer is unable to create all the needed tables due to a timestamp format problem.
 In this case find the [mysqld] section in your my.cnf file and add the line :
 

-sql_mode = ''
+    sql_mode = ''

 
 Restart mysql and you should be fine.
 
 
 Restart mysql and you should be fine.
 


@@ -83,6 +82,8 @@ Restart mysql and you should be fine.
 Point your web browser to the new site and follow the instructions.
 Please note any error messages and correct these before continuing.
 
 Point your web browser to the new site and follow the instructions.
 Please note any error messages and correct these before continuing.
 

+If you need to specify a port for the connection to the database, you can do so in the host name setting for the database.
+

 *If* the automated installation fails for any reason, check the following:
 
 * Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php
 *If* the automated installation fails for any reason, check the following:
 
 * Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php