diff --git a/doc/Config.md b/doc/Config.md
index 788c1cd0b6..f85ceb4985 100644
--- a/doc/Config.md
+++ b/doc/Config.md
@@ -1,55 +1,54 @@
-Config values that can only be set in config/local.ini.php
+Config values that can only be set in config/local.config.php
 ==========================================================
 
 * [Home](help)
 
-Friendica's configuration is done in two places: in INI configuration files and in the `config` database table.
+Friendica's configuration is done in two places: in PHP array configuration files and in the `config` database table.
 Database config values overwrite the same file config values.
 
 ## File configuration
 
-WARNING: some characters `?{}|&~![()^"` should not be used in the keys or values. If one of those character is required put the value between double quotes (eg. password = "let&me&in")
-The configuration format for file configuration is an INI string returned from a PHP file.
-This prevents your webserver from displaying your private configuration it interprets the configuration files and displays nothing.
+The configuration format for file configuration is an array returned from a PHP file.
+This prevents your webserver from displaying your private configuration. It interprets the configuration files and displays nothing.
 
 A typical configuration file looks like this:
 
 ```php
-<?php return <<<INI
+<?php
 
-; Comment line
+/*
+ * Comment block
+ */
 
-[section1]
-key = value
-empty_key =
-
-[section2]
-array[] = value0
-array[] = value1
-array[] = value2
-
-INI;
-// Keep this line
+return [
+	'section1' => [
+		// Comment line
+		'key' => 'value',
+	],
+	'section2' => [
+		'array' => ['value0', 'value1', 'value2'],
+	],
+];
 ```
 
 ### Configuration location
 
 The `config` directory holds key configuration files:
 
-- `config.ini.php` holds the default values for all the configuration keys that can only be set in `local.ini.php`.
-- `settings.ini.php` holds the default values for some configuration keys that are set through the admin settings page.
-- `local.ini.php` holds the current node custom configuration.
-- `addon.ini.php` is optional and holds the custom configuration for specific addons.
+- `defaults.config.php` holds the default values for all the configuration keys that can only be set in `local.config.php`.
+- `settings.config.php` holds the default values for some configuration keys that are set through the admin settings page.
+- `local.config.php` holds the current node custom configuration.
+- `addon.config.php` is optional and holds the custom configuration for specific addons.
 
-Addons can define their own default configuration values in `addon/[addon]/config/[addon].ini.php` which is loaded when the addon is activated.
+Addons can define their own default configuration values in `addon/[addon]/config/[addon].config.php` which is loaded when the addon is activated.
 
-#### Migrating from .htconfig.php to config/local.ini.php
+#### Migrating from .htconfig.php to config/local.config.php
 
 The legacy `.htconfig.php` configuration file is still supported, but is deprecated and will be removed in a subsequent Friendica release.
 
 The migration is pretty straightforward:
