Merge pull request #1 from friendica/develop

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index 4795a0402d8e61d125276eab0a48658fc97bb24c..effba6a81e81459212112989a8172ebbe729245b 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -74,7 +74,7 @@ You can chose between the following modes:
 ##### Invitation based registry
 
 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.
+To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of 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
@@ -101,6 +101,32 @@ Default is false.
 
 ### File upload
 
+#### File storage backend
+
+Set the backend used by Friendica to store uploaded file data.
+Two storage backends are avaiable with Friendica:
+
+- **Database** : Data is stored in a dedicated table in database (`storage`)
+- **Filesystem** : Data is stored as file on the filesystem.
+
+More storage backends can be avaiable from third-party addons.
+If you use those, please refer to the documentation of those addons for further information.
+
+Default value is 'Database (legacy)': it's the legacy way used to store data directly in database.
+
+Existing data can be moved to the current active backend using the ['storage move' console command](help/tools)
+
+If selected backend has configurable options, new fields are shown here.
+
+##### Filesystem: Storage base path
+
+The base path where Filesystem storage backend saves data.
+
+For maximum security, this path should be outside the folder tree served by the web server: this way files can't be downloaded bypassing the privacy checks.
+
+Default value is `storage`, that is the `storage` folder in Friendica code root folder.
+
+
 #### Maximum Image Size
 
 Maximum size in bytes of uploaded images.
@@ -143,7 +169,6 @@ Your local users will always have access to both pages.
 
 Comma separated list of domains which are allowed to establish friendships with this site.
 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, cooperatives and similar communities that don't want to communicate with the rest of the network.
@@ -153,7 +178,6 @@ This is useful if you want to setup a closed network for educational groups, coo
 Comma separated list of domains which are allowed in email addresses for registrations to this site.
 This can lockout those who are not part of this organisation from registering here.
 Wildcards are accepted.
-(Wildcard support on Windows platforms requires PHP5.3).
 By default, any (valid) email address is allowed in registrations.
 
 #### Allow Users to set remote_self