rework autocomplete: update jquery.textcomplete to v1.3.3

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index fee8ec1c53c26ce653344239ca25e30da654dbc6..7d909afa093a51d06037e0286b2993d3507c0313 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -11,8 +11,6 @@ Hot Keys
 Friendica traps the following keyboard events:
 
 * [Pause] - Pauses "Ajax" update activity. This is the process that provides updates without reloading the page. You may wish to pause it to reduce network usage and/or as a debugging aid for javascript developers. A pause indicator will appear at the lower right hand corner of the page. Hit the [pause] key once again to resume.
-* [F8] - Displays a language selector
-
 
 Birthday Notifications
 ---
@@ -24,6 +22,9 @@ You are not required to provide the year.
 System settings
 ---
 
+**Settings should be done in the admin panel** (/admin).
+Those settings found in the database, will always override the settings added to the ``.htconfig.php`` file.
+
 ###Language
 
 Please see util/README for information on creating language translations.
@@ -198,9 +199,9 @@ Config:
 
 This configures the URL to update the global directory, and is supplied in the default configuration.
 The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
-This allows a private community to be completely isolated from the global mistpark network. 
+This allows a private community to be completely isolated from the global network. 
 
-       $a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+       $a->config['system']['directory'] = 'http://dir.friendi.ca';
 
 Developer Settings
 ---
@@ -219,6 +220,8 @@ LOGGER_DEBUG will show a good deal of information about system activity but will
 You may also select LOGGER_ALL but due to the volume of information we recommend only enabling this when you are tracking down a specific problem.
 Other log levels are possible but are not being used at the present time. 
 
+Please be aware that turning on the logging can fill up the disk space on your server relatively quick.
+You should take preventions with e.g. [logrotate](https://en.wikipedia.org/wiki/Log_rotation) or similar tools.
 
 ###PHP error logging
 
@@ -237,4 +240,6 @@ The vast majority of issues reported at these levels are completely harmless.
 Please report to the developers any errors you encounter in the logs using the recommended settings above.
 They generally indicate issues which need to be resolved. 
 
-If you encounter a blank (white) page when using the application, view the PHP logs - as this almost always indicates an error has occurred.  
+If you encounter a blank (white) page when using the application, view the PHP logs - as this almost always indicates an error has occurred.
+
+*Note*: PHP logging cannot be activated from the admin panel but has to be configured from the ``.htconfig.php`` file.