keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7965 from tobiasd/20191218-install

Browse source 
fix requested stuff for Install.md from 7938
This commit is contained in:
Michael Vogel 2019-12-18 06:51:29 +01:00 committed by GitHub
commit 1525e9dde3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/Install.md
View file

@ -30,7 +30,7 @@ The account will expire after 7 days, but you can ask the server admin to keep y
### Requirements ### Requirements
* Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file * Apache with mod-rewrite enabled and "Options All" so you can use a local `.htaccess` file
* PHP 7+ (PHP 7.1+ is recommended for performance and official support) * PHP 7+ (PHP 7.1+ is recommended for performance and official support)
* PHP *command line* access with register_argc_argv set to true in the php.ini file * PHP *command line* access with register_argc_argv set to true in the php.ini file
* Curl, GD, PDO, MySQLi, hash, xml, zip and OpenSSL extensions * Curl, GD, PDO, MySQLi, hash, xml, zip and OpenSSL extensions
@ -63,8 +63,7 @@ If this is nothing for you, you might be interested in
Unpack the Friendica files into the root of your web server document area. Unpack the Friendica files into the root of your web server document area.
If you copy the directory tree to your webserver, make sure that you also copy If you copy the directory tree to your webserver, make sure that you also copy `.htaccess-dist` - as "dot" files are often hidden and aren't normally copied.
`.htaccess-dist` - as "dot" files are often hidden and aren't normally copied.
**OR** **OR**
@ -112,8 +111,9 @@ Please check the [troubleshooting](#Troubleshooting) section if running on MySQL
### Option A: Run the installer ### Option A: Run the installer
Before you point your web browser to the new site you need to rename .htaccess-dist to .htaccess for Apache installs. Before you point your web browser to the new site you need to copy `.htaccess-dist` to `.htaccess` for Apache installs.
Follow the instructions. Please note any error messages and correct these before continuing. 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 you need to specify a port for the connection to the database, you can do so in the host name setting for the database.
@ -328,7 +328,7 @@ If the database resides on the same machine, check that the database server name
### 500 Internal Error ### 500 Internal Error
This could be the result of one of our Apache directives not being supported by your version of Apache. Examine your apache server logs. This could be the result of one of our Apache directives not being supported by your version of Apache. Examine your apache server logs.
You might remove the line "Options -Indexes" from the .htaccess file if you are using a Windows server as this has been known to cause problems. You might remove the line "Options -Indexes" from the `.htaccess` file if you are using a Windows server as this has been known to cause problems.
Also check your file permissions. Your website and all contents must generally be world-readable. Also check your file permissions. Your website and all contents must generally be world-readable.
It is likely that your web server reported the source of the problem in its error log files. It is likely that your web server reported the source of the problem in its error log files.

1
doc/de/Install.md
View file

@ -107,6 +107,7 @@ Starte MySQL dann neu und es sollte klappen.
### Option A: Der manuelle Installer ### Option A: Der manuelle Installer
Besuche deine Webseite mit deinem Browser und befolge die Anleitung. Besuche deine Webseite mit deinem Browser und befolge die Anleitung.
Bevor du dies tust, kopiere die Datei `.htaccess-dist` nach `.htaccess`, wenn du den Apache Webserver verwendest.
Bitte beachte jeden Fehler und korrigiere diese, bevor du fortfährst. Bitte beachte jeden Fehler und korrigiere diese, bevor du fortfährst.
Falls du einen Port für die Datenbankverbindung angeben musst, kannst du diesen in der Host-Eingabe Zeile angeben. Falls du einen Port für die Datenbankverbindung angeben musst, kannst du diesen in der Host-Eingabe Zeile angeben.