-If you had any addon-specific configuration in your `.htconfig.php`, just copy `config/addon-sample.ini.php` to `config/addon.ini.php` and move your configuration values.
-Afterwards, copy `config/local-sample.ini.php` to `config/local.ini.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `.htconfig.php` to check your node is working as expected before deleting it.
+If you had any addon-specific configuration in your `.htconfig.php`, just copy `config/addon-sample.config.php` to `config/addon.config.php` and move your configuration values.
+Afterwards, copy `config/local-sample.config.php` to `config/local.config.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `.htconfig.php` to check your node is working as expected before deleting it.
 
 <style>
 table.config {
@@ -81,7 +80,7 @@ table.config > * > tr > th {
 	<thead>
 		<tr>
 			<th>.htconfig.php</th>
-			<th>config/local.ini.php</th>
+			<th>config/local.config.php</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -94,25 +93,25 @@ $db_data = 'mysqldatabasename';
 $a->config["system"]["db_charset"] = 'utf8mb4';
 </pre></td>
 			<td><pre>
-[database]
-hostname = localhost
-username = mysqlusername
-password = mysqlpassword
-database = mysqldatabasename
-charset = utf8mb4
+'database' => [
+	'hostname' => 'localhost',
+	'username' => 'mysqlusername',
+	'password' => 'mysqlpassword',
+	'database' => 'database',
+	'charset' => 'utf8mb4',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $a->config["section"]["key"] = "value";
 </pre></td>
 			<td><pre>
-[section]
-key = value
+'section' => [
+	'key' => 'value',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $a->config["section"]["key"] = array(
@@ -122,74 +121,137 @@ $a->config["section"]["key"] = array(
 );
 </pre></td>
 			<td><pre>
-[section]
-key[] = value1
-key[] = value2
-key[] = value3
+'section' => [
+	'key' => ['value1', 'value2', 'value3'],
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $a->config["key"] = "value";
 </pre></td>
 			<td><pre>
-[config]
-key = value
+'config' => [
+	'key' => 'value',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $a->path = "value";
 </pre></td>
 			<td><pre>
-[system]
-urlpath = value
+'system' => [
+	'urlpath' => 'value',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $default_timezone = "value";
 </pre></td>
 			<td><pre>
-[system]
-default_timezone = value
+'system' => [
+	'default_timezone' => 'value',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $pidfile = "value";
 </pre></td>
 			<td><pre>
-[system]
-pidfile = value
+'system' => [
+	'pidfile' => 'value',
+],
 </pre></td>
 		</tr>
-
 		<tr>
 			<td><pre>
 $lang = "value";
 </pre></td>
 			<td><pre>
-[system]
-language = value
+'system' => [
+	'language' => 'value',
+],
 </pre></td>
 		</tr>
-
 	</tbody>
 </table>
 
+#### Migrating from config/local.ini.php to config/local.config.php
+
+The legacy `config/local.ini.php` configuration file is still supported, but is deprecated and will be removed in a subsequent Friendica release.
+
+The migration is pretty straightforward:
+If you had any addon-specific configuration in your `config/addon.ini.php`, just copy `config/addon-sample.config.php` to `config/addon.config.php` and move your configuration values.
+Afterwards, copy `config/local-sample.config.php` to `config/local.config.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `config/local.ini.php` file to check your node is working as expected before deleting it.
+
+<table class="config">
+	<thead>
+		<tr>
+			<th>config/local.ini.php</th>
+			<th>config/local.config.php</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td><pre>
+[database]
+hostname = localhost
+username = mysqlusername
+password = mysqlpassword
+database = mysqldatabasename
+charset = utf8mb4
+</pre></td>
+			<td><pre>
+'database' => [
+	'hostname' => 'localhost',
+	'username' => 'mysqlusername',
+	'password' => 'mysqlpassword',
+	'database' => 'database',
+	'charset' => 'utf8mb4',
+],
+</pre></td>
+		</tr>
+		<tr>
+			<td><pre>
+[section]
+key = value
+</pre></td>
+			<td><pre>
+'section' => [
+	'key' => 'value',
+],
+</pre></td>
+		</tr>
+		<tr>
+			<td><pre>
+[section]
+key[] = value1
+key[] = value2
+key[] = value3
+</pre></td>
+			<td><pre>
+'section' => [
+	'key' => ['value1', 'value2', 'value3'],
+],
+</pre></td>
+		</tr>
+	</tbody>
+</table>
+
+
 
 ### Database Settings
 
 The configuration variables database.hostname, database.username, database.password, database.database and database.charset are holding your credentials for the database connection.
 If you need to specify a port to access the database, you can do so by appending ":portnumber" to the database.hostname variable.
 
-    [database]
-    hostname = your.mysqlhost.com:123456
+    'database' => [
+        'hostname' => 'your.mysqlhost.com:123456',
+        ...
+    ]
 
 If all of the following environment variables are set, Friendica will use them instead of the previously configured variables for the db:
 
@@ -199,7 +261,7 @@ If all of the following environment variables are set, Friendica will use them i
     MYSQL_PASSWORD
     MYSQL_DATABASE
 
-## Config values that can only be set in config/local.ini.php
+## Config values that can only be set in config/local.config.php
 
 There are some config values that haven't found their way into the administration page.
 This has several reasons.
@@ -210,22 +272,26 @@ Or it is for testing purposes only.
 **Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger.
 Especially don't do that with undocumented values.
 
-These configurations keys and their default value are listed in `config/config.ini.php` and should be ovewritten in `config/local.ini.php`.
+These configurations keys and their default value are listed in `config/defaults.config.php` and should be overwritten in `config/local.config.php`.
 
 ## Administrator Options
 
 Enabling the admin panel for an account, and thus making the account holder admin of the node, is done by setting the variable
 
-    [config]
-    admin_email = someone@example.com
+    'config' => [
+        'admin_email' => 'someone@example.com',
+    ]
+    
 
-Where you have to match the email address used for the account with the one you enter to the config/local.ini.php file.
+Where you have to match the email address used for the account with the one you enter to the `config/local.config.php` file.
 If more then one account should be able to access the admin panel, separate the email addresses with a comma.
 
-    [config]
-    admin_email = someone@example.com,someoneelse@example.com
+    'config' => [
+        'admin_email' => 'someone@example.com,someoneelse@example.com',
+    ]
 
-If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
+If you want to have a more personalized closing line for the notification emails you can set a variable for the `admin_name`.
 
-    [config]
-    admin_name = Marvin
+    'config' => [
+        'admin_name' => 'Marvin',
+    ]
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 1b84b5cd80..46219cce5f 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -64,7 +64,7 @@ However, instead of a direct upload you have to use one of the following methods
 
 Friendica uses HTML5 for embedding content.
 Therefore, the supported files are dependent on your browser and operating system.
-Some supported filetypes are WebM, MP4, MP3 and OGG.
+Some supported file types are WebM, MP4, MP3 and OGG.
 See Wikipedia for more of them ([video](http://en.wikipedia.org/wiki/HTML5_video), [audio](http://en.wikipedia.org/wiki/HTML5_audio)).
 
 <a name="avatars"></a>
@@ -140,7 +140,7 @@ Example: Friendica Support
 <a name="clients"></a>
 ### Are there any clients for friendica I can use?
 
-Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your plattform as long as you can change the API path in its settings.
+Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your platform as long as you can change the API path in its settings.
 Here is a list of known working clients:
 
 * Android
@@ -187,7 +187,7 @@ No, this function is no longer supported as of Friendica 3.3 onwards.
 <a name="sources"></a>
 ### Where can I find the source code of friendica, addons and themes?
 
-You can find the main respository [here](https://github.com/friendica/friendica).
+You can find the main repository [here](https://github.com/friendica/friendica).
 There you will always find the current stable version of friendica.
 
 Addons are listed at [this page](https://github.com/friendica/friendica-addons).
@@ -197,14 +197,14 @@ If you are searching for new themes, you can find them at [Friendica-Themes.com]
 <a name="adminaccount1"></a>
 ### I've changed my email address now the admin panel is gone?
 
-Have a look into your <tt>config/local.ini.php</tt> and fix your email address there.
+Have a look into your <tt>config/local.config.php</tt> and fix your email address there.
 
 <a name="adminaccount2"></a>
 ### Can there be more then one admin for a node?
 
 Yes.
 You just have to list more then one email address in the
-<tt>config/local.ini.php</tt> file.
+<tt>config/local.config.php</tt> file.
 The listed emails need to be separated by a comma.
 
 <a name="dbupdate">
diff --git a/doc/Home.md b/doc/Home.md
index a353bab0d3..5ca573c47b 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -32,7 +32,7 @@ Friendica Documentation and Resources
 * [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
 * [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
 * [Using SSL with Friendica](help/SSL)
-* [Config values that can only be set in config/local.ini.php](help/Config)
+* [Config values that can only be set in config/local.config.php](help/Config)
 * [Improve Performance](help/Improve-Performance)
 * [Administration Tools](help/tools)
 
@@ -56,7 +56,7 @@ Friendica Documentation and Resources
 	* [Twitter/GNU Social API Functions](help/api)
 	* [Code (Doxygen generated - sets cookies)](doc/html/)
 	* [Protocol Documentation](help/Protocol)
-	* [Database schema documantation](help/database)
+	* [Database schema documentation](help/database)
 	* [Class Autoloading](help/autoloader)
 
 **External Resources**
diff --git a/doc/Install.md b/doc/Install.md
index e8a7d509ed..275d21b768 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -32,7 +32,7 @@ Requirements
   * Curl, GD, PDO, MySQLi, hash, xml, zip and OpenSSL extensions
   * The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it)
   * some form of email server or email gateway such that PHP mail() works
-* Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
+* Mysql 5.5.3+ or an equivalent 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.
 * If your hosting provider doesn't allow Unix shell access, you might have trouble getting everything to work.
@@ -75,7 +75,7 @@ Clone the addon repository (separately):
 
 If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden and aren't normally copied.
 
-If you want to use the development version of Friendica you can switch to the devel branch in the repository by running
+If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
 
     git checkout develop
     bin/composer.phar install
@@ -108,19 +108,19 @@ If you need to specify a port for the connection to the database, you can do so
 
 *If* the manual installation fails for any reason, check the following:
 
-* Does "config/local.ini.php" exist? If not, edit config/local-sample.ini.php and change the system settings.
-* Rename to `config/local.ini.php`.
+* Does "config/local.config.php" exist? If not, edit config/local-sample.config.php and change the system settings.
+* Rename to `config/local.config.php`.
 * Is the database is populated? If not, import the contents of `database.sql` with phpmyadmin or the mysql command line.
 
 At this point visit your website again, and register your personal account.
 Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the database was not installed correctly.
-You might wish to move/rename `config/local.ini.php` to another name and empty (called 'dropping') the database tables, so that you can start fresh.
+You might wish to move/rename `config/local.config.php` to another name and empty (called 'dropping') the database tables, so that you can start fresh.
 
 ### Option B: Run the automatic install script
 
 You have the following options to automatically install Friendica:
--	creating a prepared config file (f.e. `prepared.ini.php`)
+-	creating a prepared config file (f.e. `prepared.config.php`)
 -	using environment variables (f.e. `MYSQL_HOST`)
 -	using options (f.e. `--dbhost <host>`)
 
@@ -136,17 +136,17 @@ If you wish to include all optional checks, use `-a` like this statement:
     
 *If* the automatic installation fails for any reason, check the following:
 
-*	Does `config/local.ini.php` already exist? If yes, the automatic installation won't start
-*	Are the options in the `config/local.ini.php` correct? If not, edit them directly.
+*	Does `config/local.config.php` already exist? If yes, the automatic installation won't start
+*	Are the options in the `config/local.config.php` correct? If not, edit them directly.
 *	Is the empty MySQL-database created? If not, create it.
 
 #### B.1: Config file
 
-You can use a prepared config file like [local-sample.ini.php](config/local-sample.ini.php).
+You can use a prepared config file like [local-sample.config.php](config/local-sample.config.php).
 
 Navigate to the main Friendica directory and execute the following command:
 
-    bin/console autoinstall -f <prepared.ini.php>
+    bin/console autoinstall -f <prepared.config.php>
     
 #### B.2: Environment variables
 
@@ -158,7 +158,7 @@ You can use the options during installation too and skip some of the environment
 
 **Database credentials**
 
-if you don't use the option `--savedb` during installation, the DB credentials will **not** be saved in the `config/local.ini.php`.
+if you don't use the option `--savedb` during installation, the DB credentials will **not** be saved in the `config/local.config.php`.
 
 -	`MYSQL_HOST` The host of the mysql/mariadb database
 -	`MYSQL_PORT` The port of the mysql/mariadb database
@@ -170,13 +170,13 @@ if you don't use the option `--savedb` during installation, the DB credentials w
 **Friendica settings**
 
 This variables wont be used at normal Friendica runtime.
-Instead, they get saved into `config/local.ini.php`. 
+Instead, they get saved into `config/local.config.php`. 
 
 -	`FRIENDICA_URL_PATH` The URL path of Friendica (f.e. '/friendica')
 -	`FRIENDICA_PHP_PATH` The path of the PHP binary
 -	`FRIENDICA_ADMIN_MAIL` The admin email address of Friendica (this email will be used for admin access)
 -	`FRIENDICA_TZ` The timezone of Friendica
--	`FRIENDICA_LANG` The langauge of Friendica
+-	`FRIENDICA_LANG` The language of Friendica
 
 Navigate to the main Friendica directory and execute the following command:
 
@@ -184,7 +184,7 @@ Navigate to the main Friendica directory and execute the following command:
 
 #### B.3: Execution options
 
-All options will be saved in the `config/local.ini.php` and are overruling the associated environment variables.
+All options will be saved in the `config/local.config.php` and are overruling the associated environment variables.
 
 -	`-H|--dbhost <host>` The host of the mysql/mariadb database (env `MYSQL_HOST`)
 -	`-p|--dbport <port>` The port of the mysql/mariadb database (env `MYSQL_PORT`)
@@ -256,5 +256,5 @@ Bad things will happen.
 Let there be a hardware failure, a corrupted database or whatever you can think of.
 So once the installation of your Friendica node is done, you should make yourself a backup plan.
 
-The most important file is the `config/local.ini.php` file.
+The most important file is the `config/local.config.php` file.
 As it stores all your data, you should also have a recent dump of your Friendica database at hand, should you have to recover your node.
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index f1eba5a6a0..d63d2c2e1c 100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@@ -19,7 +19,7 @@ Addons must be installed by the site administrator before they can be used.
 This is accomplished through the site administration panel.
 
 Each of the connectors also requires an "API key" from the service you wish to connect with.
-Some addons allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (config/local.ini.php).
+Some addons allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (config/local.config.php).
 The ways to obtain these keys vary between the services, but they all require an existing account on the target service.
 Once installed, these API keys can usually be shared by all site members.
 
@@ -39,7 +39,7 @@ You can get it from [Twitter](https://twitter.com/apps).
 Register your Friendica site as "Client" application with "Read & Write" access.
 We do not need "Twitter as login".
 When you've registered the app you get a key pair with an OAuth Consumer key and a secret key for your application/site.
-Add this key pair to your config/local.ini.php:
+Add this key pair to your config/local.config.php:
 
 	[twitter]
 	consumerkey = your consumer_key here
diff --git a/doc/Settings.md b/doc/Settings.md
index dda2a9a587..9f54513fbc 100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -8,7 +8,7 @@ On the front page of the admin panel you will see a summary of information about
 These information include the amount of messages currently being processed in the queues.
 The first number is the number of messages which could not been delivered for various reasons.
 They will be resend later.
-You can have a quick glance into that second queus in the "Inspect Queue" section of the admin panel.
+You can have a quick glance into that second queues in the "Inspect Queue" section of the admin panel.
 The second number represents the current number of jobs for the background workers.
 These worker tasks are prioritised and are done accordingly.
 
@@ -16,9 +16,9 @@ Then you get an overview of the accounts on your node, which can be moderated in
 As well as an overview of the currently active addons
 The list is linked, so you can have quick access to the Addon settings.
 And finally you are informed about the version of Friendica you have installed.
-If you contact the devs with a bug or problem, please also mention the version of your node.
+If you contact the developers with a bug or problem, please also mention the version of your node.
 
-The admin panel is seperated into subsections accessible from the side bar of the panel.
+The admin panel is separated into subsections accessible from the side bar of the panel.
 
 ## Site
 
@@ -42,17 +42,17 @@ This option will set the default language for the node.
 It is used as fall back setting should Friendica fail to recognize the visitors preferences and can be overwritten by user settings.
 
 The Friendica community offers some translations.
-Some more compleate then others.
+Some more complete then others.
 See [this help page](/help/translations) for more information about the translation process.
 
 #### System Theme
 
 Choose a theme to be the default system theme.
 This can be over-ridden by user profiles.
-Default theme is "duepunto zero" at the moment.
+Default theme is `vier` at the moment.
 
 You may also want to set a special theme for mobile interfaces.
-Which may or may not be neccessary depending of the mobile friendlyness of the desktop theme you have chosen.
+Which may or may not be necessary depending of the mobile friendliness of the desktop theme you have chosen.
 The `vier` theme for instance is mobile friendly.
 
 ### Registration
@@ -68,8 +68,8 @@ You can chose between the following modes:
 
 ##### Invitation based registry
 
-Additionally to the setting in the admin panel, you can devide if registrations are only possible using an invitation code or not.
-To enable invitation based registration, you have to set the `invitation_only` setting in the [config/local.ini.php](/help/Config) file.
+Additionally to the setting in the admin panel, you can decide if registrations are only possible using an invitation code or not.
+To enable invitation based registration, you have to set the `invitation_only` setting in the [config/local.config.php](/help/Config) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 
 #### Check Full Names
@@ -91,7 +91,7 @@ The ability to create "Pages" requires a person to register more than once.
 Your site configuration can block registration (or require approval to register).
 By default, logged in users can register additional accounts for use as pages.
 These will still require approval if the registration policy is set to *require approval*
-You may prohibit logged in users from creating additional accounts by setting *block multible registrations* to true.
+You may prohibit logged in users from creating additional accounts by setting *block multiple registrations* to true.
 Default is false.
 
 ### File upload
@@ -141,7 +141,7 @@ Wildcards are accepted.
 (Wildcard support on Windows platforms requires PHP5.3).
 By default, any (valid) domain may establish friendships with this site.
 
-This is useful if you want to setup a closed network for educational groups, cooperations and similar communities that don't want to commuicate with the rest of the network.
+This is useful if you want to setup a closed network for educational groups, cooperatives and similar communities that don't want to communicate with the rest of the network.
 
 #### Allowed Email Domains
 
@@ -184,7 +184,7 @@ Value is in seconds.
 Default is 60 seconds.
 Set to 0 for unlimited (not recommended).
 
-#### Verify SSL Certitificates
+#### Verify SSL Certificates
 
 By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates.
 For the widest compatibility with browsers and other networks we do not recommend using self-signed certificates, but we will not prevent you from using them.
@@ -217,7 +217,7 @@ The tasks for the background process have priorities.
 To guarantee that important tasks are executed even though the system has a lot of work to do, it is useful to enable the *fastlane*.
 
 Should you not be able to run a cron job on your server, you can also activate the *frontend* worker.
-If you have done so, you can call `example.com/worker` (replace example.com with your actual domain name) on a regular basis from an external servie.
+If you have done so, you can call `example.com/worker` (replace example.com with your actual domain name) on a regular basis from an external service.
 This will then trigger the execution of the background process.
 
 ### Relocate
@@ -234,13 +234,13 @@ You can sort the user list by name, email, registration date, date of last login
 Here the admin can also block/unblock users from accessing the node or delete the accounts entirely.
 
 In the last section of the page admins can create new accounts on the node.
-The password for the new account will be send by email to the choosen email address.
+The password for the new account will be send by email to the chosen email address.
 
 ## Addons
 
 This page is for selecting and configuration of extensions for Friendica which have to be placed into the `/addon` subdirectory of your Friendica installation.
 You are presented with a long list of available addons.
-The name of each addon is linked to a separate page for that addon which offers more informations and configuration possibilities.
+The name of each addon is linked to a separate page for that addon which offers more information and configuration possibilities.
 Also shown is the version of the addon and an indicator if the addon is currently active or not.
 
 When you update your node and the addons they may have to be reloaded.
@@ -263,16 +263,16 @@ In this section of the admin panel you can select a default setting for your nod
 ## DB Updates
 
 Should the database structure of Friendica change, it will apply the changes automatically.
-In case you are suspecious that the update might not have worked, you can use this section of the admin panel to check the situation.
+In case you are suspecting the update might not have worked, you can use this section of the admin panel to check the situation.
 
 ## Inspect Queue
 
 In the admin panel summary there are two numbers for the message queues.
 The second number represents messages which could not be delivered and are queued for later retry.
-If this number goes sky-rocking you might ask yourself which receopiant is not receiving.
+If this number goes sky-rocking you might ask yourself which recipient is not receiving.
 
 Behind the inspect queue section of the admin panel you will find a list of the messages that could not be delivered.
-The listing is sorted by the receipiant name so identifying potential broken communication lines should be simple.
+The listing is sorted by the recipient name so identifying potential broken communication lines should be simple.
 These lines might be broken for various reasons.
 The receiving end might be off-line, there might be a high system load and so on.
 
@@ -288,7 +288,7 @@ Matching is exact, blocking a domain doesn't block subdomains.
 ## Federation Statistics
 
 The federation statistics page gives you a short summery of the nodes/servers/pods of the decentralized social network federation your node knows.
-These numbers are not compleate and only contain nodes from networks Friendica federates directly with.
+These numbers are not complete and only contain nodes from networks Friendica federates directly with.
 
 ## Delete Item
 
@@ -304,16 +304,16 @@ All those addons will be listed in this area of the admin panels side bar with t
 
 ## Logs
 
-The log section of the admin panel is seperated into two pages.
+The log section of the admin panel is separated into two pages.
 On the first, following the "log" link, you can configure how much Friendica shall log.
 And on the second you can read the log.
 
 You should not place your logs into any directory that is accessible from the web.
 If you have to, and you are using the default configuration from Apache, you should choose a name for the logfile ending in ``.log`` or ``.out``.
-Should you use another web server, please make sure that you have the correct accessrules in place so that your log files are not accessible.
+Should you use another web server, please make sure that you have the correct access rules in place so that your log files are not accessible.
 
 There are five different log levels: Normal, Trace, Debug, Data and All.
-Specifying different verbosities of information and data written out to the log file.
+Specifying different verbosity of information and data written out to the log file.
 Normally you should not need to log at all.
 The *DEBUG* level will show a good deal of information about system activity but will not include detailed data.
 In the *ALL* level Friendica will log everything to the file.
@@ -324,8 +324,8 @@ You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_
 
 **Known Issues**: The filename ``friendica.log`` can cause problems depending on your server configuration (see [issue 2209](https://github.com/friendica/friendica/issues/2209)).
 
-By default PHP warnings and error messages are supressed.
-If you want to enable those, you have to activate them in the ``config/local.ini.php`` file.
+By default PHP warnings and error messages are suppressed.
+If you want to enable those, you have to activate them in the ``config/local.config.php`` file.
 Use the following settings to redirect PHP errors to a file.
 
 Config:
@@ -345,7 +345,7 @@ If you encounter a blank (white) page when using the application, view the PHP l
 
 ## Diagnostics
 
-In this section of the admin panel you find two tools to investigate what Friendica sees for certain ressources.
+In this section of the admin panel you find two tools to investigate what Friendica sees for certain resources.
 These tools can help to clarify communication problems.
 
 For the *probe address* Friendica will display information for the address provided.
@@ -359,12 +359,15 @@ These are the data base settings, the admin account settings, the path of PHP an
 
 ## DB Settings
 
-With the following settings, you specify the data base server, the username and passwort for Friendica and the database to use.
+With the following settings, you specify the data base server, the username and password for Friendica and the database to use.
 
-    $db_host = 'your.db.host';
-    $db_user = 'db_username';
-    $db_pass = 'db_password';
-    $db_data = 'database_name';
+    'database' => [
+        'hostname' => 'localhost',
+        'username' => 'mysqlusername',
+        'password' => 'mysqlpassword',
+        'database' => 'mysqldatabasename',
+        'charset' => 'utf8mb4',
+    ],
 
 ## Admin users
 
@@ -373,27 +376,30 @@ By default this will be the one account you create during the installation proce
 But you can expand the list of email addresses by any used email address you want.
 Registration of new accounts with a listed email address is not possible.
 
-    [config]
-    admin_email = you@example.com, buddy@example.com
+	'config' => [
+        'admin_email' => 'you@example.com, buddy@example.com',
+    ],
 
 ## PHP Path
 
-Some of Friendicas processes are running in the background.
+Some of Friendica's processes are running in the background.
 For this you need to specify the path to the PHP binary to be used.
 
-    [config]
-    php_path = {{$phpath}}
+    'config' => [
+        'php_path' => '/usr/bin/php',
+    ],
 
 ## Subdirectory configuration
 
-It is possible to install Friendica into a subdirectory of your webserver.
-We strongly discourage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Socia, Hubzilla)
+It is possible to install Friendica into a subdirectory of your web server.
+We strongly discourage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Social, Hubzilla)
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
 
-    [system]
-    urlpath = tests/friendica
+    'system' => [
+        'urlpath' => 'tests/friendica',
+    ],
 
 ## Other exceptions
 
-Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in config/local.ini.php](help/Config) section of the documentation.
+Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in config/local.config.php](help/Config) section of the documentation.
 
diff --git a/doc/Update.md b/doc/Update.md
index 835dd3375d..17c2d0e724 100644
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -7,7 +7,7 @@ Updating Friendica
 
 If you installed Friendica in the ``path/to/friendica`` folder:
 1. Unpack the new Friendica archive in ``path/to/friendica_new``.
-2. Copy ``config/local.ini.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
+2. Copy ``config/local.config.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
 3. Rename the ``path/to/friendica`` folder to ``path/to/friendica_old``.
 4. Rename the ``path/to/friendica_new`` folder to ``path/to/friendica``.
 5. Check your site. Note: it may go into maintenance mode to update the database schema.
diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 6fd74240d9..4040495ca6 100644
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -42,7 +42,7 @@ This will not delete the virtual machine.
 9. To ultimately delete the virtual machine run
 
         $> vagrant destroy
-        $> rm /vagrant/config/local.ini.php
+        $> rm /vagrant/config/local.config.php
 
 to make sure that you can start from scratch with another "vagrant up".
 
@@ -53,6 +53,6 @@ You will then have the following accounts to login:
   * friendica1, password friendica1
   * friendica2, password friendica2 and so on until friendica5
   * friendica1 is connected to all others. friendica1 has two groups: group1 with friendica2 and friendica4, group2 with friendica3 and friendica5.
-  * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected.
+  * friendica2 and friendica3 are connected. friendica4 and friendica5 are connected.
 
 For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md
index fe8a9d128d..0c77635ccb 100644
--- a/doc/de/FAQ.md
+++ b/doc/de/FAQ.md
@@ -199,7 +199,7 @@ Admin
 
 Ja, das ist möglich.
 Es ist allerdings nicht möglich, eine Datenbank durch zwei Domains zu nutzen.
-Solange Du Deine config/local.ini.php allerdings so einrichtest, dass das System nicht versucht, eine Installation durchzuführen, kannst Du die richtige Config-Datei in include/$hostname/config/local.ini.php hinterlegen.
+Solange Du Deine config/local.config.php allerdings so einrichtest, dass das System nicht versucht, eine Installation durchzuführen, kannst Du die richtige Config-Datei in include/$hostname/config/local.config.php hinterlegen.
 Alle Cache-Aspekte und der Zugriffsschutz können pro Instanz konfiguriert werden.
 
 <a name="sources"></a>
@@ -216,13 +216,13 @@ Wenn Du neue Themen suchst, findest Du sie auf [Friendica-Themes.com](http://fri
 <a name="adminaccount1"></a>
 ### Ich habe meine E-Mail Adresse geändern und jetzt ist das Admin Panel verschwunden?
 
-Bitte aktualisiere deine E-Mail Adresse in der <tt>config/local.ini.php</tt> Datei.
+Bitte aktualisiere deine E-Mail Adresse in der <tt>config/local.config.php</tt> Datei.
 
 <a name="adminaccount2"></a>
 ### Kann es mehr als einen Admin auf einer Friendica Instanz geben?
 
 Ja.
-Du kannst in der <tt>config/local.ini.php</tt> Datei mehrere E-Mail Adressen auflisten.
+Du kannst in der <tt>config/local.config.php</tt> Datei mehrere E-Mail Adressen auflisten.
 Die aufgelisteten Adressen werden mit Kommata von einander getrennt.
 
 <a name="dbupdate">
diff --git a/doc/de/Home.md b/doc/de/Home.md
index 6c95476eda..1498ccff1a 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -34,7 +34,7 @@ Friendica - Dokumentation und Ressourcen
 * [Konnektoren (Connectors) installieren (Twitter/GNU Social)](help/Installing-Connectors)
 * [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
 * [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
-* [Konfigurationswerte, die nur in der config/local.ini.php gesetzt werden können](help/Config) (EN)
+* [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können](help/Config) (EN)
 * [Performance verbessern](help/Improve-Performance)
 * [Administration Werkzeuge](help/tools) (EN)
 
diff --git a/doc/de/Install.md b/doc/de/Install.md
index 21c5513ac4..209f78c608 100644
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -112,18 +112,18 @@ 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.
 
 *Wenn* die manuelle Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
-* "config/local.ini.php" existiert ... wenn nicht, bearbeite die „config/local-sample.ini.php“ und ändere die Systemeinstellungen. Benenne sie um in „config/local.ini.php".
+* "config/local.config.php" existiert ... wenn nicht, bearbeite die „config/local-sample.config.php“ und ändere die Systemeinstellungen. Benenne sie um in „config/local.config.php".
 * die Datenbank beinhaltet Daten. ... wenn nicht, importiere den Inhalt der Datei "database.sql" mit phpmyadmin oder per mysql-Kommandozeile.
 
 Besuche deine Seite an diesem Punkt wieder und registriere deinen persönlichen Account.
 Alle Registrierungsprobleme sollten automatisch behebbar sein.
 Wenn du irgendwelche **kritischen** Fehler zu diesen Zeitpunkt erhalten solltest, deutet das darauf hin, dass die Datenbank nicht korrekt installiert wurde.
-Du kannst bei Bedarf die Datei config/local.ini.php verschieben/umbenennen und die Datenbank leeren (als „Dropping“ bezeichnet), so dass du mit einem sauberen System neu starten kannst.
+Du kannst bei Bedarf die Datei config/local.config.php verschieben/umbenennen und die Datenbank leeren (als „Dropping“ bezeichnet), so dass du mit einem sauberen System neu starten kannst.
 
 ### Option B: Starte das automatische Installationsscript
 
 Es existieren folgende Varianten zur automatischen Installation von Friendica:
--	Eine vorgefertigte Konfigurationsdatei erstellen (z.B. `prepared.ini.php`)
+-	Eine vorgefertigte Konfigurationsdatei erstellen (z.B. `prepared.config.php`)
 -	Verwendung von Umgebungsvariablen (z.B. `MYSQL_HOST`)
 -	Verwendung von Optionen (z.B. `--dbhost <host>`)
 
@@ -139,17 +139,17 @@ Falls du alle optionalen Checks ausfürehn lassen möchtest, benutze diese Optio
     bin/console autoinstall -a
 
 *Wenn* die automatisierte Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
-*	Existiert die `config/local.ini.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
-*	Sind Einstellungen in der `config/local.ini.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
+*	Existiert die `config/local.config.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
+*	Sind Einstellungen in der `config/local.config.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
 *	Ist die leere MySQL-Datenbank erstellt? Falls nicht, erstelle diese.
 
 #### B.1: Konfigurationsdatei
 
-Für diese Variante muss ein Konfigurationsdatei bereits vor der Installation fertig definiert sein (z.B. [local-sample.ini.php](config/local-sample.ini.php).
+Für diese Variante muss ein Konfigurationsdatei bereits vor der Installation fertig definiert sein (z.B. [local-sample.config.php](config/local-sample.config.php).
 
 Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
 
-    bin/console autoinstall -f <prepared.ini.php>
+    bin/console autoinstall -f <prepared.config.php>
 
 #### B.2: Umgebungsvariablen
 
@@ -161,7 +161,7 @@ Umgebungsvariablen können auch durch adäquate Optionen (z.B. `--dbhost <hostna
 
 **Datenbank Einstellungen**
 
-Nur wenn die Option `--savedb` gesetzt ist, werden diese Umgebungsvariablen auch in `config/local.ini.php` gespeichert!
+Nur wenn die Option `--savedb` gesetzt ist, werden diese Umgebungsvariablen auch in `config/local.config.php` gespeichert!
 
 -	`MYSQL_HOST` Der Host der MySQL/MariaDB Datenbank
 -	`MYSQL_PORT` Der Port der MySQL/MariaDB Datenbank
@@ -173,7 +173,7 @@ Nur wenn die Option `--savedb` gesetzt ist, werden diese Umgebungsvariablen auch
 **Friendica Einstellungen**
 
 Diese Umgebungsvariablen können nicht während des normalen Friendica Betriebs verwendet werden.
-Sie werden stattdessen direkt in `config/local.ini.php` gespeichert.
+Sie werden stattdessen direkt in `config/local.config.php` gespeichert.
 
 -	`FRIENDICA_PHP_PATH` Der Pfad zur PHP-Datei
 -	`FRIENDICA_ADMIN_MAIL` Die Admin E-Mail Adresse dieses Friendica Knotens (wird auch für den Admin-Zugang benötigt)
@@ -186,7 +186,7 @@ Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Bef
     
 #### B.3: Optionen
 
-Alle Optionen werden in `config/local.ini.php` gespeichert und überschreiben etwaige, zugehörige Umgebungsvariablen.
+Alle Optionen werden in `config/local.config.php` gespeichert und überschreiben etwaige, zugehörige Umgebungsvariablen.
 
 -	`-H|--dbhost <host>` Der Host der MySQL/MariaDB Datenbank (env `MYSQL_HOST`)
 -	`-p|--dbport <port>` Der Port der MySQL/MariaDB Datenbank (env `MYSQL_PORT`)
@@ -227,5 +227,5 @@ Es werden schlimme Dinge geschehen.
 Sei es nun ein Hardwareversagen oder eine kaputte Datenbank.
 Deshalb solltest du dir, nachdem die Installation deines Friendica Knotens abgeschlossen ist, einen Backup Plan erstellen.
 
-Die wichtigste Datei ist die `config/local.ini.php` im Stammverzeichnis deiner Friendica Installation.
+Die wichtigste Datei ist die `config/local.config.php` im Stammverzeichnis deiner Friendica Installation.
 Und da alle Daten in der Datenbank gespeichert werden, solltest du einen nicht all zu alten Dump der Friendica Datenbank zur Hand haben, solltest du deinen Knoten wieder herstellen müssen.
diff --git a/doc/de/Installing-Connectors.md b/doc/de/Installing-Connectors.md
index 3fa46ab5a4..9025d3d73b 100644
--- a/doc/de/Installing-Connectors.md
+++ b/doc/de/Installing-Connectors.md
@@ -18,7 +18,7 @@ Erweiterung müssen vom Administrator installiert werden, bevor sie genutzt werd
 Dieses kann über das Administrationsmenü erstellt werden.
 
 Jeder der Konnektoren benötigt zudem einen API-Schlüssel vom Service, der verbunden werden soll.
-Einige Erweiterung erlaube es, diese Informationen auf den Administrationsseiten einzustellen, wohingegen andere eine direkte Bearbeitung der Konfigurationsdatei "config/local.ini.php" erfordern.
+Einige Erweiterung erlaube es, diese Informationen auf den Administrationsseiten einzustellen, wohingegen andere eine direkte Bearbeitung der Konfigurationsdatei "config/local.config.php" erfordern.
 Der Weg, um diese Schlüssel zu erhalten, variiert stark, jedoch brauchen fast alle einen bestehenden Account im gewünschten Service.
 Einmal installiert, können diese Schlüssel von allen Seitennutzern genutzt werden.
 
@@ -37,7 +37,7 @@ Um dieses Erweiterung zu nutzen, benötigst du einen OAuth Consumer-Schlüsselpa
 
 Registriere deine Friendica-Seite als "Client"-Anwendung mit "Read&Write"-Zugriff. Wir benötigen "Twitter als Login" nicht. Sobald du deine Anwendung installiert hast, erhältst du das Schlüsselpaar für deine Seite.
 
-Trage dieses Schlüsselpaar in deine globale "config/local.ini.php"-Datei ein.
+Trage dieses Schlüsselpaar in deine globale "config/local.config.php"-Datei ein.
 
 ```
 [twitter]
diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 4d84f873ff..12cc035079 100644
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@@ -66,7 +66,7 @@ Dabei kannst du zwischen den folgenden Optionen wählen:
 ##### Einladungen
 
 Zusätzlich zu den oben genannten Möglichkeiten, kann die Registrierung eines neuen Nutzerkontos an eine Einladung durch einen bestehenden Nutzer gekoppelt werden.
-Hierzu muss in der [config/local.ini.php](/help/Config) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
+Hierzu muss in der [config/local.config.php](/help/Config) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
 
 #### Namen auf Vollständigkeit überprüfen
 
@@ -313,7 +313,7 @@ Du solltest deshalb einen Dienst zur [log rotation](https://en.wikipedia.org/wik
 **Bekannte Probleme**: Der Dateiname `friendica.log` kann bei speziellen Server Konfigurationen zu Problemen führen (siehe [issue 2209](https://github.com/friendica/friendica/issues/2209)).
 
 Normalerweise werden Fehler- und Warnmeldungen von PHP unterdrückt.
-Wenn du sie aktivieren willst, musst du folgendes in der `config/local.ini.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
+Wenn du sie aktivieren willst, musst du folgendes in der `config/local.config.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
 
 	error_reporting(E_ERROR | E_WARNING | E_PARSE );
 	ini_set('error_log','php.out');
@@ -347,10 +347,13 @@ Dies sind die Datenbank Einstellungen, die Administrator Accounts, der PHP Pfad
 
 Mit den folgenden Einstellungen kannst du die Zugriffsdaten für den Datenbank Server festlegen.
 
-    $db_host = 'your.db.host';
-    $db_user = 'db_username';
-    $db_pass = 'db_password';
-    $db_data = 'database_name';
+    'database' => [
+        'hostname' => 'localhost',
+        'username' => 'mysqlusername',
+        'password' => 'mysqlpassword',
+        'database' => 'mysqldatabasename',
+        'charset' => 'utf8mb4',
+    ],
 
 Sollten alle der folgenden Environment-Variablen gesetzt sein, wird Friendica diese anstatt der vorher konfigurierten Werte nutzen.
 
@@ -367,16 +370,18 @@ Normalerweise trifft dies auf den ersten Account zu, der nach der Installation a
 Die Liste der E-Mail Adressen kann aber einfach erweitert werden.
 Mit keiner der angegebenen E-Mail Adressen können weitere Accounts registriert werden.
 
-    [config]
-    admin_email = you@example.com, buddy@example.com
+	'config' => [
+        'admin_email' => 'you@example.com, buddy@example.com',
+    ],
 
 ## PHP Pfad
 
 Einige Prozesse von Friendica laufen im Hintergrund.
 Für diese Prozesse muss der Pfad zu der PHP Version gesetzt sein, die verwendet werden soll.
 
-    [config]
-    php_path = {{$phpath}}
+    'config' => [
+        'php_path' => '/usr/bin/php',
+    ],
 
 ## Unterverzeichnis Konfiguration
 
@@ -384,10 +389,11 @@ Man kann Friendica in ein Unterverzeichnis des Webservers installieren.
 Wir raten allerdings dringen davon ab, da es die Interoperabilität mit anderen Netzwerken (z.B. Diaspora, GNU Social, Hubzilla) verhindert.
 Mal angenommen, du hast ein Unterverzeichnis tests und willst Friendica in ein weiteres Unterverzeichnis installieren, dann lautet die Konfiguration hierfür:
 
-    [system]
-    urlpath = tests/friendica
+    'system' => [
+        'urlpath' => 'tests/friendica',
+    ],
 
 ## Weitere Ausnahmen
 
-Es gibt noch einige experimentelle Einstellungen, die nur in der ``config/local.ini.php`` Datei konfiguriert werden können.
-Im [Konfigurationswerte, die nur in der config/local.ini.php gesetzt werden können (EN)](help/Config) Artikel kannst du mehr darüber erfahren.
+Es gibt noch einige experimentelle Einstellungen, die nur in der ``config/local.config.php`` Datei konfiguriert werden können.
+Im [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können (EN)](help/Config) Artikel kannst du mehr darüber erfahren.