Merge pull request #2 from friendica/master

Master
2018-04-04 14:36:32 +05:30 · 2018-04-04 14:36:32 +05:30 · 29f7ebe307
parent c18d17e65b bacc5de3a2
commit 29f7ebe307
3433 changed files with 357644 additions and 566263 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,10 @@
 # editorconfig tool configuration
 # see http://editorconfig.org for docs
 root = true
 [*]
 charset = utf-8
 end_of_line = lf
 trim_trailing_whitespaces = true
 indent_style = tab
--- a/.gitignore
+++ b/.gitignore
@ -13,7 +13,7 @@ addon
 robots.txt
 #ignore documentation, it should be newly built
-doc/api
+doc/html
 #ignore reports, should be generted with every build
 report/
@ -42,3 +42,18 @@ nbproject
 #ignore local folder
 /local/
 #ignore config files from Visual Studio
 /.vs/
 /php_friendica.phpproj
 /php_friendica.sln
 /php_friendica.phpproj.user
 #ignore things from transifex-client
 venv/
 #ignore Composer dependencies
 vendor
 #ignore config files from JetBrains
 /.idea
--- a/.htaccess
+++ b/.htaccess
@ -4,7 +4,14 @@ AddType audio/ogg .oga
 #AddHandler php53-cgi .php
 <FilesMatch "\.(out|log)$">
-Deny from all
+  <IfModule authz_host_module> 
    #Apache 2.4
    Require all denied
  </IfModule>
  <IfModule !authz_host_module>
    #Apache 2.2
    Deny from all
  </IfModule>
 </FilesMatch>
 <IfModule mod_rewrite.c>
@ -30,10 +37,5 @@ Deny from all
  RewriteCond %{REQUEST_FILENAME} !-d
  RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
  # If you want to restrict access to your Friendica site to HTTPS only,
  # uncommment the following lines
  #RewriteCond %{HTTPS} !=on
  #RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
 </IfModule>
--- a/.tx/config
+++ b/.tx/config
@ -0,0 +1,9 @@
 [main]
 host = https://www.transifex.com
 [friendica.messagespo]
 file_filter = view/lang/<lang>/messages.po
 source_file = util/messages.po
 source_lang = en
 type = PO
--- a/414
+++ b/414
@ -1,4 +1,398 @@
-Version 3.4.3
+Version 3.6 (2018-03-23)
  Friendica Core:
    Updates to the translations (DE, EN_GB, EN_US, ES, FR, IT, ZH_CN) [translation teams]
    Updates for the Danish and French regions [Alkarex]
    Update for the documentation [andyhee, annando, rabuzarus, ratten, rudlof, silke, tobiasd]
    Updates to the themes [Andi-K, annando, fabrixxm, hoergen, rebeka-catalina, rabuzarus]
    Enhancements to the ARIA support in frio [rabuzarus]
    Enhancements to the DB handling and structure [annando]
    Enhancements to the API [annando, fabrixxm, MrPetovan, rudlof]
    Enhancements to the support of Open Graph with images [hoergen]
    Enhancements to the Diaspora federation (participation signal, relay of dislikes, basic forum support for D*, Birthdays) [annando]
    Enhancements to the OStatus federation [annando]
    Enhancements to the handling of feed contacts [MrPetovan]
    Enhancements to the display of threaded discussions (optional) [MrPetovan]
    Enhancements to the display of events [hoergen]
    Enhancements to the ACL dialog (selection of forums) [rabuzarus]
    Enhancements to the handling of new connections [annando]
    Enhancements to the vitality check of contacts [annando]
    Enhancements to the daemon script [annando]
    Enhancements to the federation stats [annando, tobiasd]
    Enhancements to the interaction with public posts [annando]
    Enhancements to the structure of the admin panel [tobiasd]
    Enhancements to the community page [annando]
    Enhancements to the delegation of accounts [annando, MrPetovan]
    Enhancements to the user import and server relocation functionality [annando]
    Enhancements to the menu layout in the admin panel [tobiasd]
    Enhancements to the extraction of strings to be translated [fabrixxm, MrPetovan]
    Enhancements to the installation wizard [annando, tobias]
    Enhancements to the events [annando, hoergen, MrPetovan, rabuzarus]
    Enhancements to the handling of email contacts [annando]
    Enhancements to the Vagrant configuration of the development VM [tobias]
    Enhancements to the probing of pump.io profiles [annando]
    Enhancements to the handling of BBCode tags [MrPetovan]
    Enhancements to the OEmbed handling [MrPetovan]
    Fixed a bug that triggered the display of activities on the cummunity page [annando]
    Fixed a bug with personal notes [annando]
    Fixed a display issue of long postings when using the showmore option [annando]
    Fixed a bug that caused Twidere to crash on reload [annando]
    Fixed a bug in the exported data to the-federation.info [annando]
    Fixed a bug in URL completion for feed fragments [annando]
    Fixed a bug in the notification system about new registrations [annando]
    Fixed the display of dislikes [annando]
    Fixed the display of orphans childs in threads [MrPetovan]
    Fixed some SQL problems [annando]
    Fixed the CLI config script [tobiasd]
    Fixed the forum selection on the network display [annando]
    Fixed a bug during the import of accounts [annando]
    Fixed a problem with UTF8 encoding during account export [annando]
    Fixed a problem with archiving "self" contacts [annando]
    Fixes to file permissions lintian reported [tobiasd]
    Fixed a session problem leading to double login problem [MrPetovan]
    Fixed a bug that caused code blocks on Diaspora being displayed wrongly [MrPetovan]
    Fixed a bug that suggested it was possible to use some bridges without an account on the other side [annando]
    Fixed the situation that an OStatus activity was triggered when publishing a image without sending out a posting for it [annando]
    Fixed some issues with the display of exported events on GNU social and diaspora [annando]
    Fixed the issue that Atom feeds of forums had no postings listed [annando]
    Fixed a problem with the expiration of accounts [annando]
    Added Atom feed for conversations [annando]
    Added the possibility to address forums with !forumname [annando]
    Added option to compare version against upstream version [tobiasd]
    Added an optional hint that a global community page is global [tobiasd]
    Added an option to always display the preview image in shared articles even if larger ones exist [annando]
    Added CLI script to silence accounts on the community page [tobiasd]
    Added CLI script to block postings to a node from accounts [tobiasd]
    Added account block interface to the admin panel [MrPetovan]
    Added browser bookmarklet code snippet [hoergen]
    Added an additional feature to display a tag cloud on the profile page [rabuzarus]
    Added retrieval of Mastodon server statistics [annando]
    Added Atom feed that only contains top level postings of a user [annando]
    Added tag following via saved search for #hashtag [annando]
    Added PHP version information to the admin panel [MrPetovan]
    Added the possibility to change relationships between Friendica contacts [annando]
    Added the membersince functionality from the addon to the core [rabuzarus]
    Added support of nodeinfo 2.0 [annando]
    Removed the long deprecated internal templating engine [annando]
    Removed the obsolete mysql support, you have to use MySQLI or PDO [annando]
    Removed the unused mood module [annando]
    Removed connect link from side panel when it should not be there [annando]
    Removed very old updating routines [annando]
    Dependencies are now (mostly) handled by composer [MrPetovan, zeroadam]
    General code refactoring and beautification work [annando, MrPetovan, tobiasd, zeroadam]
    ejabberd logs are now handled by syslog [annando]
    Moved the poller script to the "scripts" directory and renamed it to worker [annando]
    Threaded display of conversations is now always enabled [annando]
    Images send to public forums are now always public as well [annando]
    The DB cleanup option now includes the conversation table [annando]
    Hash tags now always search locally [annando]
    Consistent naming of addons (instead of plugins and addons) [zeroadam]
    Community page is split between local and global and always visible for local users [annando]
    Updated the credits to include new contributors [tobiasd]
  Friendica Addons:
    Updates to the translations (DE, EN_GB, ES, FR, IT, NL, ZH_CN) [translation teams]
    all bridges don't relay postings anymore that are posted to a public forum [annando]
    DAV addon marked unsupported [tobiasd]
    Current Weather: fixing a problem with the weathermap link [zeroadam]
    NSFW added config examples, reworked the description, now ignores the CW from Mastodon [andyhee, annando, rebeka-catalina]
    Twitter support 280 chars limit [annando]
    OpenWeatherMap fix broken map link [zeroadam]
    CommunityHome added settings to admin panel, removed active users feature [annando, fabrixxm]
    General code refactoring and beautification work [annando, MrPetovan, tobiasd, zeroadam]
    Public Server reworked [annando]
    pageheader settings beautifications [tobiasd]
    mailstream settings beautifications [tobiasd]
    Membersince is now part of the core [rabuzarus]
    Forum posts are not transmitted over the connectors anymore [annando]
  Friendica Dir:
    Fixed a problem with the maintenance cron [MrPetovan]
    Fixed a problem with the location widget [MrPetovan]
    Work on the UI [MrPetovan]
  Closed Issues:
     929, 1050, 1056, 1125, 1215, 1251, 1289, 1312, 1429, 1488, 1540,
    1610, 1858, 2786, 2845, 3020, 3039, 3337, 3379, 3394, 3396, 3566,
    3583, 3661, 3671, 3680, 3801, 3822, 3824, 3828, 3839, 3855, 3857,
    3860, 3863, 3867, 3905, 3911, 3916, 3942, 3946, 3999, 4013, 4020,
    4023, 4041, 4042, 4061, 4069, 4070, 4071, 4075, 4078, 4082, 4094,
    4105, 4115, 4116, 4137, 4141, 4144, 4150, 4155, 4161, 4163, 4173,
    4184, 4199, 4200, 4207, 4227, 4228, 4236, 4251, 4272, 4273, 4278,
    4279, 4281, 4290, 4294, 4295, 4296, 4304, 4306, 4319, 4348, 4362,
    4368, 4369, 4377, 4390, 4395, 4396, 4409, 4412, 4426, 4431, 4445,
    4450, 4452, 4458, 4463, 4481, 4482, 4495, 4497, 4498, 4508, 4518,
    4520, 4522, 4535, 4543, 4550, 4555, 4556, 4571, 4575, 4610, 4611,
    4620
 Version 3.5.4 (2017-10-16)
  Friendica Core:
    Updates to the translations (DE) [translation teams]
    Updates to the docs [tobiasd, annando]
    Code refactoring [annando]
    Fixing some problems with moving accounts to new nodes [annando]
    Fixing the admin account in the Vagrant box [tobiasd]
    Fixing a bug in the search functionality [annando]
    Improvements to SQL queries [annando]
    Improvements to the themes (frio) [annando]
    Improvements to the import of RSS feeds [annando]
    Improvements to the OStatus (GNU Social) compatibility [annando]
    Added possibility to block contacts for a node [annando]
    Added sending out the migration signal to Diaspora contacts [annando]
    Added processing of Diaspora account migration signal [annando]
    Added new fields to the generated data for displaying events [annando]
    Update vier theme with new support forum URL [AlfredSK]
    Update the DB handling for support of PHP 7.1 [annando]
  Friendica Addons:
    dav: Update the database handling [annando]
    newmemberwidget: Update support forum URL [AlfredSK]
  Closed Issues:
    3711, 3714
 Version 3.5.3 (2017-10-05)
  Friendica Core:
    Updates to the translations (DE, EN-GB, EN-US, ES, ZH-CN) [translation teams]
    Updates to the documentation [annando, tobiasd]
    Code revision and refactoring [annando, rabuzarus, Hypolite]
    Fix parsing of documentation and addon README files [tobiasd]
    Fix a problem with MySQLi [annando]
    Fix a problem with endless scroll [annando]
    Fix a problem with the display of birthday dates on the profile page [irhen]
    Fix a problem with the Vagrant config [silke, tobiasd]
    Fix for a bug in picture upload via the API [annando]
    Enhancements to the database structure and handling [annando, Alkarex]
    Enhancements to the exception handling [ddorian1]
    Enhancements to the OStatus federation (Mastodon and Pleroma) [annando]
    Enhancements to the Libertree federation [annando]
    Enhancements to the Diaspora federation (Diaspora and SocialHome) [annando]
    Enhancements to the invitation procedure [tobiasd]
    Enhancements to the themes (frio, globally all) [annando, rabuzarus]
    Enhancements to the community page [annando]
    Enhancements to the ACL selection dialog [annando]
    Enhancements to the item expiration [annando]
    Enhancements to the detection of Hubzilla and red nodes [zotlabs]
    Enhancements to the background process/worker system [annando]
    Enhancements to the UI [annando, AndyHee, tobiasd]
    Enhancements to the handling of unicode smilies [annando]
    Enhancements to the remote_self functionality [annando]
    Enhancements to the nginx example config [shaftoe]
    Enhancements to the detection of edited postings [annando]
    The logging time stamp is now ISO8601 compatible [annando]
    Pictures attached to OStatus transmitted postings are now shown [annando]
    Added item deletion page to the admin panel [tobiasd]
    Added link to the global directory from the contacts page [rjm6823]
    Added JSON/JRD support to Webfinger [annando]
    Added security and privacy related headers [annando]
    Removed the external pubsubhubbub service support [annando]
  Friendica Addons:
    Updates to the translations (ES, ZH-CN) [translation teams]
    Updates to the documentation [tobiasd]
    Code revision and refactoring [Hypolite]
    pumpio, twitter bridges adopted to new background mechanism [annando]
    Leistungsschutzrecht has a new source list, and a whitelist [annando]
    retriever marked unsupported due to unwanted side-effects [annando]
    Unicode emoji added [annando]
    Enhancement to the general content filter [annando]
    Fixes to buffer, diaspora, libertree, pumpio, gnu social, tumblr, twitter and wppost bridges to redistribute remote_self content [annando]
    Fixed a bug in securemail settings form [FuzzJunket]
    external poller addons are deprecated, as this is now a core functionality [annando]
  Friendica Directory:
    Fix a problem with the Vagrant config [tobiasd]
    Fix not working node health page [Hypolite]
    Fix some old links [Hypolite]
  Closed Issues:
    1257, 2786, 2864, 2872, 2998, 3013, 3018, 3131, 3180, 3234, 3248,
    3309, 3313, 3360, 3362, 3391, 3482, 3511, 3512, 3515, 3516, 3529,
    3531, 3536, 3545, 3552, 3553, 3560, 3571, 3589, 3592, 3599, 3615,
    3616, 3621, 3624, 3636, 3645, 3661, 3684, 3685, 3691, 3696, 3699, 
    3700, 3732
 Version 3.5.2 (2017-06-06)
  Friendica Core:
    Updates to the translations (DE, EN-GB, EN-US, ES, IT, PT-BR, RU) [translation teams]
    Updates to the documentation [annando, beardyunixer, rabuzarus, tobiasd]
    Updated the nginx example configuration [beardyunixer]
    Code revision and refactoring [annando, MrPetovan, Quix0r, rebeka-catalina]
    Background process is now done by the new worker process [annando]
    Added support of Composer for dependencies [Hypolite]
    Added support of Web app manifests [Rudloff]
    Added basic robot.txt functionality if none exists [Shnoulle]
    Added server blocklist [Hypolite, tobiasd]
    Removed mcrypt dependency [annando]
    Removed unused libraries [annando]
    Removed Embedly integration [Hypolite]
    Fixed a bug in the language detection for EN [Hypolite]
    Fixed a bug in the probing mechanism on old PHP version [annando]
    Improved API [annando, gerhard6380]
    Improved Diaspora federation [annando]
    Improved Mastodon federation [annando, Hypolite]
    Improved import from OStatus threads [annando]
    Improved the themes (frio, quattro) [fabrixxm, Hypolite, rabuzarus, Rudloff, strk, tobiasd]
    Improved maintenance mode [annando]
    Improved gcontact handling [annando]
    Improved desktop notifications [rabuzarus]
    Improved keyboard shortcuts for navigation [Rudloff]
    Improved the installer [annando]
    Improved openid handling [strk]
    Improved php7 support [annando]
    Improved display of notifications [annando]
    Improved logging mechanism [beardyunixer]
    Improved the worker [annando]
    Behaviour clarification of the group filter / new tab [annando]
    Old options for the pager and share element were removed [annando]
    Support of PDO was added [annando]
    Improved error logging for issues with the database [annando]
    Improved compatibility to MySQL version 5.7+ [annando]
  Friendica Addons:
    Updates to the translation (RU) [pztrm]
    (core) Fix blocking issue for Communityhome [annando]
    Pledgie addon was updated to remove cert problems [tobiasd]
    Securemail now uses openpgp-php and phpseclib [fabrixxm]
    Superblock Configuration [tobiasd]
    Twitter Connector updated to use with new deletion method [annando]
  Closed Issues:
    1626, 1720, 2432, 2792, 2833, 2364, 2448, 2496, 2690, 2752, 2775,
    2803, 2956, 2957, 2961, 2971, 2995, 2999, 3011, 3053, 3107, 3114,
    3134, 3138, 3142, 3157, 3172, 3189, 3194, 3195, 3198, 3206, 3215,
    3217, 3220, 3237, 3242, 3255, 3256, 3260, 3268, 3273, 3274, 3285,
    3288, 3292, 3293, 3300, 3314, 3316, 3317, 3322, 3325, 3327, 3328,
    3331, 3334, 3336, 3346, 3347, 3358, 3359, 3383, 3387, 3401, 3406,
    3428, 3440, 3435, 3436, 3452
 Version 3.5.1 (2017-03-12)
  Friendica Core:
    Updates to the translations (BG, CA, CS, DE, EO, ES, FR, IS, IT, NL, PL, PT-BR, RU, SV) [translation teams]
    Fix for a potential XSS vector [annando, thanks to Vít Šesták 'v6ak' for reporting the problem]
    Fix for ghost request notifications on single user instances [Hypolite]
    Fix user language selection [tobiasd]
    Fix a problem with communication to Diaspora with set posting locations [annando]
    Fix schema handling of direct links to a original posting [Rabuzarus]
    Fix a bug in notification handling [Rabuzarus]
    Adjustments for the Vagrant VM settings [silke, eelcomaljaars]
    Improvements to the unliking of prior likes [Hypolite]
    Improvements to the API and Friendica specific extensions [gerhard6380]
    Improvements to the Browser Notification functionality [Hypolite]
    Improvements to the themes [Hypolite, rabuzarus, rebeka-catalina, tobiasd]
    Improvements to the database handling [annando]
    Improvements to the admin panel [tobiasd, Hypolite]
    Improvements to the update process [annando]
    Improvements to the handling of worker processes [annando]
    Improvements to the performance [annando, Hypolite]
    Improvements to the documentation [Hypolite, tobiasd, rabuzarus, beardyunixer, eelcomaljaars]
    Improvements to the BBCode / Markdown conversation [Hypolite]
    Improvements to the OStatus protocol implementation [annando]
    Improvements to the installation wizzard [tobiasd]
    Improvements to the Diaspora connectivity [annando, Hypolite]
    Work on PHP7 compatibility [ddorian1]
    Code cleanup [Hypolite, Quix0r]
    Initial federation with Mastodon [annando]
    The worker process can now also be started from the frontend [annando]
    Deletion of postings is now done in the background [annando]
    Extension of the DFRN transmitted information fields [annando]
    Translations of the core are now in /view/lang [Hypolite, tobiasd]
    Update of the fullCalendar library to 3.0.1 and adjusting the themes [rabuzarus]
    ping now works with JSON as well [Hypolite]
    On pending registrations, an email is now send to inform the user about it [tobiasd]
    On systems where the registration needs approval, a note for the admin can now be written [tobiasd]
    Meta Information for HTML descriptions is now limited to 160 character [rabuzarus]
    Removed very old deprecated themes from the repository [silke]
    Marked frost and frost mobile as deprecated [silke]
    When creating new postings in the UI, focus is automatically put into the Title field [Hypolite]
    We are now shipping config files for "tx" (the Transifex client) and the "EditorConfig" addon for many common editors [fabrixxm, tobiasd]
    The TinyMCE richtext editor was removed [Hypolite]
    We defined a coding style, PSR-2 with some adjustments
    Various bugfixes
  Friendica Addons:
    Updates to the translations (DE, ES, FR, IT, PT-BR) [translation teams]
    Improvements to the IFTTT addon [Hypolite]
    Improvements to the language filter addon [strk]
    Improvements to the pump.io bridge [annando]
    Improvements to the jappixmini addon [annando]
    Improvements to the gpluspost addon [annando]
    Improvements to the performance of the Twitter bridge when using workers [annando]
    Diaspora Export addon is now working again [annando]
    Pledgie badge now uses https protocol for embedding [tobiasd]
    Better posting loop prevention for the Google+/Twitter/GS connectors [annando]
    One can now configure the message for wppost bridged blog postings [tobiasd]
    On some pages the result of the Rendertime is not shown anymore [annando]
    Twitter-bridge now supports quotes and long posts when importing tweets [annando]
  Closed Issues
    1019, 1163, 1612, 1613, 2103, 2177, 2252, 2260, 2403, 2991, 2614, 
    2751, 2752, 2772, 2791, 2800, 2804, 2813, 2814, 2816, 2817, 2823, 
    2850, 2858, 2865, 2892, 2894, 2895, 2907, 2908, 2914, 2015, 2926,
    2948, 2955, 2958, 2963, 2964, 2968, 2987, 2993, 3020, 3052, 3062,
    3066, 3091, 3108, 3113, 3116, 3117, 3118, 3126, 3130, 3135, 3155,
    3160, 3163, 3187, 3196
 Version 3.5 (2016-09-13)
  Friendica Core:
    NEW Optional local directory with possible federated contacts [annando]
    NEW Autocompletion for @-mentions and BBCode tags [rabuzarus]
    NEW Added a composer derived autoloader which allows composer autoloaders in addons/libraries [fabrixxm]
    NEW theme: frio [rabuzarus, annando, fabrixxm]
    Enhance .htaccess file (nerdoc, dissolve)
    Updates to the translations (DE, ES, IS, IT, RU) [translation teams]
    Updates to the documentation [tobiasd, annando, mexcon, silke, rabuzarus, fabrixxm, Olivier Mehani, gerhard6380, ben utzer]
    Extended the BBCode by [abstract] tag used for bridged postings to networks with limited character length [annando]
    Code cleanup [annando, QuixOr]
    Improvements to the API and Friendica specific extensions [annando, fabrixxm, gerhard6380]
    Improvements to the RSS/Atom feed import [mexcon]
    Improvements to the communication with federated networks (Diaspora, Hubzilla, OStatus) [annando]
    Improvements on the themes (quattro, vier, frost) [rabuzarus, fabrixxm, stieben, annando, Quix0r, tobiasd]
    Improvements to the ACL dialog [fabrixxm, rabuzarus]
    Improvements to the database structure and optimization of queries [annando]
    Improvements to the UI (contacts, hotkeys, remember me, ARIA, code hightlighting) [rabuzarus, annando, tobiasd]
    Improvements to the background process (poller, worker) [annando]
    Improvements to the admin panel [tobiasd, annando, fabrixxm]
    Improvements to the performance [annando]
    Improvements to the installation wizzard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd]
    Improvements to the relocation of nodes and accounts [annando]
    Improvements to the DDoS detection [annando]
    Improvements to the calendar/events module [annando, rabuzarus]
    Improvements to OpenID login [strk]
    Improvements to the ShaShape font [andi]
    Reworked the implementation of the DFRN, Diaspora protocols [annando]
    Reworked the notifications code [fabrixxm, rabuzarus, annando]
    Reworked the p/config code [fabrixxm, rabuzarus]
    Reworked XML generation [annando]
    Removed now unused simplepie from library [annando]
  Friendica Addons
    Updated to the translations (DE, ES, IS, NL, PT BR), [translation teams]
    Piwik [tobiasd]
    Twitter Connector [annando]
    Pumpio Connector [annando]
    Rendertime [annando]
    wppost [annando]
    showmore [rabuzarus]
    fromgplus [annando]
    app.net Connector [annando]
    GNU Social Connector [annando]
    LDAP [Olivier Mehani]
    smileybutton [rabuzarus]
    retriver [mexon]
    mailstream [mexon]
    forumdirectory [tobiasd]
    NEW notifyall (port from Hubzilla) [rabuzarus, tobiasd]
    DEPRECATED cal (now in core), FB Connector, FB Post Connector, FB Sync
  Closed Issues
     683,  786,  796,  922, 1261, 1576, 1701, 1769, 1970, 1145, 1494,
    1728, 1877, 2063, 2059, 2078, 2079, 2133, 2165, 2194, 2229, 2230,
    2241, 2254, 2242, 2270, 2277, 2339, 2320, 2345, 2352, 2358, 2367,
    2373, 2376, 2378, 2385, 2395, 2402, 2406, 2433, 2472, 2485, 2492,
    2506, 2512, 2516, 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645,
    2687, 2716, 2757, 2764
 Version 3.4.3 (2015-12-22)
  What's new for the users:
 	Updates to the documentation (silke, tobiasd, annando, rebeka-catalina)
 	Updated translations (tobiasd & translation teams)
@ -31,7 +425,7 @@ Version 3.4.3
 	Contact's posts are shown in a dedicated page (annando)
 	Module name is shown in page title to ease browser history navigation (issue #2079) (tobiasd)
  What's new for admins:
-	Forumlist functionality moved from plugin to core (rabuzarus, annando)
+	Forumlist functionality moved from addon to core (rabuzarus, annando)
 	Changes on poller/workers limits management (annando)
 	Diaspora and OStatus can be enabled only if requirements are satisfied (annando)
 	Support for additional passwords for ejabberd (annando)
@ -77,7 +471,7 @@ Version 3.4.3
 	Fix bbcode conversion of the about text for the profile (issue #1607) (annando)
-Version 3.4.2
+Version 3.4.2 (2015-09-29)
 	Updates to the documentation (tobiasd, silke, annando)
 	Updates to the translations (tobiasd & translation teams)
@ -112,7 +506,7 @@ Version 3.4.2
 	Support for inline [code] tag usage (fabrixxm)
 	Fix login form in aside (issue #1348) (annando)
 	Show both url-style and webfinger-style identity address in profile (issue #1621) (tobiasd)
-	Add button to reload all active plugins in admin plugins page to ensure new hooks are used (fabrixxm)
+	Add button to reload all active addons in admin addons page to ensure new hooks are used (fabrixxm)
 	Make the hardcoded path to global directory configurable (annando)
 	Change default directory to dir.friendi.ca (annando)
 	Improve cache system with granular expire time (annando)
@ -122,7 +516,7 @@ Version 3.4.2
 	Parse BBCode in contact request notification email (annando)
-Version 3.4.1
+Version 3.4.1 (2015-07-06)
 	Implement server-to-server encryption (RINO) using php-encryption library as "RINO 2", deprecate "RINO 1" (issue #1655) (fabrixxm)
 	Fix connection with Diaspora "freelove" account (issue #1572) (annando)
@ -174,7 +568,7 @@ Version 3.4.1
 	Update to German documentation (Frank Dieckmann, tobias)
 	Updated translations (translation teams, tobias)
-Version 3.4
+Version 3.4 (2015-04-05)
 	Optionally, "like" and "dislike" activities don't update thread timestamp (annando)
 	Updated markdown libraries (annando)
@ -202,7 +596,7 @@ Version 3.4
 	Add help text to explain the options for approving contacts (issue #1349) (silke)
 	API set as unseen only posts returned by the call (issue #1063) (annando)
-Version 3.3.3
+Version 3.3.3 (2015-02-24)
 	More separation between php and html in photo album (issue #1258) (rabuzarus)
 	Enhanced community page shows public posts from public contacts of public profiles (annando)
@ -236,7 +630,7 @@ Version 3.3.3
 	Fix email validation (ddorian1)
 	Better documentation for developers (silke)
-Version 3.3.2
+Version 3.3.2 (2014-12-26)
 	Set default value for all not-null fields (fixes SQL warinigs) (annando)
 	Fix item filters in network page (issue #1222) (fabrixxm)
@ -248,7 +642,7 @@ Version 3.3.2
 	Better display of pictures in posts (annando)
 	Fix out of control gprobe process (annando)
-Version 3.3.1
+Version 3.3.1 (2014-11-06)
 	JSONP support for API (fabrixxm)
 	Fixed small bug in direct messages API (fabrixxm)
@ -266,7 +660,7 @@ Version 3.3.1
 	Translation updates
 	Added CHANGELOG
-Version 3.3
+Version 3.3 (2014-10-06)
 	API
 	added support in the API to allow image uploads from Twidere
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -32,17 +32,18 @@ link if your cert is self-signed).
 	- Apache with mod-rewrite enabled and "Options All" so you can use a
 local .htaccess file
-	- PHP 5.2+. The later the better. PHP 5.3 is required for communications 
+	- PHP 5.6+ (PHP 7 recommended for performance).
 with the Diaspora network and improved security.
 		- PHP *command line* access with register_argc_argv set to true in the
 php.ini file [or see 'poormancron' in section 8]
-		- curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
+		- curl, gd (with at least jpeg support), mysql, mbstring, xml, zip and openssl extensions
 		- some form of email server or email gateway such that PHP mail() works
-	- Mysql 5.x
+		- The POSIX module of PHP needs to be activated (e.g. RHEL, CentOS have disabled it)
 	- Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 	- ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
 (Windows) [Note: other options are presented in Section 8 of this document]
@ -61,20 +62,33 @@ you wish to communicate with the Diaspora network.
 	that you also copy .htaccess - as "dot" files are often hidden
 	and aren't normally copied.
 OR
 2b. Clone the friendica/friendica GitHub repository and import dependencies
 	git clone https://github.com/friendica/friendica [web server folder]
 	cd [web server folder]
 	php util/composer.phar install
 3. Create an empty database and note the access details (hostname, username,
 password, database name).
    - Friendica needs the permission to create and delete fields and tables in its own database.
-
+    - Please check the additional notes if running on MySQ 5.7.17 or newer
 4. If you know in advance that it will be impossible for the web server to
 write or create files in your web directory, create an empty file called
 .htconfig.php and make it writable by the web server.
 5. Visit your website with a web browser and follow the instructions. Please
-note any error messages and correct these before continuing. If you are using
+note any error messages and correct these before continuing.
-SSL with a known signature authority (recommended), use the https: link to your
+
-website. If you are using a self-signed cert or no cert, use the http: link. 
+If you are using SSL with a known signature authority (recommended), use the
 https: link to your website. If you are using a self-signed cert or no cert,
 use the http: link.
 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.
 6. *If* the automated installation fails for any reason, check the following:
@ -98,17 +112,17 @@ tables, so that you can start fresh.
 ****************************************************************************
 ****************************************************************************
-8. Set up a cron job or scheduled task to run the poller once every 5-10 
+8. Set up a cron job or scheduled task to run the worker once every 5-10
 minutes to pick up the recent "public" postings of your friends. Example:
-	cd /base/directory; /path/to/php include/poller.php
+	cd /base/directory; /path/to/php scripts/worker.php
 Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
-*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php include/poller.php
+*/10 * * * *	cd /home/myname/mywebsite; /usr/bin/php scripts/worker.php
 You can generally find the location of PHP by executing "which php". If you
 have troubles with this section please contact your hosting provider for
@ -117,26 +131,45 @@ assistance. Friendica will not work correctly if you cannot perform this step.
 You should also be sure that $a->config['php_path'] is set correctly, it should
 look like (changing it to the correct PHP location)
-$a->config['php_path'] = '/usr/local/php53/bin/php'
+$a->config['php_path'] = '/usr/local/php56/bin/php'
-Alternative: You may be able to use the 'poormancron' plugin to perform this
+Alternative: If you cannot use a cron job as described above, you can use
-step if you are using a recent Friendica release. 'poormancron' may result in
+the frontend worker and an external cron service to trigger the execution
-perfomance and memory issues and is only suitable for small sites with one or
+of the worker script. You can enable the frontend worker after the installation
-two users and a handful of contacts. To do this, edit the file 
+from the admin panel of your node and call
 ".htconfig.php" and look for a line describing your plugins. On a fresh 
 installation, it will look like
-$a->config['system']['addon'] = 'js_upload';
+		 https://example.com/worker
-This indicates the "js_upload" addon module is enabled. You may add additional 
+with the service of your choice.
 addons/plugins using this same line in the configuration file. Change it to 
 read
-$a->config['system']['addon'] = 'js_upload,poormancron';
+9. (Recommended) Set up a backup plan
-and save your changes.
+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 yoursef a backup plan.
 The most important file is the `.htconfig.php` file in the base directory.
 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.
 10. (Optional) Reverse-proxying and HTTPS
 Friendica looks for some well-known HTTP headers indicating a reverse-proxy
 terminating an HTTPS connection. While the standard from RFC 7239 specifies
 the use of the `Forwaded` header.
    Forwarded: for=192.0.2.1; proto=https; by=192.0.2.2
 Friendica also supports a number on non-standard headers in common use.
    X-Forwarded-Proto: https
    Front-End-Https: on
    X-Forwarded-Ssl: on
 It is however preferable to use the standard approach if configuring a new server.
 #####################################################################
@ -254,14 +287,14 @@ cron by using something like
 */10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php
 -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none
-f include/poller.php
+-f scripts/worker.php
 This worked well for simple test cases, but the friendica-cron still failed with
 a fatal error:
 suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker
 'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341)
-After a while I noticed, that include/poller.php calls further php script via
+After a while I noticed, that scripts/worker.php calls further php script via
 proc_open. These scripts themselves also use proc_open and fail, because they
 are NOT called with -d suhosin.executor.func.blacklist=none.
@ -275,3 +308,21 @@ This is obvious as soon as you notice that the friendica-cron uses proc_open to
 execute php-scripts that also use proc_open, but it took me quite some time to
 find that out. I hope this saves some time for other people using suhosin with
 function blacklists.
 ########################################################################
 Unable to create all mysql tables on MySQL 5.7.17 or newer
 #######################################################################
 If the setup fails to create all the database tables and/or manual
 creation from the command line fails, with this error:
 ERROR 1067 (42000) at line XX: Invalid default value for 'created'
 You need to adjust your my.cnf and add the following setting under
 the [mysqld] section :
 sql_mode = '';
 After that, restart mysql and try again.
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 Friendica Communications Server
-Copyright (c) 2010-2013 the Friendica Project
+Copyright (c) 2010-2018 the Friendica Project
 	This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
--- a/README.md
+++ b/README.md
@ -1,11 +1,41 @@
 Friendica Social Communications Server
 ======================================
 Welcome to the free social web.
 Friendica is a decentralised communications platform that integrates social communication. Our platform links to independent social projects and corporate services.
-Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers.
+Our mission is to free friends, family and colleagues from data-harvesting corporations; we aim for social communication to be free and open, while flowing between any provider as easily as email does.
-Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.
+Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org/), [Diaspora](https://diasporafoundation.org/), [GnuSocial](https://gnu.io/social/), [Pleroma](https://pleroma.social/), or [Hubzilla](https://hubzilla.org/), regardless where each user profile is hosted.
 With Friendica, you can also fully interact with anyone on Twitter, post on Facebook and receive any content on Tumblr, Wordpress or RSS. Friendica allows you to integrate most things on the web via a range of addons such as ITTT, Buffer; you will be able to easily control your own data as you decide.
 Join today and [get your Friendica profile!](https://dir.friendica.social/servers 'Join Friendica today!')
 ### Friendica Screenshots
 | ![Frio theme in mobile browser](/images/screenshots/friendica-frio-mobile-profle-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](/images/screenshots/friendica-frio-mobile-profle-2.png?raw=true "Frio theme in mobile browser")
 |:--:|
 |*Frio theme, mobile browser. Timeline and composer view.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-green-profle-1.png?raw=true "Frio theme in desktop browser")
 |*Frio theme, desktop browser. Timeline view, contact info popped up, control menu open.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-green-profle-2.png?raw=true "Frio theme in desktop browser")
 |*Frio theme, desktop browser. Menu open for controlling individual posts.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-red-profle-3.png?raw=true "Frio theme in desktop browser")
 |*Frio theme, desktop browser. Profile view, notification menu open.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-red-profle-2.png?raw=true "Frio theme in desktop browser")
 |*Number of new posts, in total and by group.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-red-profle-1.png?raw=true "Frio theme in desktop browser")
 |*Calender with popup of event.*|
 |![Frio theme default colour in standard browser on tablet](/images/screenshots/friendica-frio-default-profile-1.png?raw=true "Frio theme default colour in standard browser on tablet")
 |*Notifications menu and private messages counter, standard browser on tablet.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-brown-profile-2.png?raw=true "Frio theme in desktop browser")
 |*Number of visible contacts, standard browser.*|
 |![Frio theme in desktop browser](/images/screenshots/friendica-frio-brown-profile-1.png?raw=true "Frio theme in desktop browser")
 |*Network posts chronologically ordered, standard browser.*|
 |![Vier theme in desktop browser](/images/screenshots/friendica-vier-profile.png?raw=true "Vier theme in desktop browser")
 |*Vier theme, desktop browser. Public timeline view.*|
 |![Vier theme in desktop browser](/images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser")
 |*Vier theme, desktop browser. Community post displayed.*|
--- a/README.translate.md
+++ b/README.translate.md
@ -4,42 +4,32 @@ Friendica translations
 Translation Process
 -------------------
-The strings used in the UI of Friendica is translated at [Transifex] [1] and then
+The strings used in the UI of Friendica is translated at [Transifex] [1] and then included in the git repository at github.
-included in the git repository at github. If you want to help with translation
+If you want to help with translation for any language, be it correcting terms or translating friendica to a currently not supported language, please register an account at transifex.com and contact the friendica translation team there.
 for any language, be it correcting terms or translating friendica to a
 currently not supported language, please register an account at transifex.com
 and contact the friendica translation team there.
-Translating friendica is simple. Just use the online tool at transifex. If you
+Translating friendica is simple.
-don't want to deal with git & co. that is fine, we check the status of the
+Just use the online tool at transifex.
-translations regularly and import them into the source tree at github so that
+If you don't want to deal with git & co. that is fine, we check the status of the translations regularly and import them into the source tree at github so that others can use them.
 others can use them.
-We do not include every translation from transifex in the source tree to avoid
+We do not include every translation from transifex in the source tree to avoid a scattered and disturbed overall experience.
-a scattered and disturbed overall experience. As an uneducated guess we have a
+As an uneducated guess we have a lower limit of 50% translated strings before we include the language (for the core messages.po file, addont translation will be included once all strings of an addon are translated.
-lower limit of 50% translated strings before we include the language (for the
+This limit is judging only by the amount of translated strings under the assumption that the most prominent strings for the UI will be translated first by a translation team.
-core message.po file, addon translation will be included once all strings of
+If you feel your translation useable before this limit, please contact us and we will probably include your teams work in the source tree.
 an addon are translated. This limit is judging only by the amount of translated
 strings under the assumption that the most prominent strings for the UI will be
 translated first by a translation team. If you feel your translation useable
 before this limit, please contact us and we will probably include your teams
 work in the source tree.
-If you want to get your work into the source tree yourself, feel free to do so
+If you want to help translating, please concentrate on the core messages.po file first.
-and contact us with and question that arises. The process is simple and
+We will only include translations with a sufficient translated messages.po file.
-friendica ships with all the tools necessary.
+Translations of addons will only be included, when the core file is included as well.
 If you want to get your work into the source tree yourself, feel free to do so and contact us with and question that arises.
 The process is simple and friendica ships with all the tools necessary.
 The location of the translated files in the source tree is
-    /view/LNG-CODE/
+    /view/lang/LNG-CODE/
 where LNG-CODE is the language code used, e.g. de for German or fr for French.
-For the email templates (the *.tpl files) just place them into the directory
+The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses.
-and you are done. The translated strings come as a "message.po" file from
+To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation.
 transifex which needs to be translated into the PHP file friendica uses.  To do
 so, place the file in the directory mentioned above and use the "po2php"
 utility from the util directory of your friendica installation.
-Assuming you want to convert the German localization which is placed in
+Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following.
 view/de/message.po you would do the following.
    1. Navigate at the command prompt to the base directory of your
       friendica installation
@ -47,9 +37,9 @@ view/de/message.po you would do the following.
    2. Execute the po2php script, which will place the translation
       in the strings.php file that is used by friendica.
-       $> php util/po2php.php view/de/messages.po
+       $> php util/po2php.php view/lang/de/messages.po
-       The output of the script will be placed at view/de/strings.php where
+       The output of the script will be placed at view/lang/de/strings.php where
       friendica is expecting it, so you can test your translation immediately.
    3. Visit your friendica page to check if it still works in the language you
@ -60,39 +50,51 @@ view/de/message.po you would do the following.
       not give any output if the file is ok but might give a hint for
       searching the bug in the file.
-       $> php view/de/strings.php
+       $> php view/lang/de/strings.php
    4. commit the two files with a meaningful commit message to your git
       repository, push it to your fork of the friendica repository at github and
       issue a pull request for that commit.
 You should translate the PO files at Transifex.
 Otherwise your work might get lost, when the translation from Transifex is included to the Friendica repository after it was updated there.
 Utilities
 ---------
-Additional to the po2php script there are some more utilities for translation
+Additional to the po2php script there are some more utilities for translation in the "util" directory of the friendica source tree.
-in the "util" directory of the friendica source tree.  If you only want to
+If you only want to translate friendica into another language you wont need any of these tools most likely but it gives you an idea how the translation process of friendica works.
 translate friendica into another language you won't need any of these tools most
 likely but it gives you an idea how the translation process of friendica
 works.
 For further information see the utils/README file.
-Known Problems
+Transifex-Client
--------------
+----------------
-Friendica uses the language setting of the visitors browser to determain the
+Transifex has a client program which let you interact with the translation files in a similar way to git.
-language for the UI. Most of the time this works, but there are some known
+Help for the client can be found at the [Transifex Help Center] [2].
-quirks.
+Here we will only cover basic usage.
-One is that some browsers, like Safari, do the setting to "de-de" but friendica
+After installation of the client, you should have a `tx` command available on your system.
-only has a "de" localisation.  A workaround would be to add a symbolic link
+To use it, first create a configuration file with your credentials.
-from
+On Linux this file should be placed into your home directory `~/.transifexrc`.
-    $friendica/view/de-de
+The content of the file should be something like the following:
 pointing to
    $friendica/view/de
-Links
+    [https://www.transifex.com]
-----
+    username = user
    token =
    password = p@ssw0rd
    hostname = https://www.transifex.com
 Since Friendica version 3.5.1 we ship configuration files for the Transifex client in the core repository and the addon repository.
 To update the translation files after you have translated strings of e.g. Esperanto in the web-UI of transifex you can use `tx` to download the file.
    $> tx pull -l eo
 And then use the `po2php` utility described above to convert the `messages.po` file to the `strings.php` file Friendica is loading.
    $> php util/po2php.php view/lang/eo/messages.po
 Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes.
 [1]:   https://www.transifex.com/projects/p/friendica/
-
+[2]:   https://docs.transifex.com/client/introduction
--- a/1
+++ b/1
@ -0,0 +1 @@
 3.6
--- a/12
+++ b/12
@ -1,19 +1,18 @@
 server_ip = "192.168.22.10"
-server_memory = "384" # MB
+server_memory = "2048" # MB
 server_timezone = "UTC"
 public_folder = "/vagrant"
 Vagrant.configure(2) do |config|
-
+  # Set server to Ubuntu 16.04
-  # Set server to Ubuntu 14.04
+  config.vm.box = "ubuntu/xenial64"
  config.vm.box = "ubuntu/trusty64"
  # Disable automatic box update checking. If you disable this, then
  # boxes will only be checked for updates when the user runs
  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
+  config.vm.box_check_update = true
  # Create a hostname, don't forget to put it to the `hosts` file
  # This will point to the server's default virtual host
@ -24,7 +23,8 @@ Vagrant.configure(2) do |config|
  config.vm.network :private_network, ip: server_ip
  # Share a folder between host and guest
-  config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
+  # config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "vagrant"
  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "www-data"
  # Provider-specific configuration so you can fine-tune various
  # backing providers for Vagrant. These expose provider-specific options.
--- a/boot.php
+++ b/boot.php
--- a/composer.json
+++ b/composer.json
@ -0,0 +1,67 @@
 {
 	"name": "friendica/friendica",
 	"description": "A decentralized social network part of The Federation",
 	"type": "project",
 	"keywords": [
 		"social network",
 		"dfrn",
 		"ostatus",
 		"diaspora"
 	],
 	"license": "AGPL-3.0+",
 	"support": {
 		"issues": "https://github.com/friendica/friendica/issues"
 	},
 	"require": {
 		"php": ">5.6",
 		"ext-xml": "*",
 		"ezyang/htmlpurifier": "~4.7.0",
 		"league/html-to-markdown": "~4.4.1",
 		"lightopenid/lightopenid": "dev-master",
 		"michelf/php-markdown": "^1.7",
 		"mobiledetect/mobiledetectlib": "2.8.*",
 		"paragonie/random_compat": "^2.0",
 		"pear/Text_LanguageDetect": "1.*",
 		"pear/Text_Highlighter": "dev-master",
 		"smarty/smarty": "^3.1",
 		"fxp/composer-asset-plugin": "~1.3",
 		"bower-asset/base64": "^1.0",
 		"bower-asset/Chart-js": "^2.7",
 		"bower-asset/perfect-scrollbar": "^0.6",
 		"npm-asset/jquery": "^2.0",
 		"npm-asset/jquery-colorbox": "^1.6",
 		"npm-asset/jquery-datetimepicker": "^2.4.0",
 		"npm-asset/jgrowl": "^1.4",
 		"npm-asset/fullcalendar": "^3.0.1"
 	},
 	"repositories": [
        {
            "type": "vcs",
            "url": "https://github.com/pear/Text_Highlighter"
        }
    ],
 	"autoload": {
 		"psr-4": {
 			"Friendica\\": "src/"
 		},
 		"psr-0": {
 			"": "library/"
 		}
 	},
 	"config": {
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,
 		"preferred-install": "dist",
 		"fxp-asset": {
            "installer-paths": {
                "npm-asset-library": "vendor/asset",
                "bower-asset-library": "vendor/asset"
            }
        }
 	},
 	"archive": {
 		"exclude": [
 			"log", "cache", "/photo", "/proxy"
 		]
 	}
 }
--- a/composer.lock
+++ b/composer.lock
--- a/convert_innodb.sql
+++ b/convert_innodb.sql
@ -1,19 +0,0 @@
 ALTER TABLE `profile` DROP INDEX `pub_keywords` ; 
 ALTER TABLE `profile` DROP INDEX `prv_keywords` ;
 ALTER TABLE `item` DROP INDEX `title` ;
 ALTER TABLE `item` DROP INDEX `body` ;
 ALTER TABLE `item` DROP INDEX `allow_cid` ;
 ALTER TABLE `item` DROP INDEX `allow_gid` ;
 ALTER TABLE `item` DROP INDEX `deny_cid` ;
 ALTER TABLE `item` DROP INDEX `deny_gid` ;
 ALTER TABLE `item` DROP INDEX `tag` ;
 ALTER TABLE `item` DROP INDEX `file` ;
 SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;') 
 FROM information_schema.tables 
 WHERE engine = 'MyISAM';
--- a/database.sql
+++ b/database.sql
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@ -1,6 +1,10 @@
 Accesskeys in Friendica
 =======================
 * [Home](help)
 For an overview of the modifier key of the different browsers we suggest this [Wikipedia](https://en.wikipedia.org/wiki/Access_key) article.
 General
 -------
 * p: profile
@ -11,6 +15,11 @@ General
 * f: notifications
 * u: user menu (in themes "vier" and "quattro")
 /community
 --------
 * l: Local community
 * g: Global community
 /profile
 --------
 * m: Status Messages and Posts
@ -37,10 +46,7 @@ General
 * o: Profile
 * t: Contacts
 * d: Common friends
-* b: Toggle Blocked status
+* r: Advanced
 * i: Toggle Ignored status
 * v: Toggle Archive status
 * r: Repair
 /message
 --------
@ -68,7 +74,7 @@ General
 * o: Account
 * t: Additional features
 * w: Social Networks
-* l: Plugins
+* l: Addons
 * d: Delegations
 * b: Connected apps
 * e: Export personal data
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@ -10,10 +10,10 @@ Not all Friendica sites allow open registration.
 If registration is allowed, you will see a "Register" link immediately below the login prompt on the site home page.
 Following this link will take you to the site registration page.
 The strength of our network is that lots of different sites are all completely compatible with each other.
-If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a [list of public servers here](http://dir.friendica.com/siteinfo), and find one that meets your needs.
+If the site you're visting doesn't allow registration, or you think you might prefer another one, you can find a [list of public servers here](https://dir.friendica.social/servers), and find one that meets your needs.
 If you'd like to have your own server, you can do that too.
-Visit [the Friendica website](http://friendica.com/download) to download the code with setup instructions.
+Visit [the Friendica website](http://friendi.ca/) to download the code with setup instructions.
 It's a very simple installation process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
 ###OpenID
@ -89,7 +89,10 @@ A ['Tips for New Members'](newmember) link will show up on your network and home
 Retrieving Personal Data
 ---
-You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings page.
+You can export a copy of your personal data in JSON format from the "Export personal data" link at the top of your settings page.
 You need this file to relocate your Friendica account to another node.
 This might be necessary, e.g. if your node suffers a severe hardware problem and is not recoverable.
 See Also
 ---
--- a/doc/Addons.md
+++ b/doc/Addons.md
@ -0,0 +1,475 @@
 Friendica Addon development
 ==============
 * [Home](help)
 Please see the sample addon 'randplace' for a working example of using some of these features.
 Addons work by intercepting event hooks - which must be registered.
 Modules work by intercepting specific page requests (by URL path).
 Addon names cannot contain spaces or other punctuation and are used as filenames and function names.
 You may supply a "friendly" name within the comment block.
 Each addon must contain both an install and an uninstall function based on the addon name.
 For instance "addon1name_install()".
 These two functions take no arguments and are usually responsible for registering (and unregistering) event hooks that your addon will require.
 The install and uninstall functions will also be called (i.e. re-installed) if the addon changes after installation.
 Therefore your uninstall should not destroy data and install should consider that data may already exist.
 Future extensions may provide for "setup" amd "remove".
 Addons should contain a comment block with the four following parameters:
    /*
     * Name: My Great Addon
     * Description: This is what my addon does. It's really cool.
     * Version: 1.0
     * Author: John Q. Public <john@myfriendicasite.com>
     */
 Register your addon hooks during installation.
    Addon::registerHook($hookname, $file, $function);
 $hookname is a string and corresponds to a known Friendica hook.
 $file is a pathname relative to the top-level Friendica directory.
 This *should* be 'addon/addon_name/addon_name.php' in most cases.
 $function is a string and is the name of the function which will be executed when the hook is called.
 Please also add a README or README.md file to the addon directory.
 It will be displayed in the admin panel and should include some further information in addition to the header information.
 Arguments
 ---
 Your hook callback functions will be called with at least one and possibly two arguments
    function myhook_function(App $a, &$b) {
    }
 If you wish to make changes to the calling data, you must declare them as reference variables (with '&') during function declaration.
 #### $a
 $a is the Friendica 'App' class.
 It contains a wealth of information about the current state of Friendica:
 * which module has been called,
 * configuration information,
 * the page contents at the point the hook was invoked,
 * profile and user information, etc.
 It is recommeded you call this '$a' to match its usage elsewhere.
 #### $b
 $b can be called anything you like.
 This is information specific to the hook currently being processed, and generally contains information that is being immediately processed or acted on that you can use, display, or alter.
 Remember to declare it with '&' if you wish to alter it.
 Modules
 ---
 Addons may also act as "modules" and intercept all page requests for a given URL path.
 In order for a addon to act as a module it needs to define a function "addon_name_module()" which takes no arguments and needs not do anything.
 If this function exists, you will now receive all page requests for "http://my.web.site/addon_name" - with any number of URL components as additional arguments.
 These are parsed into an array $a->argv, with a corresponding $a->argc indicating the number of URL components.
 So http://my.web.site/addon/arg1/arg2 would look for a module named "addon" and pass its module functions the $a App structure (which is available to many components).
 This will include:
    $a->argc = 3
    $a->argv = array(0 => 'addon', 1 => 'arg1', 2 => 'arg2');
 Your module functions will often contain the function addon_name_content(App $a), which defines and returns the page body content.
 They may also contain addon_name_post(App $a) which is called before the _content function and typically handles the results of POST forms.
 You may also have addon_name_init(App $a) which is called very early on and often does module initialisation.
 Templates
 ---
 If your addon needs some template, you can use the Friendica template system.
 Friendica uses [smarty3](http://www.smarty.net/) as a template engine.
 Put your tpl files in the *templates/* subfolder of your addon.
 In your code, like in the function addon_name_content(), load the template file and execute it passing needed values:
    # load template file. first argument is the template name,
    # second is the addon path relative to friendica top folder
    $tpl = get_markup_template('mytemplate.tpl', 'addon/addon_name/');
    # apply template. first argument is the loaded template,
    # second an array of 'name'=>'values' to pass to template
    $output = replace_macros($tpl,array(
        'title' => 'My beautiful addon',
    ));
 See also the wiki page [Quick Template Guide](https://github.com/friendica/friendica/wiki/Quick-Template-Guide).
 Current hooks
 -------------
 ### 'authenticate'
 'authenticate' is called when a user attempts to login.
 $b is an array containing:
    'username' => the supplied username
    'password' => the supplied password
    'authenticated' => set this to non-zero to authenticate the user.
    'user_record' => successful authentication must also return a valid user record from the database
 ### 'logged_in'
 'logged_in' is called after a user has successfully logged in.
 $b contains the $a->user array.
 ### 'display_item'
 'display_item' is called when formatting a post for display.
 $b is an array:
 	'item' => The item (array) details pulled from the database
 	'output' => the (string) HTML representation of this item prior to adding it to the page
 ### 'post_local'
 * called when a status post or comment is entered on the local system
 * $b is the item array of the information to be stored in the database
 * Please note: body contents are bbcode - not HTML
 ### 'post_local_end'
 * called when a local status post or comment has been stored on the local system
 * $b is the item array of the information which has just been stored in the database
 * Please note: body contents are bbcode - not HTML
 ### 'post_remote'
 * called when receiving a post from another source. This may also be used to post local activity or system generated messages.
 * $b is the item array of information to be stored in the database and the item body is bbcode.
 ### 'settings_form'
 * called when generating the HTML for the user Settings page
 * $b is the (string) HTML of the settings page before the final '</form>' tag.
 ### 'settings_post'
 * called when the Settings pages are submitted
 * $b is the $_POST array
 ### 'addon_settings'
 * called when generating the HTML for the addon settings page
 * $b is the (string) HTML of the addon settings page before the final '</form>' tag.
 ### 'addon_settings_post'
 * called when the Addon Settings pages are submitted
 * $b is the $_POST array
 ### 'profile_post'
 * called when posting a profile page
 * $b is the $_POST array
 ### 'profile_edit'
 'profile_edit' is called prior to output of profile edit page.
 $b is an array containing:
 	'profile' => profile (array) record from the database
 	'entry' => the (string) HTML of the generated entry
 ### 'profile_advanced'
 * called when the HTML is generated for the 'Advanced profile', corresponding to the 'Profile' tab within a person's profile page
 * $b is the (string) HTML representation of the generated profile
 * The profile array details are in $a->profile.
 ### 'directory_item'
 'directory_item' is called from the Directory page when formatting an item for display.
 $b is an array:
 	'contact' => contact (array) record for the person from the database
    'entry' => the (string) HTML of the generated entry
 ### 'profile_sidebar_enter'
 * called prior to generating the sidebar "short" profile for a page
 * $b is the person's profile array
 ### 'profile_sidebar'
 'profile_sidebar is called when generating the sidebar "short" profile for a page.
 $b is an array:
 	'profile' => profile (array) record for the person from the database
 	'entry' => the (string) HTML of the generated entry
 ### 'contact_block_end'
 is called when formatting the block of contacts/friends on a profile sidebar has completed.
 $b is an array:
 	'contacts' => array of contacts
 	'output' => the (string) generated HTML of the contact block
 ### 'bbcode'
 * called during conversion of bbcode to html
 * $b is a string converted text
 ### 'html2bbcode'
 * called during conversion of html to bbcode (e.g. remote message posting)
 * $b is a string converted text
 ### 'page_header'
 * called after building the page navigation section
 * $b is a string HTML of nav region
 ### 'personal_xrd'
 'personal_xrd' is called prior to output of personal XRD file.
 $b is an array:
 	'user' => the user record for the person
 	'xml' => the complete XML to be output
 ### 'home_content'
 * called prior to output home page content, shown to unlogged users
 * $b is (string) HTML of section region
 ### 'contact_edit'
 is called when editing contact details on an individual from the Contacts page.
 $b is an array:
 	'contact' => contact record (array) of target contact
 	'output' => the (string) generated HTML of the contact edit page
 ### 'contact_edit_post'
 * called when posting the contact edit page.
 * $b is the $_POST array
 ### 'init_1'
 * called just after DB has been opened and before session start
 * $b is not used or passed
 ### 'page_end'
 * called after HTML content functions have completed
 * $b is (string) HTML of content div
 ### 'avatar_lookup'
 'avatar_lookup' is called when looking up the avatar.
 $b is an array:
 	'size' => the size of the avatar that will be looked up
 	'email' => email to look up the avatar for
 	'url' => the (string) generated URL of the avatar
 ### 'emailer_send_prepare'
 'emailer_send_prepare' called from Emailer::send() before building the mime message.
 $b is an array, params to Emailer::send()
    'fromName' => name of the sender
    'fromEmail' => email fo the sender
    'replyTo' => replyTo address to direct responses
    'toEmail' => destination email address
    'messageSubject' => subject of the message
    'htmlVersion' => html version of the message
    'textVersion' => text only version of the message
    'additionalMailHeader' => additions to the smtp mail header
 ### 'emailer_send'
 is called before calling PHP's mail().
 $b is an array, params to mail()
    'to'
    'subject'
    'body'
    'headers'
 ### 'nav_info'
 is called after the navigational menu is build in include/nav.php.
 $b is an array containing $nav from nav.php.
 ### 'template_vars'
 is called before vars are passed to the template engine to render the page.
 The registered function can add,change or remove variables passed to template.
 $b is an array with:
    'template' => filename of template
    'vars' => array of vars passed to template
 ### ''acl_lookup_end'
 is called after the other queries have passed.
 The registered function can add, change or remove the acl_lookup() variables.
    'results' => array of the acl_lookup() vars
 Complete list of hook callbacks
 ---
 Here is a complete list of all hook callbacks with file locations (as of 14-Feb-2012). Please see the source for details of any hooks not documented above.
 boot.php:	Addon::callHooks('login_hook',$o);
 boot.php:	Addon::callHooks('profile_sidebar_enter', $profile);
 boot.php:	Addon::callHooks('profile_sidebar', $arr);
 boot.php:	Addon::callHooks("proc_run", $arr);
 include/contact_selectors.php:	Addon::callHooks('network_to_name', $nets);
 include/api.php:				Addon::callHooks('logged_in', $a->user);
 include/api.php:		Addon::callHooks('logged_in', $a->user);
 include/queue.php:		Addon::callHooks('queue_predeliver', $a, $r);
 include/queue.php:				Addon::callHooks('queue_deliver', $a, $params);
 include/text.php:	Addon::callHooks('contact_block_end', $arr);
 include/text.php:	Addon::callHooks('smilie', $s);
 include/text.php:	Addon::callHooks('prepare_body_init', $item);
 include/text.php:	Addon::callHooks('prepare_body', $prep_arr);
 include/text.php:	Addon::callHooks('prepare_body_final', $prep_arr);
 include/nav.php:	Addon::callHooks('page_header', $a->page['nav']);
 include/auth.php:		Addon::callHooks('authenticate', $addon_auth);
 include/bbcode.php:	Addon::callHooks('bbcode',$Text);
 include/oauth.php:		Addon::callHooks('logged_in', $a->user);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_post_' . $selname, $o);
 include/acl_selectors.php:	Addon::callHooks('contact_select_options', $x);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_post_' . $selname, $o);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	Addon::callHooks($a->module . '_post_' . $selname, $o);
 include/acl_selectors.php	Addon::callHooks('acl_lookup_end', $results);
 include/notifier.php:		Addon::callHooks('notifier_normal',$target_item);
 include/notifier.php:	Addon::callHooks('notifier_end',$target_item);
 include/items.php:	Addon::callHooks('atom_feed', $atom);
 include/items.php:		Addon::callHooks('atom_feed_end', $atom);
 include/items.php:	Addon::callHooks('atom_feed_end', $atom);
 include/items.php:	Addon::callHooks('parse_atom', $arr);
 include/items.php:	Addon::callHooks('post_remote',$arr);
 include/items.php:	Addon::callHooks('atom_author', $o);
 include/items.php:	Addon::callHooks('atom_entry', $o);
 include/bb2diaspora.php:	Addon::callHooks('bb2diaspora',$Text);
 include/cronhooks.php:	Addon::callHooks('cron', $d);
 include/security.php:		Addon::callHooks('logged_in', $a->user);
 include/html2bbcode.php:	Addon::callHooks('html2bbcode', $text);
 include/Contact.php:	Addon::callHooks('remove_user',$r[0]);
 include/Contact.php:	Addon::callHooks('contact_photo_menu', $args);
 include/conversation.php:	Addon::callHooks('conversation_start',$cb);
 include/conversation.php:				Addon::callHooks('render_location',$locate);
 include/conversation.php:				Addon::callHooks('display_item', $arr);
 include/conversation.php:				Addon::callHooks('render_location',$locate);
 include/conversation.php:				Addon::callHooks('display_item', $arr);
 include/conversation.php:	Addon::callHooks('item_photo_menu', $args);
 include/conversation.php:	Addon::callHooks('jot_tool', $jotplugins);
 include/conversation.php:	Addon::callHooks('jot_networks', $jotnets);
 index.php:	Addon::callHooks('init_1');
 index.php:Addon::callHooks('app_menu', $arr);
 index.php:Addon::callHooks('page_end', $a->page['content']);
 mod/photos.php:	Addon::callHooks('photo_post_init', $_POST);
 mod/photos.php:	Addon::callHooks('photo_post_file',$ret);
 mod/photos.php:		Addon::callHooks('photo_post_end',$foo);
 mod/photos.php:		Addon::callHooks('photo_post_end',$foo);
 mod/photos.php:		Addon::callHooks('photo_post_end',$foo);
 mod/photos.php:	Addon::callHooks('photo_post_end',intval($item_id));
 mod/photos.php:		Addon::callHooks('photo_upload_form',$ret);
 mod/friendica.php:	Addon::callHooks('about_hook', $o);
 mod/editpost.php:	Addon::callHooks('jot_tool', $jotplugins);
 mod/editpost.php:	Addon::callHooks('jot_networks', $jotnets);
 mod/parse_url.php:	Addon::callHooks('parse_link', $arr);
 mod/home.php:	Addon::callHooks('home_init',$ret);
 mod/home.php:	Addon::callHooks("home_content",$o);
 mod/contacts.php:	Addon::callHooks('contact_edit_post', $_POST);
 mod/contacts.php:		Addon::callHooks('contact_edit', $arr);
 mod/settings.php:		Addon::callHooks('addon_settings_post', $_POST);
 mod/settings.php:		Addon::callHooks('connector_settings_post', $_POST);
 mod/settings.php:	Addon::callHooks('settings_post', $_POST);
 mod/settings.php:		Addon::callHooks('addon_settings', $settings_addons);
 mod/settings.php:		Addon::callHooks('connector_settings', $settings_connectors);
 mod/settings.php:	Addon::callHooks('settings_form',$o);
 mod/register.php:	Addon::callHooks('register_account', $newuid);
 mod/like.php:	Addon::callHooks('post_local_end', $arr);
 mod/xrd.php:	Addon::callHooks('personal_xrd', $arr);
 mod/item.php:	Addon::callHooks('post_local_start', $_REQUEST);
 mod/item.php:	Addon::callHooks('post_local',$datarray);
 mod/item.php:	Addon::callHooks('post_local_end', $datarray);
 mod/profile.php:			Addon::callHooks('profile_advanced',$o);
 mod/profiles.php:	Addon::callHooks('profile_post', $_POST);
 mod/profiles.php:		Addon::callHooks('profile_edit', $arr);
 mod/tagger.php:	Addon::callHooks('post_local_end', $arr);
 mod/cb.php:	Addon::callHooks('cb_init');
 mod/cb.php:	Addon::callHooks('cb_post', $_POST);
 mod/cb.php:	Addon::callHooks('cb_afterpost');
 mod/cb.php:	Addon::callHooks('cb_content', $o);
 mod/directory.php:			Addon::callHooks('directory_item', $arr);
 src/Model/Item.php Addon::callHooks('tagged', $arr);
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@ -1,154 +1,637 @@
 Friendica BBCode tags reference
 ========================
-* [Home](help)
+* [Creating posts](help/Text_editor)
-Inline
+## Inline
 -----
 <style>
 table.bbcodes {
    margin: 1em 0;
    background-color: #f9f9f9;
    border: 1px solid #aaa;
    border-collapse: collapse;
    color: #000;
    width: 100%;
 }
-<pre>[b]bold[/b]</pre> : <strong>bold</strong>
+table.bbcodes > tr > th,
 table.bbcodes > tr > td,
 table.bbcodes > * > tr > th,
 table.bbcodes > * > tr > td {
    border: 1px solid #aaa;
    padding: 0.2em 0.4em
 }
-<pre>[i]italic[/i]</pre> : <em>italic</em>
+table.bbcodes > tr > th,
 table.bbcodes > * > tr > th {
    background-color: #f2f2f2;
    text-align: center;
    width: 50%
 }
 </style>
-<pre>[u]underlined[/u]</pre> : <u>underlined</u>
+<table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[b]bold[/b]</td>
  <td><strong>bold</strong></td>
 </tr>
 <tr>
  <td>[i]italic[/i]</td>
  <td><em>italic</em></td>
 </tr>
 <tr>
  <td>[u]underlined[/u]</td>
  <td><u>underlined</u></td>
 </tr>
 <tr>
  <td>[s]strike[/s]</td>
  <td><strike>strike</strike></td>
 </tr>
 <tr>
  <td>[o]overline[/o]</td>
  <td><span class="overline">overline</span></td>
 </tr>
 <tr>
  <td>[color=red]red[/color]</td>
  <td><span style="color:  red;">red</span></td>
 </tr>
 <tr>
  <td>[url=http://friendi.ca]Friendica[/url]</td>
  <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
  <td>[img]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]</td>
  <td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" alt="Immagine/foto"></td>
 </tr>
 <tr>
  <td>[img=64x32]https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg[/img]<br>
 <br>Note: provided height is simply discarded.</td>
  <td><img src="https://raw.githubusercontent.com/friendica/friendica/master/images/friendica-32.jpg" style="width: 64px;"></td>
 </tr>
 <tr>
  <td>[size=xx-small]small text[/size]</td>
  <td><span style="font-size: xx-small;">small text</span></td>
 </tr>
 <tr>
  <td>[size=xx-large]big text[/size]</td>
  <td><span style="font-size: xx-large;">big text</span></td>
 </tr>
 <tr>
  <td>[size=20]exact size[/size] (size can be any number, in pixels)</td>
  <td><span style="font-size: 20px;">exact size</span></td>
 </tr>
 <tr>
  <td>[font=serif]Serif font[/font]</td>
  <td><span style="font-family: serif;">Serif font</span></td>
 </tr>
 </table>
-<pre>[s]strike[/s]</pre> : <strike>strike</strike>
+### Links
-<pre>[color=red]red[/color]</pre> : <span style="color:  red;">red</span>
+<table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[url]http://friendi.ca[/url]</td>
  <td><a href="http://friendi.ca">http://friendi.ca</a></td>
 </tr>
 <tr>
  <td>[url=http://friendi.ca]Friendica[/url]</td>
  <td><a href="http://friendi.ca">Friendica</a></td>
 </tr>
 <tr>
  <td>[bookmark]http://friendi.ca[/bookmark]<br><br>
 #^[url]http://friendi.ca[/url]</td>
  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank">http://friendi.ca</a></h4></span></td>
 </tr>
 <tr>
  <td>[bookmark=http://friendi.ca]Bookmark[/bookmark]<br><br>
 #^[url=http://friendi.ca]Bookmark[/url]<br><br>
 #[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url]</td>
  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank">Bookmark</a></h4></span></td>
 </tr>
 <tr>
  <td>[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url]</td>
  <td><a href="/display/f16d77b0630f0134740c0cc47a0ea02a" target="_blank">Diaspora post with GUID</a></td>
 </tr>
 <tr>
  <td>#Friendica</td>
  <td>#<a href="/search?tag=Friendica">Friendica</a></td>
 </tr>
 <tr>
  <td>@Mention</td>
  <td>@<a href="javascript:void(0)">Mention</a></td>
 </tr>
 <tr>
  <td>acct:account@friendica.host.com (WebFinger)</td>
  <td><a href="/acctlink?addr=account@friendica.host.com" target="extlink">acct:account@friendica.host.com</a></td>
 </tr>
 <tr>
  <td>[mail]user@mail.example.com[/mail]</td>
  <td><a href="mailto:user@mail.example.com">user@mail.example.com</a></td>
 </tr>
 <tr>
  <td>[mail=user@mail.example.com]Send an email to User[/mail]</td>
  <td><a href="mailto:user@mail.example.com">Send an email to User</a></td>
 </tr>
 </table>
-<pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>
+## Blocks
-<pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">
+<table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[p]A paragraph of text[/p]</td>
  <td><p>A paragraph of text</p></td>
 </tr>
 <tr>
  <td>Inline [code]code[/code] in a paragraph</td>
  <td>Inline <key>code</key> in a paragraph</td>
 </tr>
 <tr>
  <td>[code]Multi<br>line<br>code[/code]</td>
  <td><code>Multi
 line
 code</code></td>
 </tr>
 <tr>
  <td>[code=php]function text_highlight($s,$lang)[/code]<sup><a href="#supported-code">1</a></sup></td>
  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code">&nbsp;</span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
 </tr>
 <tr>
  <td>[quote]quote[/quote]</td>
  <td><blockquote>quote</blockquote></td>
 </tr>
 <tr>
  <td>[quote=Author]Author? Me? No, no, no...[/quote]</td>
  <td><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote></td>
 </tr>
 <tr>
  <td>[center]Centered text[/center]</td>
  <td><div style="text-align:center;">Centered text</div></td>
 </tr>
 <tr>
  <td>You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]</td>
  <td>
    <div class="wall-item-container">
      You should not read any further if you want to be surprised.<br>
      <span id="spoiler-wrap-0716e642" class="spoiler-wrap fakelink" onclick="openClose('spoiler-0716e642');">Click to open/close</span>
      <blockquote class="spoiler" id="spoiler-0716e642" style="display: none;">There is a happy end.</blockquote>
      <div class="body-attach"><div class="clear"></div></div>
    </div>
  </td>
 </tr>
 <tr>
  <td>[spoiler=Author]Spoiler quote[/spoiler]</td>
  <td>
    <div class="wall-item-container">
      <strong class="spoiler">Author wrote:</strong><br>
      <span id="spoiler-wrap-a893765a" class="spoiler-wrap fakelink" onclick="openClose('spoiler-a893765a');">Click to open/close</span>
      <blockquote class="spoiler" id="spoiler-a893765a" style="display: none;">Spoiler quote</blockquote>
      <div class="body-attach"><div class="clear"></div></div>
    </div>
  </td>
 </tr>
 <tr>
  <td>[hr] (horizontal line)</td>
  <td><hr></td>
 </tr>
 </table>
-<pre>[size=xx-small]small text[/size]</pre> : <span style="font-size: xx-small;">small text</span>
+<a name="supported-code">1</a>: Supported language parameter values for code highlighting:
 - abap
 - avrc
 - cpp
 - css
 - diff
 - dtd
 - html
 - java
 - javascript
 - js
 - mysql
 - perl
 - php
 - python
 - ruby
 - sh
 - sql
 - vbscript
 - xml
-<pre>[size=xx-large]big text[/size]</pre> : <span style="font-size: xx-large;">big text</span>
+### Titles
-<pre>[size=20]exact size[/size] (size can be any number, in pixel)</pre> :  <span style="font-size: 20px;">exact size</span>
+<table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[h1]Title 1[/h1]</td>
  <td><h1>Title 1</h1></td>
 </tr>
 <tr>
  <td>[h2]Title 2[/h2]</td>
  <td><h2>Title 2</h2></td>
 </tr>
 <tr>
  <td>[h3]Title 3[/h3]</td>
  <td><h3>Title 3</h3></td>
 </tr>
 <tr>
  <td>[h4]Title 4[/h4]</td>
  <td><h4>Title 4</h4></td>
 </tr>
 <tr>
  <td>[h5]Title 5[/h5]</td>
  <td><h5>Title 5</h5></td>
 </tr>
 <tr>
  <td>[h6]Title 6[/h6]</td>
  <td><h6>Title 6</h6></td>
 </tr>
 </table>
 ### Tables
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[table]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 1[/th]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
 &nbsp;&nbsp;[/tr]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 1[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 2[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 3[/td]<br>
 &nbsp;&nbsp;[/tr]<br>
 &nbsp;&nbsp;[tr]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 4[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 5[/td]<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 6[/td]<br>
 &nbsp;&nbsp;[/tr]<br>
 [/table]</td>
  <td>
 	<table>
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 <tr>
  <td>[table border=0]</td>
  <td>
 	<table border="0">
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 <tr>
  <td>[table border=1]</td>
  <td>
 	<table border="1">
      <tbody>
        <tr>
          <th>Header 1</th>
          <th>Header 2</th>
          <th>Header 3</th>
        </tr>
        <tr>
          <td>Cell 1</td>
          <td>Cell 2</td>
          <td>Cell 3</td>
        </tr>
        <tr>
          <td>Cell 4</td>
          <td>Cell 5</td>
          <td>Cell 6</td>
        </tr>
      </tbody>
    </table>
  </td>
 </tr>
 </table>
 ### Lists
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[ul]<br>
 &nbsp;&nbsp;[li] First list element<br>
 &nbsp;&nbsp;[li] Second list element<br>
 [/ul]<br>
 [list]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
 	<ul class="listbullet" style="list-style-type: circle;">
 		<li>First list element</li>
 		<li>Second list element</li>
 	</ul>
  </td>
 </tr>
 <tr>
  <td>[ol]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/ol]<br>
 [list=1]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listdecimal" style="list-style-type: decimal;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listnone" style="list-style-type: none;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=i]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listlowerroman" style="list-style-type: lower-roman;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=I]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listupperroman" style="list-style-type: upper-roman;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=a]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listloweralpha" style="list-style-type: lower-alpha;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 <tr>
  <td>[list=A]<br>
 &nbsp;&nbsp;[*] First list element<br>
 &nbsp;&nbsp;[*] Second list element<br>
 [/list]</td>
  <td>
    <ul class="listupperalpha" style="list-style-type: upper-alpha;">
      <li> First list element</li>
      <li> Second list element</li>
    </ul>
  </td>
 </tr>
 </table>
-
+## Embed
 Block
 -----
 <pre>[code]code[/code]</pre>
 <code>code</code>
 <p style="clear:both;">&nbsp;</p>
 <pre>[quote]quote[/quote]</pre>
 <blockquote>quote</blockquote>
 <p style="clear:both;">&nbsp;</p>
 <pre>[quote=Author]Author? Me? No, no, no...[/quote]</pre>
 <strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote>
 <p style="clear:both;">&nbsp;</p>
 <pre>[center]centered text[/center]</pre>
 <div style="text-align:center;">centered text</div>
 <p style="clear:both;">&nbsp;</p>
 <pre>You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]</pre>
 You should not read any further if you want to be surprised.<br />*click to open/close*
 (The text between thhe opening and the closing of the spoiler tag will be visible once the link is clicked. So *"There is a happy end."* wont be visible until the spoiler is uncovered.)
 <p style="clear:both;">&nbsp;</p>
 **Table**
 <pre>[table border=1]
 [tr] 
   [th]Tables now[/th]
 [/tr]
 [tr]
   [td]Have headers[/td]
 [/tr]
 [/table]</pre>
 <table border="1"><tbody><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></tbody></table>
 <p style="clear:both;">&nbsp;</p>
 **List**
 <pre>[list]
 [*] First list element
 [*] Second list element
 [/list]</pre>
 <ul class="listbullet" style="list-style-type: circle;">
 <li> First list element<br>
 </li>
 <li> Second list element</li>
 </ul>
 [list] is equivalent to [ul] (unordered list). 
 [ol] can be used instead of [list] to show an ordered list:
 <pre>[ol]
 [*] First list element
 [*] Second list element
 [/ol]</pre>
 <ul class="listdecimal" style="list-style-type: decimal;"><li> First list element<br></li><li> Second list element</li></ul>
 For more options on ordered lists, you can define the style of numeration on [list] argument:
 <pre>[list=1]</pre> : decimal
 <pre>[list=i]</pre> : lover case roman
 <pre>[list=I]</pre> : upper case roman
 <pre>[list=a]</pre> : lover case alphabetic
 <pre>[list=A] </pre> : upper case alphabetic
 Embed
 ------
 You can embed video, audio and more in a message.
-<pre>[video]url[/video]</pre>
+<table class="bbcodes">
-<pre>[audio]url[/audio]</pre>
+<tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[video]url[/video]</td>
  <td>Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.</td>
 </tr>
 <tr>
  <td>[video]Video file url[/video]
 [audio]Audio file url[/audio]</td>
  <td>Full URL to an ogg/ogv/oga/ogm/webm/mp4/mp3 file. An HTML5 player will be used to show it.</td>
 </tr>
 <tr>
  <td>[youtube]Youtube URL[/youtube]</td>
  <td>Youtube video OEmbed display. May not embed an actual player.</td>
 </tr>
 <tr>
  <td>[youtube]Youtube video ID[/youtube]</td>
  <td>Youtube player iframe embed.</td>
 </tr>
 <tr>
  <td>[vimeo]Vimeo URL[/vimeo]</td>
  <td>Vimeo video OEmbed display. May not embed an actual player.</td>
 </tr>
 <tr>
  <td>[vimeo]Vimeo video ID[/vimeo]</td>
  <td>Vimeo player iframe embed.</td>
 </tr>
 <tr>
  <td>[embed]URL[/embed]</td>
  <td>Embed OEmbed rich content.</td>
 </tr>
 <tr>
  <td>[iframe]URL[/iframe]</td>
  <td>General embed, iframe size is limited by the theme size for video players.</td>
 </tr>
 <tr>
  <td>[url]*url*[/url]</td>
  <td>If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
 Page title with a link to *url* will be shown.</td>
 </tr>
 </table>
-Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
+## Map
 *url* can be also full url to an ogg  file. HTML5 tag will be used to show it.
-<pre>[url]*url*[/url]</pre>
+This requires "openstreetmap" or "Google Maps" addon version 1.3 or newer.
 If the addon isn't activated, the raw coordinates are shown instead.
-If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
+<table class="bbcodes">
-Page title with a link to *url* will be shown.
+<tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[map]address[/map]</td>
  <td>Embeds a map centered on this address.</td>
 </tr>
 <tr>
  <td>[map=lat,long]</td>
  <td>Embeds a map centered on those coordinates.</td>
 </tr>
 <tr>
  <td>[map]</td>
  <td>Embeds a map centered on the post's location.</td>
 </tr>
 </table>
-Map
+## Abstract for longer posts
 ---
-<pre>[map]address[/map]</pre>
+If you want to spread your post to several third party networks you may have the problem that these networks have a length limitation like on Twitter.
 <pre>[map=lat,long]</pre>
-You can embed maps from coordinates or addresses. 
+Friendica uses a semi-intelligent mechanism to generate a fitting abstract.
-This require "openstreetmap" addon version 1.3 or newer.
+But it can be useful to define a custom abstract that will only be displayed on the external network.
 This is done with the [abstract]-element.
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>[abstract]Totally interesting! A must-see! Please click the link![/abstract]<br>
 I want to tell you a really boring story that you really never wanted to hear.</td>
  <td>Twitter would display the text <blockquote>Totally interesting! A must-see! Please click the link!</blockquote>
 On Friendica you would only see the text after <blockquote>I want to tell you a really ...</blockquote></td>
 </tr>
 </table>
 It is even possible to define abstracts for separate networks:
-Special
+<table class="bbcodes">
-------
+<tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>
 [abstract]Hi friends Here are my newest pictures![/abstract]<br>
 [abstract=twit]Hi my dear Twitter followers. Do you want to see my new
 pictures?[/abstract]<br>
 [abstract=apdn]Helly my dear followers on ADN. I made sone new pictures
 that I wanted to share with you.[/abstract]<br>
 Today I was in the woods and took some real cool pictures ...</td>
  <td>For Twitter and App.net the system will use the defined abstracts.<br>
 For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used.</td>
 </tr>
 </table>
-If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+If you use (for example) the "buffer" connector to post to Facebook or Google+ you can use this element to define an abstract for a longer blogpost that you don't want to post completely to these networks.
-<pre>[noparse][b]bold[/b][/noparse]</pre> : [b]bold[/b]
+Networks like Facebook or Google+ aren't length limited.
 For this reason the [abstract] element isn't used.
 Instead you have to name the explicit network:
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>
 [abstract]These days I had a strange encounter...[/abstract]<br>
 [abstract=goog]Hello my dear Google+ followers. You have to read my newest blog post![/abstract]<br>
 [abstract=face]Hello my Facebook friends. These days happened something really cool.[/abstract]<br>
 While taking pictures in the woods I had a really strange encounter...</td>
  <td>Google and Facebook will show the respective abstracts while the other networks will show the default one.<br>
 <br>Meanwhile, Friendica won't show any of the abstracts.</td>
 </tr>
 </table>
 The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, Wordpress or Pump.io.
 For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
 ## Special
 <table class="bbcodes">
 <tr>
  <th>BBCode</th>
  <th>Result</th>
 </tr>
 <tr>
  <td>If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
    <ul>
      <li>[noparse][b]bold[/b][/noparse]</li>
      <li>[nobb][b]bold[/b][/nobb]</li>
      <li>[pre][b]bold[/b][/pre]</li>
    </ul>
  </td>
  <td>[b]bold[/b]</td>
 </tr>
 <tr>
  <td>[nosmile] is used to disable smilies on a post by post basis<br>
    <br>
    [nosmile] ;-) :-O
  </td>
  <td>;-) :-O</td>
 </tr>
 <tr>
  <td>Custom inline styles<br>
 <br>
 [style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]</td>
  <td><span style="text-shadow: 0 0 4px #cc0000;;">You can change all the CSS properties of this block.</span></td>
 </tr>
 <tr>
  <td>Custom class block<br>
 <br>
 [class=custom]If the class exists, this block will have the custom class style applied.[/class]</td>
  <td><pre>&lt;span class="custom"&gt;If the class exists,<br> this block will have the custom class<br> style applied.&lt;/span&gt;</pre></td>
 </tr>
 </table>
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@ -5,14 +5,17 @@ Bugs and Issues
 If your server has a support page, you should report any bugs/issues you encounter there first.
 Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them.
-This helps us get new features faster.
+Reducing the workload in this way helps us get new features faster.
 You can also contact the [friendica support forum](https://forum.friendi.ca/profile/helpers) and report your problem there.
 Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the problem too, and will be able to help you.
-If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](http://bugs.friendica.com/).
+If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues).
 This is also used for issues with addons.
 Please perform a search to see if there's already an open bug that matches yours before submitting anything.
 Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.
 It's generally better to provide too much information than not enough.
-See [this article](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) to learn more about submitting **good** bug reports.
+See [this article](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) to learn more about submitting **good** bug reports.  The better your bug report, the more likely we are to be able to actually fix it.
-And last but not least: Better report an issue you encountered even if you don't write the perfect bug report!
+And last but not least: It is better to report an issue you encountered even if you can't write the perfect bug report!
--- a/doc/Chats.md
+++ b/doc/Chats.md
@ -3,24 +3,24 @@ Chats
 * [Home](help)
-There are two possibilities to use a chat on your friendica site
+There are two possibilities to use chat on your friendica site
 * IRC Chat
 * Jappix
-IRC-Chat Plugin
+IRC-Chat Addon
 ---
-After activating the plugin, you can find the chat at [yoursite.com/irc](../irc).
+After activating the addon, you can find the chat at [yoursite.com/irc](../irc).
 Note: you can use this chat without any login at your site so that everyone could use it.
-If you follow the link, you will see the login page of the IR chat.
+If you follow the link, you will see the login page of the IRC chat.
 Now choose a nickname and a chatroom.
-You can choose every name for the room, even something like #superchatwhosenameisonlyknownbyme.
+You can choose any name you like for the room, even something like #superchatwhosenameisonlyknownbyme.
-At last, solve the captchas and click the connect button.
+Finally, solve the captchas and click the connect button.
 The following window shows some text while connecting.
-This text isn't importend for you, just wait for the next window.
+This text isn't important, just wait for the next window.
 The first line shows your name and your current IP address.
 The right part of the window shows all users.
 The lower part of the window contains an input field.
@ -28,8 +28,8 @@ The lower part of the window contains an input field.
 Jappix Mini
 ---
-The Jappix Mini Plugin creates a chatbox for jabber- and XMPP-contacts.
+The Jappix Mini Addon creates a chatbox for jabber- and XMPP-contacts.
-You should already have a jabber/XMPP-account before setting up the plugin.
+You should already have a jabber/XMPP-account before setting up the addon.
 You can find more information at [jabber.org](http://www.jabber.org/).
 You can use several servers to create an account:
@ -48,15 +48,15 @@ Or you can download a tar archive here: [jappixmini.tgz](https://github.com/frie
 Just unpack the file and rename the directory to „jappixmini“.
 Next, upload this directory and the .tgz-file into your addon directory of your friendica installation.
-Now you can activate the plugin globally on the admin pages.
+Now you can activate the addon globally on the admin pages.
-In the plugin sidebar, you will find an entry of jappix now (where you can also find twitter, GNU Social and others).
+In the addon sidebar, you will find an entry of jappix now (where you can also find twitter, GNU Social and others).
-The following page shows the settings of this plugin.
+The following page shows the settings of this addon.
 Activate the BOSH proxy.
 ###2. Settings
-Go to your user account settings next and choose the plugin page.
+Go to your user account settings next and choose the addon page.
 Scroll down until you find the Jappix Mini addon settings.
 At first you have to activate the addon.
--- a/doc/Composer.md
+++ b/doc/Composer.md
@ -0,0 +1,120 @@
 Using Composer
 ==============
 * [Home](help)
  * [Developer Intro](help/Developers-Intro)
 Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
 It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`.
 * [Class autoloading](help/autoloader)
 ## How to use Composer
 If you don't have Composer installed on your system, Friendica ships with a copy of it at `util/composer.phar`.
 For the purpose of this help, all examples will use this path to run Composer commands, however feel free to replace them with your own way of calling Composer.
 Composer requires PHP CLI and the following examples assume it's available system-wide.
 ### Installing/Updating Friendica
 #### From Archive
 If you just unpacked a Friendica release archive, you don't have to use Commposer at all, all the required libraries are already bundled in the archive.
 #### Installing with Git
 If you prefer to use `git`, you will have to run Composer to fetch the required libraries and build the autoloader before you can run Friendica.
 Here are the typical commands you will have to run to do so:
 ````
 ~> git clone https://github.com/friendica/friendica.git friendica
 ~/friendica> cd friendica
 ~/friendica> util/composer.phar install
 ````
 That's it! Composer will take care of fetching all the required libraries in the `vendor` folder and build the autoloader to make those libraries available to Friendica.
 #### Updating with Git
 Updating Friendica to the current stable or the latest develop version is easy with Git, just remember to run Composer after every branch pull.
 ````
 ~> cd friendica
 ~/friendica> git pull
 ~/friendica> util/composer.phar install
 ````
 And that's it. If any library used by Friendica has been upgraded, Composer will fetch the version currently used by Friendica and refresh the autoloader to ensure the best performances.
 ### Developing Friendica
 First of all, thanks for contributing to Friendica!
 Composer is meant to be used by developers to maintain third-party libraries required by Friendica.
 If you don't need to use any third-party library, then you don't need to use Composer beyond what is above to install/update Friendica.
 #### Adding a third-party library to Friendica
 Does your shiny new [Addon](help/Addons) need to rely on a third-party library not required by Friendica yet?
 First of all, this library should be available on [Packagist](https://packagist.org) so that Composer knows how to fetch it directly just by mentioning its name in `composer.json`.
 This file is the configuration of Friendica for Composer. It lists details about the Friendica project, but also a list of required dependencies and their target version.
 Here's a simplified version of the one we currently use on Friendica:
 ````json
 {
 	"name": "friendica/friendica",
 	"description": "A decentralized social network part of The Federation",
 	"type": "project",
 	...
 	"require": {
 		"ezyang/htmlpurifier": "~4.7.0",
 		"mobiledetect/mobiledetectlib": "2.8.*"
 	},
 	...
 }
 ````
 The important part is under the `require` key, this is a list of all the libraries Friendica may need to run.
 As you can see, at the moment we only require two, HTMLPurifier and MobileDetect.
 Each library has a different target version, and [per Composer documentation about version constraints](https://getcomposer.org/doc/articles/versions.md#writing-basic-version-constraints), this means that:
 * We will update HTMLPurifier up to version 4.8.0 excluded
 * We will update MobileDetect up to version 2.9.0 excluded
 There are other operators you can use to allow Composer to update the package up to the next major version excluded.
 Or you can specify the exact version of the library if you code requires it, and Composer will never update it although it isn't recommended.
 To add a library, just add its Packagist identifier to the `require` list and set a target version string.
 Then you should run `util/composer.phar update` to add it to your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.
 #### Updating an existing dependency
 If a package needs to be updated, whether to the next minor version or to the next major version provided you changed the adequate code in Friendica, simply edit `composer.json` to update the target version string of the relevant library.
 Then you should run `util/composer.phar update` to update it in your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.
 Please note that you should commit both `composer.json` and `composer.lock` with your work every time you make a change to the former.
 ## Composer FAQ
 ### I used the `composer` command and got a warning about not to run it as root.
 See [https://getcomposer.org/root]().
 Composer should be run as the web server user, usually `www-data` with Apache or `http` with nginx.
 If you can't switch to the web server user using `su - [web user]`, you can directly run the Composer command with `sudo -u [web user]`.
 ### Running Composer with `sudo` complains about not being able to create the composer cache directory in `/root/.composer`
 This is because `sudo` doesn't always change the `HOME` environment variable, which means that the command is run as the web server user but the system still uses `root` home directory.
 However, you can temporarily change environment variable for the execution of a single command.
 For Composer, this would be:
 ````
 $> COMPOSER_HOME=/var/tmp/composer sudo -u [web user] util/composer.phar [mode]
 ````
 ## Related
 * [Class autoloading](help/autoloader)
 * [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
@ -57,13 +57,15 @@ All that the pages need to have is a discoverable feed using either the RSS or A
 Twitter
 ---
-To follow a Twitter member, put the URL of the Twitter member's main page into the Connect box on your [Contacts](contacts) page.
+To follow a Twitter member, the Twitter-Connector (Addon) needs to be configured on your node.
 If this is the case put the URL of the Twitter member's main page into the Connect box on your [Contacts](contacts) page.
 To reply, you must have the Twitter connector installed, and reply using your own status editor.
 Begin the message with @twitterperson replacing with the Twitter username.
 Email
 ---
 If the php module for IMAP support is available on your server, Friendica can connect to email contacts as well.
 Configure the email connector from your [Settings](settings) page.
 Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contacts) page.
 They must be the sender of a message which is currently in your INBOX for the connection to succeed.
--- a/doc/Developer-How-To-Move-Classes-to-src.md
+++ b/doc/Developer-How-To-Move-Classes-to-src.md
@ -0,0 +1,108 @@
 How To Move Classes to `src`
 ==============
 * [Home](help)
  * [Developer Intro](help/Developers-Intro)
 Friendica uses [Composer](help/Composer) to manage autoloading.
 This means that all the PHP class files moved to the `src` folder will be [automatically included](help/autoloader) when the class it defines is first used in the flow.
 This is an improvement over the current `require` usage since files will be included on an actual usage basis instead of the presence of a `require` call.
 However, there are a significant number of items to check when moving a class file from the `include` folder to the `src` folder, and this page is there to list them.
 ## Decide the namespace
 This isn't the most technical decision of them all, but it has long lasting consequences as it will be the name that will be used to refer to this class from now on.
 There is [a shared Ethercalc sheet](https://ethercalc.org/friendica_classes) to suggest namespace/class names that lists all the already moved class files for inspiration.
 A few pointers though:
 * `Friendica` is the base namespace for all classes in the `src` folder
 * Namespaces match the directory structure, with `Friendica` namespace being the base `src` directory. The `Config` class set in the `Friendica\Core` namespace is expected to be found at `src/Core/Config.php`.
 * Namespaces can help group classes with a similar purpose or relevant to a particular feature
 When you're done deciding the namespace, it's time to use it.
 Let's say we choose `Friendica\Core` for the `Config` class.
 ## Use the namespace
 To declare the namespace, the file `src/Core/Config.php` must start with the following statement:
 ````php
 namespace Friendica\Core;
 ````
 From now on, the `Config` class can be referred to as `Friendica\Core\Config`, however it isn't very practical, especially when the class was previously used as `Config`.
 Thankfully, PHP provides namespace shortcuts through `use`.
 This language construct just provides a different naming scheme for a namespace or a class, but doesn't trigger the autoload mechanism on its own.
 Here are the different ways you can use `use`:
 ````php
 // No use
 $config = new Friendica\Core\Config();
 ````
 ````php
 // Namespace shortcut
 use Friendica\Core;
 $config = new Core\Config();
 ````
 ````php
 // Class name shortcut
 use Friendica\Core\Config;
 $config = new Config();
 ````
 ````php
 // Aliasing
 use Friendica\Core\Config as Cfg;
 $config = new Cfg();
 ````
 Whatever the style chosen, a repository-wide search has to be done to find all the class name usage and either use the fully-qualified class name (including the namespace) or add a `use` statement at the start of each relevant file.
 ## Escape non-namespace classes
 The class file you just moved is now in the `Friendica` namespace, but it probably isn't the case for all the classes referenced in this file.
 Since we added a `namespace Friendica\Core;` to the file, all the class names still declared in `include` will be implicitly understood as `Friendica\Core\ClassName`, which is rarely what we expect.
 To avoid `Class Friendica\Core\ClassName not found` errors, all the `include`-declared class names have to be prepended with a `\`, it tells the autoloader not to look for the class in the namespace but in the global space where non-namespaced classes are set.
 If there are only a handful of references to a single non-namespaced class, just prepending `\` is enough. However, if there are many instance, we can use `use` again.
 ````php
 namespace Friendica\Core;
 ...
 if (\DBM::is_result($r)) {
    ...
 }
 ````
 ````php
 namespace Friendica\Core;
 use Friendica\Database\DBM;
 if (DBM::is_result($r)) {
    ...
 }
 ````
 ## Remove any useless `require`
 Now that you successfully moved your class to the autoloaded `src` folder, there's no need to include this file anywhere in the app ever again.
 Please remove all the `require_once` mentions of the former file, as they will provoke a Fatal Error even if the class isn't used.
 ## Miscellaneous tips
 When you are done with moving the class, please run `php util/typo.php` from the Friendica base directory to check for obvious mistakes.
 Howevever, this tool isn't bullet-proof, and a staging install of Friendica is recommended to test your class move without impairing your production server if you host one.
 Most of Friendica processes are run in the background, so make sure to turn on your debug log to check for errors that wouldn't show up while simply browsing Friendica.
 Check the class file for any magic constant `__FILE__` or `__DIR__`, as their value changed since you moved the class in the file tree.
 Most of the time it's used for debugging purposes but there can be instances where it's used to create cache folders for example.
 ## Related
 * [Class autoloading](help/autoloader)
 * [Using Composer](help/Composer)
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@ -1,39 +1,34 @@
-Where to get started to help improve Friendica?
+# Where to get started to help improve Friendica
-===============================================
+
 <!-- markdownlint-disable MD010 MD013 -->
 * [Home](help)
 Do you want to help us improve Friendica?
 Here we have compiled some hints on how to get started and some tasks to help you choose.
 A project like Friendica is the sum of many different contributions.
-**Very different skills are required to make good software.
+**Very different skills are required to make good software, not all of them involve coding!**
 Some of them involve coding, others do not.**
 We are looking for helpers in all areas, whether you write text or code, whether you spread the word to convince people or design new icons.
 Whether you feel like an expert or like a newbie - join us with your ideas!
-Contact us
+## Contact us
 ---
 The discussion of Friendica development takes place in the following Friendica forums:
-* The main [forum for Friendica development](https://friendika.openmindspace.org/profile/friendicadevelopers)
+* The main [forum for Friendica development](https://forum.friendi.ca/profile/developers)
 * The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
-Help other users
+## Help other users
 ---
 Remember the questions you had when you first tried Friendica?
-A good place to start can be to help new people find their way around Friendica in the [general support forum](https://helpers.pyxis.uberspace.de/profile/helpers).
+A good place to start can be to help new people find their way around Friendica in the [general support forum](https://forum.friendi.ca/prufile/helpers).
 Welcome them, answer their questions, point them to documentation or ping other helpers directly if you can't help but think you know who can.
-Translation
+## Translation
 ---
-The documentation contains help on how to translate Friendica in the [at Transifex](/help/translations) where the UI is translated.
+The documentation contains help on how to translate Friendica [at Transifex](/help/translations) where the UI is translated.
 If you don't want to translate the UI, or it is already done to your satisfaction, you might want to work on the translation of the /help files?
-Design
+## Design
 ---
 Are you good at designing things?
 If you have seen Friendica you probably have ideas to improve it, haven't you?
@ -41,40 +36,120 @@ If you have seen Friendica you probably have ideas to improve it, haven't you?
 * If you would like to work with us on enhancing the user interface, please join the [UX Watchdogs forum](https://fc.oscp.info/profile/ux-watchdogs)
 * Make plans for a better Friendica interface design and share them with us.
 * Tell us if you are able to realize your ideas or what kind of help you need.
-We can't promise we have the right skills in the group but we'll try.
+	We can't promise we have the right skills in the group but we'll try.
-* Choose a thing to start with, e.g. work on the icon set of your favourite theme
+* Choose a thing to start with, e.g. work on the icon set of your favorite theme
-Programming
+## Programming
 ---
-###Issues
+### Composer
 Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
 It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`.
 If you want to have git automatically update the dependencies with composer, you can use the `post-merge` [git-hook](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks) with a script similar to this one:
    #/usr/bin/env bash
    # MIT © Sindre Sorhus - sindresorhus.com
    # forked by Gianluca Guarini
    # phponly by Ivo Bathke ;)
    # modified for Friendica by Tobias Diekershoff
    changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
    check_run() {
 		    echo "$changed_files" | grep --quiet "$1" && eval "$2"
    }
    # `composer install` if the `composer.lock` file gets changed
    # to update all the php dependencies
    check_run composer.lock "util/composer.phar install --no-dev"
 just place it into `.git/hooks/post-merge` and make it executable.
 * [Class autoloading](help/autoloader)
 * [Using Composer](help/Composer)
 * [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)
 ### Coding standards
 For the sake of consistency between contribution and general code readability, Friendica follows the widespread [PSR-2 coding standards](http://www.php-fig.org/psr/psr-2/) to the exception of a few rules.
 Here's a few primers if you are new to Friendica or to the PSR-2 coding standards:
 * Indentation is tabs, period (not PSR-2).
 * By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds).
 * Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'`
 * Braces are mandatory in conditions
 * Boolean operators are `&&` and `||` for PHP conditions, `AND` and `OR` for SQL queries
 * No closing PHP tag
 * No trailing spaces
 * Array declarations use the new square brackets syntax
 Don't worry, you don't have to know by heart the PSR-2 coding standards to start contributing to Friendica.
 There are a few tools you can use to check or fix your files before you commit.
 For documentation we use the standard of *one sentence per line* for the `md` files in the `/doc` and `/doc/$lng` subdirectories.
 #### Check with [PHP Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer)
 This tool checks your files against a variety of coding standards, including PSR-2, and ouputs a report of all the standard violations.
 You can simply install it through PEAR: `pear install PHP_CodeSniffer`
 Once it is installed and available in your PATH, here's the command to run before committing your work:
 	$> phpcs --standard=ruleset.xml <file or directory>
 The output is a list of all the coding standards violations that you should fix before committing your work.
 Additionally, `phpcs` integrates with a few IDEs (Eclipse, Netbeans, PHPStorm...) so that you don't have to fiddle with the command line.
 #### Fix with PHP Code Beautifier and Fixer (phpbcf) included in PHP Code Sniffer
 If you're getting a massive list of standards violations when running `phpcs`, it can be annoying to fix all the violations by hand.
 Thankfully, PHP Code Sniffer is shipped with an automatic code fixer that can take care of the tedious task for you.
 Here's the command to automatically fix the files you created/modified:
 	$> phpcbf --standard=ruleset.xml <file or directory>
 If the command-line tools `diff` and `patch` are unavailabe for you, `phpcbf` can use slightly slower PHP equivalents by using the `--no-patch` argument.
 ### Code documentation
 If you are interested in having the documentation of the Friendica code outside of the code files, you can use [Doxygen](http://doxygen.org) to generate it.
 The configuration file for Doxygen is located in the `util` directory of the project sources.
 Run
 	$> doxygen util/Doxyfile
 to generate the files which will be located in the `doc/html` subdirectory in the Friendica directory.
 You can browse these files with any browser.
 If you find missing documentation, don't hesitate to contact us and write it down to enhance the code documentation.
 ### Issues
 Have a look at our [issue tracker](https://github.com/friendica/friendica) on github!
- * Try to reproduce a bug that needs more inquries and write down what you find out.
+* Try to reproduce a bug that needs more inquiries and write down what you find out.
- * If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed.
+* If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed.
- * Fix a bug if you can. Please make the pull request against the *develop* branch of the repository.
+* Fix a bug if you can. Please make the pull request against the *develop* branch of the repository.
- * There is a *Junior Job* label for issues we think might be a good point to start with.
+* There is a *[Junior Job](https://github.com/friendica/friendica/issues?q=is%3Aopen+is%3Aissue+label%3A"Junior+Jobs")* label for issues we think might be a good point to start with.
 	But you don't have to limit yourself to those issues.
-###Web interface
+### Web interface
 The thing many people want most is a better interface, preferably a responsive Friendica theme.
 This is a piece of work!
 If you want to get involved here:
 * Look at the first steps that were made (e.g. the clean theme).
-Ask us to find out whom to talk to about their experiences.
+	Ask us to find out whom to talk to about their experiences.
 * Talk to design people if you know any.
-* Let us know about your plans [in the dev forum](https://friendika.openmindspace.org/profile/friendicadevelopers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
+* Let us know about your plans [in the dev forum](https://forum.friendi.ca/profile/developers)
-Do not worry about cross-posting.
+	Do not worry about cross-posting.
-###Client software
+### Client software
 There are free software clients that do somehow work with Friendica but most of them need love and maintenance.
 Also, they were mostly made for other platforms using the GNU Social API.
 This means they lack the features that are really specific to Friendica.
 Popular clients you might want to have a look at are:
-* [Hotot (Linux)](http://hotot.org/) - abandoned
+As Friendica is using a [Twitter/GNU Social compatible API](help/api) any of the clients for those platforms should work with Friendica as well.
-* [Friendica for Android](https://github.com/max-weller/friendica-for-android) - abandoned
+Furthermore there are several client projects, especially for use with Friendica.
-* You can find more working client software in [Wikipedia](https://en.wikipedia.org/wiki/Friendica).
+If you are interested in improving those clients, please contact the developers of the clients directly.
 * Android / LinageOS: **Friendiqa** [src](https://github.com/LubuWest/Friendiqa) developed by [Marco R](https://freunde.ma-nic.de/profile/marco)
 * iOS: *currently no client*
 * SailfishOS: **Friendiy** [src](https://kirgroup.com/projects/fabrixxm/harbour-friendly) - developed by [Fabio](https://kirgroup.com/profile/fabrixxm/?tab=profile)
 * Windows: **Friendica Mobile** for Windows versions [before 8.1](http://windowsphone.com/s?appid=e3257730-c9cf-4935-9620-5261e3505c67) and [Windows 10](https://www.microsoft.com/store/apps/9nblggh0fhmn) - developed by [Gerhard Seeber](http://mozartweg.dyndns.org/friendica/profile/gerhard/?tab=profile)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@ -21,13 +21,12 @@ Admins
 * **[Where can I find the source code of friendica, addons and themes?](help/FAQ#sources)**
 * **[I've changed the my email address now the admin panel is gone?](help/FAQ#adminaccount1)**
 * **[Can there be more then just one admin for a node?](help/FAQ#adminaccount2)**
 * **[The Database structure seems not to be updated. What can I do?](help/FAQ#dbupdate)**
 User
 --------
 *****
 <a name="ssl"></a>
-
+### Why do I get warnings about SSL certificates?
 ###Why do I get warnings about SSL certificates?
 SSL (Secure Socket Layer) is a technology to encrypt data transfer between computers.
 Sometimes your browser warns you about a missing or invalid certificate.
@ -40,46 +39,44 @@ These warnings can have three reasons:
 We recommend to talk to the admin(s) of the affected friendica server. (Admins, please see the respective section of the [admin manual](help/SSL).)
 <a name="upload"></a>
 ### How can I upload images, files, links, videos and sound files to posts?
-###How can I upload images, files, links, videos and sound files to posts?
+You can upload images from your computer using the [editor](help/Text_editor).
 You can upload images from your computer by using the [editor](help/Text_editor).
 An overview of all uploaded images is listed at *yourpage.com/photos/profilename*.
-On that page, you can also upload images directly and choose, if your contacts shall receive a message about this upload.
+On that page, you can also upload images directly and choose if your contacts will receive a message about this upload.
-Generally, you could attach every kind of file to a post.
+Generally, you can attach any kind of file to a post.
 This is possible by using the "paper-clip"-symbol in the editor.
 These files will be linked to your post and can be downloaded by your contacts.
-But it's not possible to get a preview for these ones.
+But it's not possible to get a preview for these items.
-Because of this, this upload method is recommended for office or zipped files. 
+Because of this, this upload method is only recommended for office or zipped files. 
-If you want share content from Dropbox, Owncloud or any other [filehoster](http://en.wikipedia.org/wiki/Comparison_of_file_hosting_services), use the "link"-button (chain-symbol). 
+If you want to share content from Dropbox, Owncloud or any other [filehoster](http://en.wikipedia.org/wiki/Comparison_of_file_hosting_services), use the "link"-button (chain-symbol). 
 When you're adding URLs of other webpages with the "link"-button, Friendica tries to create a small preview.
 If this doesn't work, try to add the link by typing: [url=http://example.com]*self-chosen name*[/url].
 You can also add video and audio files to posts.
-But instead of a direct upload you have to use one of the following methods:
+However, instead of a direct upload you have to use one of the following methods:
-1. Add the video or audio link of a hoster (Youtube, Vimeo, Soundcloud and everyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start it. SoundCloud directly inserts a player to your post. 
+1. Add the video or audio link of a hoster (Youtube, Vimeo, Soundcloud and anyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start. SoundCloud directly inserts a player to your post. 
 2. If you have your own server, you can upload multimedia files via FTP and insert the URL. 
-Friendica is using HTML5 for embedding content.
+Friendica uses HTML5 for embedding content.
-Therefore, the supported files are depending on your browser and operating system.
+Therefore, the supported files are dependent on your browser and operating system.
 Some supported filetypes 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>
 ### Is it possible to have different avatars per profile?
-###Is it possible to have different avatars per profile?
+Yes.
-
+On your Edit/Manage Profiles page, you will find a "change profile photo" link.
 Yes. On your Edit/Manage Profiles page, you will find a "change profile photo" link.
 Clicking this will take you to a page where you can upload a photograph and select which profile it will be associated with.
 To avoid privacy leakage, we only display the photograph associated with your default profile as the avatar in your posts.
 <a name="contacts"></a>
-
+### What is the difference between blocked|ignored|archived|hidden contacts?
 ###What is the difference between blocked|ignored|archived|hidden contacts?
 We prevent direct communication with **blocked contacts**.
 They are not included in delivery, and their own posts to you are not imported.
@ -91,7 +88,7 @@ Blocked contacts cannot do this. They cannot communicate with you directly, only
 However we do not import their posts or private messages to you.
 Like blocking, you will still see this person's comments to posts made by your friends.
-A plugin called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including his/her conversations with your other friends.
+An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including his/her conversations with your other friends.
 An **archived contact** means that communication is not possible and will not be attempted.
 (Perhaps the person moved to a new site and removed the old profile.)
@ -101,8 +98,7 @@ A **hidden contact** will not be displayed in any "friend list" (except to you).
 However a hidden contact will appear normally in conversations and this may expose his/her hidden status to anybody who can see the conversation.
 <a name="removed"></a>
-
+### What happens when an account is removed? Is it truly deleted?
 ###What happens when an account is removed? Is it truly deleted?
 If you delete your account, we will immediately remove all your content on **your** server.
@ -114,85 +110,82 @@ We can block it in several ways so that it appears empty and all profile informa
 After that, your account is deleted.
 <a name="hashtag"></a>
 ### Can I follow a hashtag?
-###Can I follow a hashtag?
+Yes. Simply add the hash tag to your saved searches.
-
+The posts will appear on your network page.
-No. The act of 'following' a hashtags is an interesting technology, but presents a few issues.
+For technical reasons, your answers to such posts won't appear on the "personal" tab in the network page and the whole thread isn't accessible via the API.
 1. Posts would have to be copied to all sites on the network that are "listening" to that hashtag. This would increase the storage demands to the detriment of small sites. It would make the use of shared hosting practically impossible.
 2. Making spam easy (tag spam is a serious issue on Twitter for instance)
 3. It creates a natural bias towards large sites which hold more tagged content - if your network uses tagging instead of other conversation federation mechanisms such as groups/forums.
 Instead, we offer other mechanisms for wide-area conversations while retaining a 'level playing ground' for both large and small sites, such as forums and community pages and shared tags.
 <a name="rss"></a>
-
+### How to create a RSS feed of the stream?
 ###How to create a RSS feed of the stream?
 If you want to share your public page via rss you can use one of the following links:
-RSS feed of your posts
+#### RSS feed of your posts
-	basic-url.com/**dfrn_poll/profilename  
+	basic-url.com//feed/[nickname]/posts
-	Example: Friendica Support 
+Example: Friendica Support 
-	https://helpers.pyxis.uberspace.de/dfrn_poll/helpers
+	https://forum.friendi.ca/feed/helpers/posts
-RSS feed of the conversations at your site
+#### RSS feed of the conversations at your site
-	basic-url.com/dfrn_poll/profilename/converse
+	basic-url.com/feed/profilename/comments
-	Example: Friendica Support 
+Example: Friendica Support 
-	https://helpers.pyxis.uberspace.de/dfrn_poll/helpers/converse
+	https://forum.friendi.ca/feed/helpers/comments
 <a name="clients"></a>
-
+### Are there any clients for friendica I can use?
 ###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.
 Here is a list of known working clients:
 * Android
-  * Friendica Client for Android
+  * [Friendiqa](https://github.com/lubuwest/friendiqa) (available in Google Playstore or from a binary repository you can add to [F-Droid](https://freunde.ma-nic.de/display/3e98eba8185a13c5bdbf3d1539646854))
  * AndStatus
  * Twidere
  * Mustard and Mustard-Mod
 * SailfishOS
  * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
 * Linux
  * Hotot
  * Choqok
 * MacOS X
  * Hotot
 * Windows
  * [Friendica Mobile](https://www.microsoft.com/de-DE/store/p/friendica-mobile/9nblggh0fhmn?rtc=1) for Windows 10
  * Hotot
 Depending on the features of the client you might encounter some glitches in usability, like being limited in the length of your postings to 140 characters and having no access to the [permission settings](help/Groups-and-Privacy).
 <a name="help"></a>
-###Where I can find help?
+### Where I can find help?
-If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://helpers.pyxis.uberspace.de/profile/helpers).
+If you have problems with your Friendica page, you can ask the community at the [Friendica Support Group](https://forum.friendi.ca/profile/helpers).
-If you can't use your default profile you can either use a test account [test server](http://friendica.com/node/31) respectively an account at a public site [list](http://dir.friendica.com/siteinfo) or you can use the Librelist mailing list.
+If you can't use your default profile you can use an account at a public site [list](https://dir.friendica.social/servers).
 If you want to use the mailing list, please just send a mail to friendica AT librelist DOT com.
-If you are a theme developer, you will find help at this forum: [Friendica Theme Developers](https://friendica.eu/profile/ftdevs).
+In case you do not want to set up another account on Friendica, you can also use one of the following channels to reach out for help:
  * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
  * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe``
  * XMPP/Jabber MUC: support(at)forum.friendi.ca
  * IRC: #friendica at irc.freenode.net
  * Matrix: #friendi.ca or #friendica at matrix.org
 Admin
 --------
-*****
+
 <a name="multiple"></a>
 ### Can I configure multiple domains with the same code instance?
-###Can I configure multiple domains with the same code instance?
+No, this function is no longer supported as of Friendica 3.3 onwards.
 No, this function is not supported anymore starting from Friendica 3.3.
 <a name="sources"></a>
-
+### Where can I find the source code of friendica, addons and themes?
 ###Where can I find the source code of friendica, addons and themes?
 You can find the main respository [here](https://github.com/friendica/friendica).
 There you will always find the current stable version of friendica.
@ -202,12 +195,26 @@ Addons are listed at [this page](https://github.com/friendica/friendica-addons).
 If you are searching for new themes, you can find them at [Friendica-Themes.com](http://friendica-themes.com/) 
 <a name="adminaccount1"></a>
-###I've changed the my email address now the admin panel is gone?
+### I've changed my email address now the admin panel is gone?
 Have a look into your <tt>.htconfig.php</tt> and fix your email address there.
 <a name="adminaccount2"></a>
-###Can there be more then just one admin for a node?
+### Can there be more then one admin for a node?
-Yes. You just have to list more then one email address in the
+Yes.
-<tt>.htconfig.php</tt> file. The listed emails need to be separated by a comma.
+You just have to list more then one email address in the
 <tt>.htconfig.php</tt> file.
 The listed emails need to be separated by a comma.
 <a name="dbupdate">
 ### The Database structure seems not to be updated. What can I do?
 Please have a look at the Admin panel under [DB updates](/admin/dbsync/) and follow the link to *check database structure*.
 This will start a background process to check if the structure is up to the current definition.
 You can manually execute the structure update from the CLI in the base directory of your Friendica installation by running the following script:
    scripts/dbstructure.php update
 if there occur any errors, please contact the [support forum](https://forum.friendi.ca/profile/helpers).
--- a/doc/Forums.md
+++ b/doc/Forums.md
@ -22,7 +22,7 @@ This is the default selection.
 Community Forum/Celebrity Accounts provide the ability for people to become friends/fans of the forum without requiring approval.
 The exact setting you would use depends on how you wish to interact with people who join the page.
-The "Soapbox" setting let's the page owner control all communications.
+The "Soapbox" setting lets the page owner control all communications.
 Everything you post will go out to the forum members, but there will be no opportunity for interaction.
 This setting would typically be used for announcements or corporate communications.
@ -53,7 +53,15 @@ Posting to Community forums
 If you are a member of a community forum, you may post to the forum by including an @-tag in the post mentioning the forum.
 For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients.
 If you mention a forum (you are a member of) in a new posting, the posting will be distributed to all members of the forum, regardless of your privacy settings for the posting.
 Also, if the forum is a public forum, your posting will be public for the all internet users.
 If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members).
 Posting privately to a public forum, will result in your posting being displayed on the forum wall, but not on yours.
 Additionally it is possible to address a forum with the exclamation mark.
 In the example above this means that you can address the bicycle forum via !bicycle.
 The difference to the @ is that the post will only be sent to the addressed forum.
 This also means that you shouldn't address multiple forums in a single post in that way since it will only be distributed by one the forums.
 You may also post to a community forum by posting a "wall-to-wall" post using secure cross-site authentication.
--- a/doc/Github.md
+++ b/doc/Github.md
@ -1,25 +1,26 @@
-Friendica on Github
+Friendica on GitHub
 ===================
 * [Home](help)
 Here is how you can work on the code with us. If you have any questions please write to the Friendica developers' forum.
-Introduction to the workflow with our Github repository
+Introduction to the workflow with our GitHub repository
 -------------------------------------------------------
 1. Install git on the system you will be developing on.
-2. Create your own [github](https://github.com) account.
+2. Create your own [GitHub](https://github.com) account.
 3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git).
-4. Clone your fork from your Github account to your machine.
+4. Clone your fork from your GitHub account to your machine.
-Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on github
+Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on GitHub
-5. Commit your changes to your fork.
+5. Run `util/composer.phar install` in Friendica's folder.
-Then go to your github page and create a "Pull request" to notify us to merge your work.
+6. Commit your changes to your fork.
 Then go to your GitHub page and create a "Pull request" to notify us to merge your work.
 Our Git Branches
 ----------------
-There are two relevant branches in the main repo on Github:
+There are two relevant branches in the main repo on GitHub:
 1. master: This branch contains stable releases only.
 2. develop: This branch contains the latest code.
@ -66,5 +67,8 @@ Don't assume that a simple fix won't break anything else.
 If possible get an experienced Friendica developer to review the code.
 Don't hesitate to ask us in case of doubt.
 3. Check your code for typos.
 There is a PHP script in the *util* directory called *typos.php* for this.
 Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!
--- a/doc/Groups-and-Privacy.md
+++ b/doc/Groups-and-Privacy.md
@ -4,66 +4,109 @@ Groups and Privacy
 * [Home](help)
-Groups are merely collections of friends. But Friendica uses these to unlock some very powerful features.
+Groups are merely collections of friends.
 But Friendica uses these to unlock some very powerful features.
 **Setting Up Groups** 
-To create a group, visit your Friendica "Contacts" page and select "Create a new group". Give the group a name.
+To create a group, visit your Friendica "Contacts" page and select "Create a new group".
 Give the group a name.
 This brings you to a page where you can select the group members. 
-You will have two boxes on this page. The top box is the roster of current group members. Below that is another box containing all of your friends who are *not* members of the group. 
+You will have two boxes on this page.
 The top box is the roster of current group members.
 Below that is another box containing all of your friends who are *not* members of the group. 
-If you click on a photo of a person who isn't in the group, they will be put into the group. If you click on a photo of a person who is in the group, they will be removed from it. 
+If you click on a photo of a person who isn't in the group, they will be put into the group.
 If you click on a photo of a person who is in the group, they will be removed from it. 
 **Access Control**
-Once you have created a group, you may use it in any access control list. This is the little lock icon beneath the status update box on your home page. If you click this you can select who can see and who can *not* see the post you are about to make.  These can be individual people or groups. 
+Once you have created a group, you may use it in any access control list.
 This is the little lock icon beneath the status update box on your home page.
 If you click this you can select who can see and who can *not* see the post you are about to make..
 These can be individual people or groups. 
-On your "Network" page you will find posts and conversation from everybody in your network. You may select an individual group on this page to show conversations pertaining only to members of that group. 
+On your "Network" page you will find posts and conversation from everybody in your network.
 You may select an individual group on this page to show conversations pertaining only to members of that group. 
 But wait, there's more...
-If you look carefully when visiting a group from your Network page, the lock icon under the status update box has an exclamation mark next to it. This is meant to draw attention to that lock. Click the lock. You will see that since you are only viewing a certain group of people, your status updates while on that screen default to only being seen by that same group of people. This is how you keep your future employers from seeing what you write to your drinking buddies.  You can over-ride this setting, but this makes it easy to separate your conversations into different friend circles.
+If you look carefully when visiting a group from your Network page, the lock icon under the status update box has an exclamation mark next to it.
 This is meant to draw attention to that lock.
 Click the lock.
 You will see that since you are only viewing a certain group of people, your status updates while on that screen default to only being seen by that same group of people.
 This is how you keep your future employers from seeing what you write to your drinking buddies.
 You can over-ride this setting, but this makes it easy to separate your conversations into different friend circles.
 **Default Post Privacy**
-By default, Friendica assumes that you want all of your posts to be private. Therefore, when you sign up, Friendica creates a group for you that it will automatically add all of your contacts to. All of your posts are restricted to that group by default.
+By default, Friendica assumes that you want all of your posts to be private.
 Therefore, when you sign up, Friendica creates a group for you that it will automatically add all of your contacts to.
 All of your posts are restricted to that group by default.
-Note that this behavior can be overridden by your site admin, in which case your posts will be "public" (i.e. visible to the entire Internet) by default.
+Note that this behaviour can be overridden by your site admin, in which case your posts will be "public" (i.e. visible to the entire Internet) by default.
-If you want your posts to be "public" by default, you can change your default post permissions on your Settings page. You also have the option there to change which groups you post to by default, or to change which group your new contacts get placed into by default.
+If you want your posts to be "public" by default, you can change your default post permissions on your Settings page.
 You also have the option there to change which groups you post to by default, or to change which group your new contacts get placed into by default.
 **Privacy Concerns To Be Aware Of**
-These private conversations work best when your friends are Friendica members. We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. 
+These private conversations work best when your friends are Friendica members.
 We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. 
-This is a trust issue you need to be aware of. No software in the world can prevent your friends from leaking your confidential and trusted communications. Only a wise choice of friends.  
+This is a trust issue you need to be aware of.
 No software in the world can prevent your friends from leaking your confidential and trusted communications.
 Only a wise choice of friends.  
-But it isn't as clear cut when dealing with GNU Social and other network providers. You are encouraged to be **very** cautious when other network members are in a group because it's entirely possible for your private messages to end up in a public newsfeed. If you look at the Contact Edit page for any person, we will tell you whether or not they are members of an insecure network where you should exercise caution.
+But it isn't as clear cut when dealing with GNU Social and other network providers.
 If you look at the Contact Edit page for any person, we will tell you whether or not they are members of an insecure network where you should exercise caution.
-Once you have created a post, you can not change the permissions assigned. Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to. If you mistakenly created a message and wish you could take it back, the best you can do is to delete it. We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed it was initially propagated. In most cases it will be completely wiped from the Internet - in under a minute. Again, this applies to Friendica networks. Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. 
+Once you have created a post, you can not change the permissions assigned.
 Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to.
 If you mistakenly created a message and wish you could take it back, the best you can do is to delete it.
 We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed it was initially propagated.
 In most cases it will be completely wiped from the Internet - in under a minute.
 Again, this applies to Friendica networks.
 Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. 
-In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network. Many of the other social networks Friendica can connect to have no privacy controls.
+In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network.
 Many of the other social networks Friendica can connect to have no privacy controls.
 Profiles, Photos, and Privacy
 =============================
-The decentralised nature of Friendica (many websites exchanging information rather than one website which controls everything) has some implications with privacy as it relates to people on other sites. There are things you should be aware of, so you can decide best how to interact privately.
+The decentralised nature of Friendica (many websites exchanging information rather than one website which controls everything) has some implications with privacy as it relates to people on other sites.
 There are things you should be aware of, so you can decide best how to interact privately.
 **Photos**
-Sharing photos privately is a problem. We can only share them __privately__ with Friendica members. In order to share with other people, we need to prove who they are. We can prove the identity of Friendica members, as we have a mechanism to do so. Your friends on other networks will be blocked from viewing these private photos because we cannot prove that they should be allowed to see them.
+Sharing photos privately is a problem.
 We can only share them __privately__ with Friendica members.
 In order to share with other people, we need to prove who they are.
 We can prove the identity of Friendica members, as we have a mechanism to do so.
 Your friends on other networks will be blocked from viewing these private photos because we cannot prove that they should be allowed to see them.
-Our developers are working on solutions to allow access to your friends - no matter what network they are on. However we take privacy seriously and don't behave like some networks that __pretend__ your photos are private, but make them available to others without proof of identity.
+Our developers are working on solutions to allow access to your friends - no matter what network they are on.
 However we take privacy seriously and don't behave like some networks that __pretend__ your photos are private, but make them available to others without proof of identity.
 **Profiles**
-Your profile and "wall" may also be visited by your friends from other networks, and you can block access to these by web visitors that Friendica doesn't know. Be aware that this could include some of your friends on other networks.
+Your profile and "wall" may also be visited by your friends from other networks, and you can block access to these by web visitors that Friendica doesn't know.
 Be aware that this could include some of your friends on other networks.
-This may produce undesired results when posting a long status message to (for instance) Twitter or App.net. When Friendica sends a post to these networks which exceeds the service length limit, we truncate it and provide a link to the original. The original is a link back to your Friendica profile. As Friendica cannot prove who they are, it may not be possible for these people to view your post in full.
+This may produce undesired results when posting a long status message to (for instance) Twitter.
 When Friendica sends a post to these networks which exceeds the service length limit, we truncate it and provide a link to the original.
 The original is a link back to your Friendica profile.
 As Friendica cannot prove who they are, it may not be possible for these people to view your post in full.
 For people in this situation we would recommend providing a "Twitter-length" summary, with more detail for friends that can see the post in full. 
 You can do so by including the BBCode tag *abstract* in your posting.
-Blocking your profile or entire Friendica site from unknown web visitors also has serious implications for communicating with GNU Social members. These networks communicate with others via public protocols that are not authenticated. In order to view your posts, these networks have to access them as an "unknown web visitor". If we allowed this, it would mean anybody could in fact see your posts, and you've instructed Friendica not to allow this. So be aware that the act of blocking your profile to unknown visitors also has the effect of blocking outbound communication with public networks (such as GNU Social) and feed readers such as Google Reader.   
+Blocking your profile or entire Friendica site from unknown web visitors also has serious implications for communicating with GNU Social members.
 These networks communicate with others via public protocols that are not authenticated.
 In order to view your posts, these networks have to access them as an "unknown web visitor".
 If we allowed this, it would mean anybody could in fact see your posts, and you've instructed Friendica not to allow this.
 So be aware that the act of blocking your profile to unknown visitors also has the effect of blocking outbound communication with public networks (such as GNU Social) and feed readers such as Google Reader.
--- a/doc/Home.md
+++ b/doc/Home.md
@ -20,7 +20,6 @@ Friendica Documentation and Resources
 	* [Community Forums](help/Forums)
 	* [Chats](help/Chats)
 * Further information
 	* [Improve Performance](help/Improve-Performance)
 	* [Move your account](help/Move-Account)
 	* [Delete your account](help/Remove-Account)
 	* [Frequently asked questions (FAQ)](help/FAQ)
@ -28,30 +27,45 @@ Friendica Documentation and Resources
 **Admin Manual**
 * [Install](help/Install)
-* [Settings](help/Settings)
+* [Update](help/Update)
 * [Settings & Admin Panel](help/Settings)
 * [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
 * [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
 * [Message Flow](help/Message-Flow)
 * [Using SSL with Friendica](help/SSL)
 * [Twitter/GNU Social API Functions](help/api)
 * [Config values that can only be set in .htconfig.php](help/htconfig)
 * [Improve Performance](help/Improve-Performance)
 **Developer Manual**
-* [Where to get started?](help/Developers-Intro)
+* [Get started](help/Developers-Intro)
-* [Help on Github](help/Github)
+* Set up development environment
-* [Help on Vagrant](help/Vagrant)
+	* [Help on Github](help/Github)
-* [How to translate Friendica](help/translations)
+	* [Help on Vagrant](help/Vagrant)
-* [Bugs and Issues](help/Bugs-and-Issues)
+	* [Bugs and Issues](help/Bugs-and-Issues)
-* [Plugin Development](help/Plugins)
+* Code structure
-* [Theme Development](help/themes)
+	* [Addon Development](help/Addons)
-* [Smarty 3 Templates](help/smarty3-templates)
+	* [Theme Development](help/themes)
-* [Code - Reference(Doxygen generated - sets cookies)](doc/html/)
+	* [Smarty 3 Templates](help/smarty3-templates)
 * How To
 	* [Translate Friendica](help/translations)
 	* [Use Composer](help/Composer)
 	* [Move classes to `src`](help/Developer-How-To-Move-Classes-to-src)
 * Reference
 	* [Twitter/GNU Social API Functions](help/api)
 	* [Code (Doxygen generated - sets cookies)](doc/html/)
 	* [Protocol Documentation](help/Protocol)
 	* [Database schema documantation](help/database)
 	* [Class Autoloading](help/autoloader)
 **External Resources**
-* [Main Website](http://friendica.com)
+* [Main Website](https://friendi.ca)
-* [Mailing List Archive](http://librelist.com/browser/friendica/)
+* Ways to get Support
  * [Friendica Support Forum](https://forum.friendi.ca/~helpers)
  * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe``
  * XMPP/Jabber MUC: support(at)forum.friendi.ca
  * IRC: #friendica at irc.freenode.net
  * Matrix: #friendi.ca or #friendica at matrix.org
 **About**
--- a/doc/Improve-Performance.md
+++ b/doc/Improve-Performance.md
@ -3,7 +3,7 @@ How to improve the performance of a Friendica site
 * [Home](help)
-Feel free to ask in the [Friendica support forum](https://helpers.pyxis.uberspace.de/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
+Feel free to ask in the [Friendica support forum](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
 System configuration
 --------
@ -22,16 +22,16 @@ If you have many OStatus contacts then completing of conversations can take some
 When using MyISAM (default) or InnoDB on MariaDB 10 this speeds up search.
-Plugins
+Addons
 --------
-Active the following plugins:
+Active the following addons:
    rendertime
 ###rendertime
-This plugin doesn't speed up your system. 
+This addon doesn't speed up your system. 
 It helps to analyze your bottlenecks.
 When enabled you see some values at the bottom of every page.
--- a/doc/Install.md
+++ b/doc/Install.md
@ -10,7 +10,7 @@ Not every PHP/MySQL hosting provider will be able to support Friendica.
 Many will.
 But **please** review the requirements and confirm these with your hosting provider prior to installation.
-Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://friendika.openmindspace.org/profile/friendicadevelopers) forum or [file an issue](https://github.com/friendica/friendica/issues).
+Also if you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
 Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
 Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
 If you do not have a Friendica account yet, you can register a temporary one at [tryfriendica.de](https://tryfriendica.de) and join the forums mentioned above from there.
@ -26,12 +26,12 @@ Requirements
 ---
 * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
-* PHP  5.2+. The later the better. You'll need 5.3 for encryption of key exchange conversations. On a Windows environment, 5.2+ might not work as the function dns_get_record() is only available with version 5.3.
+* PHP 5.6+ (PHP 7 is recommended for performance)
 * 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, 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
-* mcrypt (optional; used for server-to-server message encryption)
+* Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 * Mysql 5.x or an equivalant alternative for MySQL (MariaDB 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.
@ -39,14 +39,16 @@ Requirements
 Installation procedure
 ---
-###Get Friendica
+### Get Friendica
 Unpack the Friendica files into the root of your web server document area.
 If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file.
 This makes the software much easier to update.
-The Linux command to clone the repository into a directory "mywebsite" would be
+The Linux commands to clone the repository into a directory "mywebsite" would be
    git clone https://github.com/friendica/friendica.git mywebsite
    cd mywebsite
    util/composer.phar install
 Make sure the folder *view/smarty3* exists and is writable by the webserver user
@ -63,17 +65,28 @@ 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.
-###Create a database
+### Create a database
 Create an empty database and note the access details (hostname, username, password, database name).
 Friendica needs the permission to create and delete fields and tables in its own database.
-###Run the installer
+With newer releases of MySQL (5.7.17 or newer), you might need to set the sql_mode to '' (blank).
 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 = ''
 Restart mysql and you should be fine.
 ### Run the installer
 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
@ -84,53 +97,33 @@ 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 .htconfig.php to another name and empty (called 'dropping') the database tables, so that you can start fresh.
-###Set up the poller
+### Set up the worker
-Set up a cron job or scheduled task to run the poller once every 5-10 minutes in order to perform background processing.
+Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing.
 Example:
-    cd /base/directory; /path/to/php include/poller.php
+    cd /base/directory; /path/to/php scripts/worker.php
 Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
-    */10 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php
+    */10 * * * * cd /home/myname/mywebsite; /usr/bin/php scripts/worker.php
 You can generally find the location of PHP by executing "which php".
 If you run into trouble with this section please contact your hosting provider for assistance.
 Friendica will not work correctly if you cannot perform this step.
-Alternative: You may be able to use the 'poormancron' plugin to perform this step.
+If it is not possible to set up a cron job then please activate the "frontend worker" in the administration interface.
 To do this, edit the file ".htconfig.php" and look for a line describing your plugins.
 On a fresh installation, it will look like this:
    $a->config['system']['addon'] = 'js_upload';
 It indicates the "js_upload" addon module is enabled.
 You may add additional addons/plugins using this same line in the configuration file.
 Change it to read
    $a->config['system']['addon'] = 'js_upload,poormancron';
 and save your changes.
 Once you have installed Friendica and created an admin account as part of the process, you can access the admin panel of your installation and do most of the server wide configuration from there
-Updating your installation with git
+### Set up a backup plan
 ---
-You can get the latest changes at any time with
+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.
-    cd mywebsite
+The most important file is the `.htconfig.php` file in the base directory.
-    git pull
+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.
 The default branch to use it the ``master`` branch, which is the stable version of Friendica.
 If you want to use and test bleeding edge code please checkout the ``develop`` branch.
 The new features and fixes will be merged from ``develop`` into ``master`` when they are stable approx four times a year.
 The addon tree has to be updated separately like so:
    cd mywebsite/addon
    git pull
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@ -4,28 +4,28 @@ Installing Connectors (Twitter/GNU Social)
 * [Home](help)
-Friendica uses plugins to provide connectivity to some networks, such as Twitter or App.net. 
+Friendica uses addons to provide connectivity to some networks, such as Twitter or App.net. 
-There is also a plugin to post through to an existing account on a GNU Social service.
+There is also a addon to post through to an existing account on a GNU Social service.
 You only need this to post to an already existing GNU Social account, but not to communicate with GNU Social members in general.
-All three plugins require an account on the target network.
+All three addons require an account on the target network.
 In addition you (or typically the server administrator) will need to obtain an API key to provide authenticated access to your Friendica server.
 Site Configuration
 ---
-Plugins must be installed by the site administrator before they can be used.
+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 plugins allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (.htconfig.php).
+Some addons allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (.htconfig.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.
-The details of configuring each service follow (much of this information comes directly from the plugin source files):
+The details of configuring each service follow (much of this information comes directly from the addon source files):
-Twitter Plugin for Friendica
+Twitter Addon for Friendica
 ---
 * Author: Tobias Diekershoff
@ -33,7 +33,7 @@ Twitter Plugin for Friendica
 * License: 3-clause BSD license
 ###Configuration
-To use this plugin you need a OAuth Consumer key pair (key & secret).
+To use this addon you need a OAuth Consumer key pair (key & secret).
 You can get it from [Twitter](https://twitter.com/apps).
 Register your Friendica site as "Client" application with "Read & Write" access.
@ -51,7 +51,7 @@ After this, your users can configure their Twitter account settings from "Settin
 Find the author's documentation here: [http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin](http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin)
-GNU Social Plugin for Friendica
+GNU Social Addon for Friendica
 ---
 * Author: Tobias Diekershoff
@ -60,7 +60,7 @@ GNU Social Plugin for Friendica
 ###Configuration
-When the addon is activated the user has to aquire the following in order to connect to the GNU Social account of choice.
+When the addon is activated the user has to acquire the following in order to connect to the GNU Social account of choice.
 * The base URL for the GNU Social API, for quitter.se this is https://quitter.se/api/
 * OAuth Consumer key & secret
@ -86,7 +86,3 @@ Follow the Sign in with GNU Social button, allow access and then copy the securi
 Friendica will then try to acquire the final OAuth credentials from the API. 
 If successful, the addon settings will allow you to select to post your public messages to your GNU Social account (have a look behind the little lock symbol beneath the status "editor" on your Home or Network pages).
 ###More documentation
 Find the author's documentation here: [http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/StatusNet_Plugin](http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/StatusNet_Plugin)
--- a/doc/KeyboardShortcuts.md
+++ b/doc/KeyboardShortcuts.md
@ -0,0 +1,10 @@
 Keyboard shortcuts in Friendica
 =======================
 * [Home](help)
 General
 -------
 * j: Scroll to next thread
 * k: Scroll to previous thread
--- a/doc/Making-Friends.md
+++ b/doc/Making-Friends.md
@ -9,7 +9,7 @@ How do you do it?
 The Directories
 ---
-Friendica has two different kinds of "addressbook":
+Friendica has two different kinds of "address book":
 The directory of the Friendica server you are registered on and the global directory that collects account information across all Friendica instances.
 The first thing you can do is look at the **Directory**.
--- a/doc/Message-Flow.md
+++ b/doc/Message-Flow.md
@ -4,7 +4,7 @@ Friendica Message Flow
 This page documents some of the details of how messages get from one person to another in the Friendica network.
 There are multiple paths, using multiple protocols and message formats.
-Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](http://dfrn.org/dfrn.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
+Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
 Most message passing involves the file include/items.php, which has functions for several feed-related import/export activities. 
@ -19,42 +19,42 @@ Salmon notifications arrive via mod/salmon.php.
 Push (pubsubhubbub) feeds arrive via mod/pubsub.php
-DFRN-poll feed imports arrive via include/poller.php as a scheduled task, this implements the local side of the DFRN-poll protocol.  
+DFRN-poll feed imports arrive via src/Worker/OnePoll.php as a scheduled task, this implements the local side of the DFRN-poll protocol.
 ### Scenario #1. Bob posts a public status message
 Scenario #1. Bob posts a public status message
 ---
 This is a public message with no conversation members so no private transport is used.
 There are two paths it can take - as a bbcode path to DFRN clients, and converted to HTML with the server's PuSH (pubsubhubbub) hubs notified.
 When a PuSH hub is operational, dfrn-poll clients prefer to receive their information through the PuSH channel.
 They will fall back on a daily poll in case the hub has delivery issues (this is quite common when using the default Google reference hub).
 If there is no specified hub or hubs, DFRN clients will poll at a configurable (per-contact) rate at up to 5-minute intervals.
-Feeds retrieved via dfrn-poll are bbcode and may also contain private conversations which the poller has permissions to see. 
+Feeds retrieved via dfrn-poll are bbcode and may also contain private conversations which the worker has permissions to see.
 ### Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
 Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
 ---
 Jack uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation using dfrn-notify.
 PuSH hubs are notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks). 
-Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
+### Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
---
+
 Mary uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation (excluding himself, the conversation is now sent to both Jack and Mary).
 Messages are sent using dfrn-notify.
 Push hubs are also notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
-Scenario #4. William replies to Bob's public message. William is on the OStatus network.
+### Scenario #4. William replies to Bob's public message. William is on the OStatus network.
---
+
 William uses salmon to notify Bob of the reply.
 Content is html embedded in salmon magic envelope.
 Bob then creates a feed of the conversation and sends it to all Friendica participants involved in the conversation using dfrn-notify (excluding himself, the conversation is sent to both Jack and Mary).
 Push hubs are notified that new content is available.
 The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
-Scenario #5. Bob posts a private message to Mary and Jack.
+### Scenario #5. Bob posts a private message to Mary and Jack.
---
+
 Message is delivered immediately to Mary and Jack using dfrn_notify.
 Public hubs are not notified.
 Requeueing is attempted in case of timeout.
--- a/doc/Move-Account.md
+++ b/doc/Move-Account.md
@ -21,7 +21,11 @@ Friendica will recreate your account on the new server, with your contacts and g
 A message is sent to Friendica contacts, to inform them about your move:
 If your contacts are runnning on an updated server, your details on their side will be automatically updated.
-GNU Social/Diaspora contacts
+GNU Social contacts
 ---
-Contacts on GNU Social or Diaspora will be archived, as we can't inform them about your move.
+Contacts on GNU Social will be archived, as we can't inform them about your move.
 You should ask them to remove your contact from their lists and re-add you, and you should do the same with their contact.
 Diaspora contacts
 ---
 Newer Diaspora servers are able to process "account migration" messages.
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@ -1,466 +0,0 @@
 Friendica Addon/Plugin development
 ==========================
 Please see the sample addon 'randplace' for a working example of using some of these features.
 Addons work by intercepting event hooks - which must be registered.
 Modules work by intercepting specific page requests (by URL path).
 Plugin names cannot contain spaces or other punctuation and are used as filenames and function names.
 You may supply a "friendly" name within the comment block.
 Each addon must contain both an install and an uninstall function based on the addon/plugin name.
 For instance "plugin1name_install()".
 These two functions take no arguments and are usually responsible for registering (and unregistering) event hooks that your plugin will require.
 The install and uninstall functions will also be called (i.e. re-installed) if the plugin changes after installation.
 Therefore your uninstall should not destroy data and install should consider that data may already exist.
 Future extensions may provide for "setup" amd "remove".
 Plugins should contain a comment block with the four following parameters:
 	/*
 	* Name: My Great Plugin
 	* Description: This is what my plugin does. It's really cool
 	* Version: 1.0
 	* Author: John Q. Public <john@myfriendicasite.com>
 	*/
 Register your plugin hooks during installation.
    register_hook($hookname, $file, $function);
 $hookname is a string and corresponds to a known Friendica hook.
 $file is a pathname relative to the top-level Friendica directory.
 This *should* be 'addon/plugin_name/plugin_name.php' in most cases.
 $function is a string and is the name of the function which will be executed when the hook is called.
 Arguments
 ---
 Your hook callback functions will be called with at least one and possibly two arguments
    function myhook_function(&$a, &$b) {
    }
 If you wish to make changes to the calling data, you must declare them as reference variables (with '&') during function declaration.
 ###$a
 $a is the Friendica 'App' class.
 It contains a wealth of information about the current state of Friendica:
 * which module has been called,
 * configuration information,
 * the page contents at the point the hook was invoked,
 * profile and user information, etc.
 It is recommeded you call this '$a' to match its usage elsewhere.
 ###$b
 $b can be called anything you like.
 This is information specific to the hook currently being processed, and generally contains information that is being immediately processed or acted on that you can use, display, or alter.
 Remember to declare it with '&' if you wish to alter it.
 Modules
 --------
 Plugins/addons may also act as "modules" and intercept all page requests for a given URL path.
 In order for a plugin to act as a module it needs to define a function "plugin_name_module()" which takes no arguments and needs not do anything.
 If this function exists, you will now receive all page requests for "http://my.web.site/plugin_name" - with any number of URL components as additional arguments.
 These are parsed into an array $a->argv, with a corresponding $a->argc indicating the number of URL components.
 So http://my.web.site/plugin/arg1/arg2 would look for a module named "plugin" and pass its module functions the $a App structure (which is available to many components).
 This will include:
     $a->argc = 3
     $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
 Your module functions will often contain the function plugin_name_content(&$a), which defines and returns the page body content.
 They may also contain plugin_name_post(&$a) which is called before the _content function and typically handles the results of POST forms.
 You may also have plugin_name_init(&$a) which is called very early on and often does module initialisation.
 Templates
 ----------
 If your plugin needs some template, you can use the Friendica template system.
 Friendica uses [smarty3](http://www.smarty.net/) as a template engine.
 Put your tpl files in the *templates/* subfolder of your plugin.
 In your code, like in the function plugin_name_content(), load the template file and execute it passing needed values:
    # load template file. first argument is the template name,
    # second is the plugin path relative to friendica top folder
    $tpl = get_markup_template('mytemplate.tpl', 'addon/plugin_name/');
    # apply template. first argument is the loaded template,
    # second an array of 'name'=>'values' to pass to template
    $output = replace_macros($tpl,array(
        'title' => 'My beautiful plugin',
    ));
 See also the wiki page [Quick Template Guide](https://github.com/friendica/friendica/wiki/Quick-Template-Guide).
 Current hooks
 -------------
 ###'authenticate'
 'authenticate' is called when a user attempts to login.
 $b is an array containing:
 	'username' => the supplied username
 	'password' => the supplied password
    'authenticated' => set this to non-zero to authenticate the user.
    'user_record' => successful authentication must also return a valid user record from the database
 ###'logged_in'
 'logged_in' is called after a user has successfully logged in.
 $b contains the $a->user array.
 ###'display_item'
 'display_item' is called when formatting a post for display.
 $b is an array:
 	'item' => The item (array) details pulled from the database
 	'output' => the (string) HTML representation of this item prior to adding it to the page
 ###'post_local'
 * called when a status post or comment is entered on the local system
 * $b is the item array of the information to be stored in the database
 * Please note: body contents are bbcode - not HTML
 ###'post_local_end'
 * called when a local status post or comment has been stored on the local system
 * $b is the item array of the information which has just been stored in the database
 * Please note: body contents are bbcode - not HTML
 ###'post_remote'
 * called when receiving a post from another source. This may also be used to post local activity or system generated messages.
 * $b is the item array of information to be stored in the database and the item body is bbcode.
 ###'settings_form'
 * called when generating the HTML for the user Settings page
 * $b is the (string) HTML of the settings page before the final '</form>' tag.
 ###'settings_post'
 * called when the Settings pages are submitted
 * $b is the $_POST array
 ###'plugin_settings'
 * called when generating the HTML for the addon settings page
 * $b is the (string) HTML of the addon settings page before the final '</form>' tag.
 ###'plugin_settings_post'
 * called when the Addon Settings pages are submitted
 * $b is the $_POST array
 ###'profile_post'
 * called when posting a profile page
 * $b is the $_POST array
 ###'profile_edit'
 'profile_edit' is called prior to output of profile edit page.
 $b is an array containing:
 	'profile' => profile (array) record from the database
 	'entry' => the (string) HTML of the generated entry
 ###'profile_advanced'
 * called when the HTML is generated for the 'Advanced profile', corresponding to the 'Profile' tab within a person's profile page
 * $b is the (string) HTML representation of the generated profile
 * The profile array details are in $a->profile.
 ###'directory_item'
 'directory_item' is called from the Directory page when formatting an item for display.
 $b is an array:
 	'contact' => contact (array) record for the person from the database
    'entry' => the (string) HTML of the generated entry
 ###'profile_sidebar_enter'
 * called prior to generating the sidebar "short" profile for a page
 * $b is the person's profile array
 ###'profile_sidebar'
 'profile_sidebar is called when generating the sidebar "short" profile for a page.
 $b is an array:
 	'profile' => profile (array) record for the person from the database
 	'entry' => the (string) HTML of the generated entry
 ###'contact_block_end'
 is called when formatting the block of contacts/friends on a profile sidebar has completed.
 $b is an array:
 	'contacts' => array of contacts
 	'output' => the (string) generated HTML of the contact block
 ###'bbcode'
 * called during conversion of bbcode to html
 * $b is a string converted text
 ###'html2bbcode'
 * called during conversion of html to bbcode (e.g. remote message posting)
 * $b is a string converted text
 ###'page_header'
 * called after building the page navigation section
 * $b is a string HTML of nav region
 ###'personal_xrd'
 'personal_xrd' is called prior to output of personal XRD file.
 $b is an array:
 	'user' => the user record for the person
 	'xml' => the complete XML to be output
 ###'home_content'
 * called prior to output home page content, shown to unlogged users
 * $b is (string) HTML of section region
 ###'contact_edit'
 is called when editing contact details on an individual from the Contacts page.
 $b is an array:
 	'contact' => contact record (array) of target contact
 	'output' => the (string) generated HTML of the contact edit page
 ###'contact_edit_post'
 * called when posting the contact edit page.
 * $b is the $_POST array
 ###'init_1'
 * called just after DB has been opened and before session start
 * $b is not used or passed
 ###'page_end'
 * called after HTML content functions have completed
 * $b is (string) HTML of content div
 ###'avatar_lookup'
 'avatar_lookup' is called when looking up the avatar.
 $b is an array:
 	'size' => the size of the avatar that will be looked up
 	'email' => email to look up the avatar for
 	'url' => the (string) generated URL of the avatar
 ###'emailer_send_prepare'
 'emailer_send_prepare' called from Emailer::send() before building the mime message.
 $b is an array, params to Emailer::send()
 	'fromName' => name of the sender
    'fromEmail' => email fo the sender
    'replyTo' => replyTo address to direct responses
    'toEmail' => destination email address
    'messageSubject' => subject of the message
    'htmlVersion' => html version of the message
    'textVersion' => text only version of the message
    'additionalMailHeader' => additions to the smtp mail header
 ###'emailer_send'
 is called before calling PHP's mail().
 $b is an array, params to mail()
 	'to'
 	'subject'
    'body'
    'headers'
 ###'nav_info'
 is called after the navigational menu is build in include/nav.php.
 $b is an array containing $nav from nav.php.
 ###'template_vars'
 is called before vars are passed to the template engine to render the page.
 The registered function can add,change or remove variables passed to template.
 $b is an array with:
    'template' => filename of template
    'vars' => array of vars passed to template
 Complete list of hook callbacks
 ---
 Here is a complete list of all hook callbacks with file locations (as of 14-Feb-2012). Please see the source for details of any hooks not documented above.
 boot.php:	call_hooks('login_hook',$o);
 boot.php:	call_hooks('profile_sidebar_enter', $profile);
 boot.php:	call_hooks('profile_sidebar', $arr);
 boot.php:	call_hooks("proc_run", $arr);
 include/contact_selectors.php:	call_hooks('network_to_name', $nets);
 include/api.php:				call_hooks('logged_in', $a->user);
 include/api.php:		call_hooks('logged_in', $a->user);
 include/queue.php:		call_hooks('queue_predeliver', $a, $r);
 include/queue.php:				call_hooks('queue_deliver', $a, $params);
 include/text.php:	call_hooks('contact_block_end', $arr);
 include/text.php:	call_hooks('smilie', $s);
 include/text.php:	call_hooks('prepare_body_init', $item);
 include/text.php:	call_hooks('prepare_body', $prep_arr);
 include/text.php:	call_hooks('prepare_body_final', $prep_arr);
 include/nav.php:	call_hooks('page_header', $a->page['nav']);
 include/auth.php:		call_hooks('authenticate', $addon_auth);
 include/bbcode.php:	call_hooks('bbcode',$Text);
 include/oauth.php:		call_hooks('logged_in', $a->user);
 include/acl_selectors.php:	call_hooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	call_hooks($a->module . '_post_' . $selname, $o);
 include/acl_selectors.php:	call_hooks('contact_select_options', $x);
 include/acl_selectors.php:	call_hooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	call_hooks($a->module . '_post_' . $selname, $o);
 include/acl_selectors.php:	call_hooks($a->module . '_pre_' . $selname, $arr);
 include/acl_selectors.php:	call_hooks($a->module . '_post_' . $selname, $o);
 include/notifier.php:		call_hooks('notifier_normal',$target_item);
 include/notifier.php:	call_hooks('notifier_end',$target_item);
 include/items.php:	call_hooks('atom_feed', $atom);
 include/items.php:		call_hooks('atom_feed_end', $atom);
 include/items.php:	call_hooks('atom_feed_end', $atom);
 include/items.php:	call_hooks('parse_atom', $arr);
 include/items.php:	call_hooks('post_remote',$arr);
 include/items.php:	call_hooks('atom_author', $o);
 include/items.php:	call_hooks('atom_entry', $o);
 include/bb2diaspora.php:	call_hooks('bb2diaspora',$Text);
 include/cronhooks.php:	call_hooks('cron', $d);
 include/security.php:		call_hooks('logged_in', $a->user);
 include/html2bbcode.php:	call_hooks('html2bbcode', $text);
 include/Contact.php:	call_hooks('remove_user',$r[0]);
 include/Contact.php:	call_hooks('contact_photo_menu', $args);
 include/conversation.php:	call_hooks('conversation_start',$cb);
 include/conversation.php:				call_hooks('render_location',$locate);
 include/conversation.php:				call_hooks('display_item', $arr);
 include/conversation.php:				call_hooks('render_location',$locate);
 include/conversation.php:				call_hooks('display_item', $arr);
 include/conversation.php:	call_hooks('item_photo_menu', $args);
 include/conversation.php:	call_hooks('jot_tool', $jotplugins);
 include/conversation.php:	call_hooks('jot_networks', $jotnets);
 include/plugin.php:if(! function_exists('call_hooks')) {
 include/plugin.php:function call_hooks($name, &$data = null) {
 index.php:	call_hooks('init_1');
 index.php:call_hooks('app_menu', $arr);
 index.php:call_hooks('page_end', $a->page['content']);
 mod/photos.php:	call_hooks('photo_post_init', $_POST);
 mod/photos.php:	call_hooks('photo_post_file',$ret);
 mod/photos.php:		call_hooks('photo_post_end',$foo);
 mod/photos.php:		call_hooks('photo_post_end',$foo);
 mod/photos.php:		call_hooks('photo_post_end',$foo);
 mod/photos.php:	call_hooks('photo_post_end',intval($item_id));
 mod/photos.php:		call_hooks('photo_upload_form',$ret);
 mod/friendica.php:	call_hooks('about_hook', $o);
 mod/editpost.php:	call_hooks('jot_tool', $jotplugins);
 mod/editpost.php:	call_hooks('jot_networks', $jotnets);
 mod/parse_url.php:	call_hooks('parse_link', $arr);
 mod/home.php:	call_hooks('home_init',$ret);
 mod/home.php:	call_hooks("home_content",$o);
 mod/contacts.php:	call_hooks('contact_edit_post', $_POST);
 mod/contacts.php:		call_hooks('contact_edit', $arr);
 mod/settings.php:		call_hooks('plugin_settings_post', $_POST);
 mod/settings.php:		call_hooks('connector_settings_post', $_POST);
 mod/settings.php:	call_hooks('settings_post', $_POST);
 mod/settings.php:		call_hooks('plugin_settings', $settings_addons);
 mod/settings.php:		call_hooks('connector_settings', $settings_connectors);
 mod/settings.php:	call_hooks('settings_form',$o);
 mod/register.php:	call_hooks('register_account', $newuid);
 mod/like.php:	call_hooks('post_local_end', $arr);
 mod/xrd.php:	call_hooks('personal_xrd', $arr);
 mod/item.php:	call_hooks('post_local_start', $_REQUEST);
 mod/item.php:	call_hooks('post_local',$datarray);
 mod/item.php:	call_hooks('post_local_end', $datarray);
 mod/profile.php:			call_hooks('profile_advanced',$o);
 mod/profiles.php:	call_hooks('profile_post', $_POST);
 mod/profiles.php:		call_hooks('profile_edit', $arr);
 mod/tagger.php:	call_hooks('post_local_end', $arr);
 mod/cb.php:	call_hooks('cb_init');
 mod/cb.php:	call_hooks('cb_post', $_POST);
 mod/cb.php:	call_hooks('cb_afterpost');
 mod/cb.php:	call_hooks('cb_content', $o);
 mod/directory.php:			call_hooks('directory_item', $arr);
--- a/doc/Protocol.md
+++ b/doc/Protocol.md
@ -0,0 +1,42 @@
 Used Protocols
 ===============
 * [Home](help)
 Friendicas DFRN Protocol
 ---
 * [Document with the DFRN specification](spec/dfrn2.pdf)
 * [Schema of the contact request process](spec/dfrn2_contact_request.png)
 * [Schema of the contact request confirmation](spec/dfrn2_contact_confirmation.png)
 * [Description of the message flow](help/Message-Flow)
 ActivityStreams
 ---
 Friendica is using ActivityStreams in version 1.0 for its activities and object types.
 Additional types are used for non standard activities.
 * [Link to the specification](http://activitystrea.ms/head/activity-schema.html)
 * [List of used ActivityStreams verbs and object types.](https://github.com/friendica/friendica/wiki/ActivityStreams)
 Salmon
 ---
 Salmon is used as a message exchange protocol for replies and mentions.
 * [Link to the protocol summary](http://www.salmon-protocol.org/salmon-protocol-summary)
 Portable Contacts
 ---
 Portable Contacts is used for friends lists.
 * [Link to the specification](https://web.archive.org/web/20160426223008/http://portablecontacts.net/draft-spec.html) (Link to archive.org)
 pubsubhubbub
 ---
 pubsubhubbub is used for OStatus.
 * [Link to the specification](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html)
--- a/doc/Quick-Start-andfinally.md
+++ b/doc/Quick-Start-andfinally.md
@ -5,16 +5,7 @@ Here are some more things to help get you started:
 **Groups**
- <a href="https://kakste.com/profile/newhere">New Here</a> - a group for people new to Friendica
+- <a href="http://forum.friendi.ca/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
 - <a href="http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
 - <a href="https://kakste.com/profile/public_stream">Public Stream</a> - a place to talk about anything to anyone.
 - <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests.
 - <a href="http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a>
 **Documentation**
--- a/doc/Quick-Start-groupsandpages.md
+++ b/doc/Quick-Start-groupsandpages.md
@ -1,8 +1,17 @@
-This is the global directory.  If you get lost, you can <a href = "help/Quick-Start-groupsandpages">click this link</a> to bring yourself back here.
+This is the global directory.
 If you get lost, you can <a href = "help/Quick-Start-groupsandpages">click this link</a> to bring yourself back here.
-On this page, you'll find a collection of groups, forums and celebrity pages.  Groups are not real people.  Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum.  You don't have to feel awkward about introducing yourself to a new person, because they're not people!
+On this page, you'll find a collection of groups, forums and celebrity pages.
 Groups are not real people.
 Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum.
 You don't have to feel awkward about introducing yourself to a new person, because they're not people!
-When you connect to a group, all messages to that group will start appearing in your network tab.  You can comment on these posts, or post to the group yourself without ever having to add any of the groups members.  This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers.  Simply find a group you're interested in, and connect to it the same way you did with people in the last section.  There are a lot of groups, and you're likely to get lost.  Remember the link at the top of this page will bring you back here.
+When you connect to a group, all messages to that group will start appearing in your network tab.
 You can comment on these posts, or post to the group yourself without ever having to add any of the groups members.
 This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers.
 Simply find a group you're interested in, and connect to it the same way you did with people in the last section.
 There are a lot of groups, and you're likely to get lost.
 Remember the link at the top of this page will bring you back here.
 Once you've added some groups, <a href="help/Quick-Start-andfinally">move on to the next section</a>.
--- a/doc/Quick-Start-guide.md
+++ b/doc/Quick-Start-guide.md
@ -1,10 +1,20 @@
-First things first, let's make sure you're logged in to your account.  If you're not already logged in, do so in the frame below.
+First things first, let's make sure you're logged in to your account.
 If you're not already logged in, do so in the frame below.
 Once you've logged in (or if you are already logged in), you'll now be looking at your profile page.
-This is a bit like your Facebook wall.  It's where all your status messgages are kept, and where your friends come to post on your wall.  To write your status, simply click in the box that says "share".  When you do this, the box will expand.  You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures.  At the bottom you'll find some more links.  You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web.  You can also set your post location here.
+This is a bit like your Facebook wall.
 It's where all your status messgages are kept, and where your friends come to post on your wall.
 To write your status, simply click in the box that says "share".
 When you do this, the box will expand.
 You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures.
 At the bottom you'll find some more links.
 You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web.
 You can also set your post location here.
-Once you've finished writing your post, click on the padlock icon to select who can see it.  If you do not use the padlock icon, your post will be public.  This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.
+Once you've finished writing your post, click on the padlock icon to select who can see it.
 If you do not use the padlock icon, your post will be public.
 This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.
 Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href="help/Quick-Start-network">Network Tab</a>
--- a/doc/Quick-Start-makingnewfriends.md
+++ b/doc/Quick-Start-makingnewfriends.md
@ -1,10 +1,20 @@
-This is your Suggested Friends page.  If you get lost, you can <a href="help/Quick-Start-makenewfriends">click this link</a> to bring yourself back here.
+This is your Suggested Friends page.
 If you get lost, you can <a href="help/Quick-Start-makenewfriends">click this link</a> to bring yourself back here.
-This is a bit like the Friend Suggestions page of Facebook.  Everybody on this list has agreed that they may be suggested as a friend.  This means they're unlikely to refuse an introduction you send, and they want to meet new people too!
+This is a bit like the Friend Suggestions page of Facebook.
 Everybody on this list has agreed that they may be suggested as a friend.
 This means they're unlikely to refuse an introduction you send, and they want to meet new people too!
-See somebody you like the look of?  Click the connect button beneath their photograph.  This will bring you to the introductions page.  Fill in the form as instructed, and add a small note (optional).  Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while.  Now you've added one, you're probably lost.  Click the link at the top of this page to go back to the suggested friends list and add some more.
+See somebody you like the look of?
 Click the connect button beneath their photograph.
 This will bring you to the introductions page.
 Fill in the form as instructed, and add a small note (optional).
 Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while.
 Now you've added one, you're probably lost.
 Click the link at the top of this page to go back to the suggested friends list and add some more.
-Feel uncomfortable adding people you don't know?  Don't worry - that's where <a href="help/Quick-Start-groupsandpages">Groups and Pages</a> come in!
+Feel uncomfortable adding people you don't know?
 Don't worry - that's where <a href="help/Quick-Start-groupsandpages">Groups and Pages</a> come in!
 <iframe src="suggest" width="950" height="600"></iframe>
--- a/doc/Quick-Start-network.md
+++ b/doc/Quick-Start-network.md
@ -1,6 +1,11 @@
-This is your Network Tab.  If you get lost, you can <a href="help/Quick-Start-network">click this link</a> to bring yourself back here.
+This is your Network Tab.
 If you get lost, you can <a href="help/Quick-Start-network">click this link</a> to bring yourself back here.
-This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.  It's where all the posts from your contacts, groups, and feeds will appear.  If you're new, you won't see anything in this page, unless you posted your status in the last step.  If you've already added a few friends, you'll be able to see their posts.  Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
+This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.
 It's where all the posts from your contacts, groups, and feeds will appear.
 If you're new, you won't see anything in this page, unless you posted your status in the last step.
 If you've already added a few friends, you'll be able to see their posts.
 Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
 Now we need to fill it up, the first step, is to <a href="help/Quick-Start-makingnewfriends"> make some new friends</a>.
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@ -13,7 +13,8 @@ You will need to be logged in at the time.
 You will be asked for your password to confirm the request.
 If this matches your stored password, your account will immediately be blocked to all probing.
 Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind.
-All your content and user data, etc is instantly removed. For all intents and purposes, the account is gone in moments.  
+All your content and user data, etc is instantly removed.
 For all intents and purposes, the account is gone in moments.  
 We then send out an "unfriend" signal to all of your contacts.
 This signal deletes all content on those networks.
--- a/doc/SSL.md
+++ b/doc/SSL.md
@ -3,15 +3,15 @@ Using SSL with Friendica
 * [Home](help)
-Disclaimer
+## Disclaimer
---
+
-**This document has been updated in November 2015.
+**This document has been updated in November 2016.
 SSL encryption is relevant for security.
 This means that recommended settings change fast.
 Keep your setup up to date and do not rely on this document being updated as fast as technologies change!**
-Intro
+## Intro
---
+
 If you are running your own Friendica site, you may want to use SSL (https) to encrypt communication between servers and between yourself and your server.
 There are basically two sorts of SSL certificates: Self-signed certificates and certificates signed by a certificate authority (CA).
@ -26,81 +26,71 @@ Normally, you have to pay for them - and they are valid for a limited period of
 There are ways to get a trusted certificate for free.
-Chose your domain name
+## Choose your domain name
 ---
 Your SSL certificate will be valid for a domain or even only for a subdomain.
 Make your final decision about your domain resp. subdomain *before* ordering the certificate.
 Once you have it, changing the domain name means getting a new certificate.
-Shared hosts
+### Shared hosts
 ---
 If your Friendica instance is running on a shared hosting platform, you should first check with your hosting provider.
 They have instructions for you on how to do it there.
 You can always order a paid certificate with your provider.
 They will either install it for you or provide an easy way to upload the certificate and the key via a web interface.
-
+With some providers, you have to send them your certificate.
-
+They need the certificate, the key and the CA's intermediate certificate.
-It might be worth asking if your provider would install a certificate you provide yourself, to save money.
+To be sure, send those three files.
 If so, read on.
 Getting a free StartSSL certificate
 ---
 StartSSL is a certificate authority that issues certificates for free.
 They are valid for a year and are sufficient for our purposes.
 ### Step 1: Create a client certificate
 When you initially sign up with StartSSL, you receive a certificate that is installed in your browser.
 You need it for the login on startssl.com, also when coming back to the site later.
 It has nothing to do with the SSL certificate for your server.
 ### Step 2: Validate your email address and your domain
 To continue you have to prove that you own the email address you specified and the domain that you want a certificate for.
 Specify your email address, request a validation link via email from the "validations wizard".
 Same procedure for the domain validation.
 ### Step 3: Request the certificate
 Go to the "certificates wizard".
 Choose the target web server.
 When you are first prompted for a domain to certify, you need to enter your main domain, e.g. example.com.
 In the next step, you will be able to specify a subdomain for Friendica, if needed.
 Example: If you have friendica.example.com, you first enter example.com, then specify the subdomain friendica later.
 If you know how to generate an openssl key and a certificate signing request (csr) yourself, do so.
 Paste the csr into your browser to get it signed by StartSSL.
 If you do not know how to generate a key and a csr, accept StartSSL's offer to generate it for you.
 This means: StartSSL has the key to your encryption but it is better than no certificate at all.
 Download your certificate from the website.
 (Or in the second case: Download your certificate and your key.)
 To install your certificate on a server, you need one or two extra files: sub.class1.server.ca.pem and ca.pem, delivered by startssl.com
 Go to the "Tool box" section and download "Class 1 Intermediate Server CA" and "StartCom Root CA (PEM encoded)".
 If you want to send your certificate to your hosting provider, they need the certificate, the key and probably at least the intermediate server CA.
 To be sure, send those three and the ca.pem file.
 **You should send them to your provider via an encrypted channel!**
-If you run your own server, upload the files and check out the Mozilla wiki link below.
+### Own server
-Let's encrypt
+If you run your own server, we recommend to check out the ["Let's Encrypt" initiative](https://letsencrypt.org/).
---
+Not only do they offer free SSL certificates, but also a way to automate their renewal.
 You need to install a client software on your server to use it.
 Instructions for the official client are [here](https://certbot.eff.org/).
 Depending on your needs, you might want to look at the [list of alternative letsencrypt clients](https://letsencrypt.org/docs/client-options/).
-If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative.
+## Web server settings
 Their offer is not ready, yet.
 Check out [their website](https://letsencrypt.org/) for status updates.
 Web server settings
 ---
 Visit the [Mozilla's wiki](https://wiki.mozilla.org/Security/Server_Side_TLS) for instructions on how to configure a secure webserver.
-They provide recommendations for [different web servers](https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_Server_Configurations).
+They provide recommendations for [different web servers](https://mozilla.github.io/server-side-tls/ssl-config-generator/).
-Test your SSL settings
+## Test your SSL settings
 ---
 When you are done, visit the test site [SSL Labs](https://www.ssllabs.com/ssltest/) to have them check if you succeeded.
 ## Configure Friendica
 If you can successfully access your Friendica instance through https, there are a number of steps you can take to ensure your users will use SSL to access your instance.
 ### Web server redirection
 This is the simplest way to enforce site-wide secure access.
 Every time a user tries to access any Friendica page by any mean (manual address bar entry or link), the web server issues a Permanent Redirect response with the secure protocol prepended to the requested URL.
 With Apache, enable the modules rewrite and ssl (with a shared hosting provider, this should be enabled already):
        sudo a2enmod rewrite ssl
 Add the following lines to the .htaccess file in the root folder of your Friendica instance (thanks to [url=https://github.com/AlfredSK]AlfredSK[/url]):
        RewriteEngine On
        RewriteCond %{SERVER_PORT} 80
        RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
 With nginx, configure your server directive this way ([documentation](https://www.nginx.com/blog/creating-nginx-rewrite-rules/)):
        server {
             listen 80;
             server_name your.friendica.domain;
             return 301 https://$server_name$request_uri;
        }
 ### SSL Settings
 In the Admin Settings, there are three SSL-related settings:
 1. **SSL link policy**: this affects how Friendica generates internal links. If your SSL installation was successful, we recommend "Force all links to SSL" just in case your web server configuration can't be altered like described above.
 2. **Force SSL**: This forces all external links to HTTPS, which may solve Mixed-Content issues, but not all websites support HTTPS yet. Use at your own risk.
 3. **Verify SSL**: Enabling this will prevent Friendica to interact with self-signed SSL sites. We recommend you leave it on as a self-signed SSL certificate can be a vectorfor a man-in-the-middle attack.
--- a/doc/Settings.md
+++ b/doc/Settings.md
@ -1,175 +1,121 @@
-Settings
+# Settings
 ===
 Here are some of the built-in features which don't have an exposed interface or are otherwise undocumented.
 Configuration settings are stored in the file ".htconfig.php".
 Edit this file with a text editor to make the desired changes.
 Several system settings are already documented in that file and will not be covered here. 
-Hot Keys
+* [Home](help)
 ---
-Friendica traps the following keyboard events:
+If you are the admin of a Friendica node, you have access to the so called **Admin Panel** where you can configure your Friendica node.
-* [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.
+On the front page of the admin panel you will see a summary of information about your node.
-* [F8] - Displays a language selector
+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.
 The second number represents the current number of jobs for the background workers.
 These worker tasks are prioritised and are done accordingly.
 Then you get an overview of the accounts on your node, which can be moderated in the "Users" section of the panel.
 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.
-Birthday Notifications
+The admin panel is seperated into subsections accessible from the side bar of the panel.
 ---
-Birthday events are published on your Home page for any friends having a birthday in the coming 6 days.
+## Site
 In order for your birthday to be discoverable by all of your friends, you must set your birthday (at least the month and day) in your default profile.
 You are not required to provide the year.
-System settings
+This section of the admin panel contains the main configuration of your Friendica node.
---
+It is separated into several sub-section beginning with the basic settings at the top, advancing towards the bottom of the page.
-###Language
+Most configuration options have a help text in the admin panel.
 Therefore this document does not yet cover all the options
-Please see util/README for information on creating language translations.
+### Basic Settings
-Config:
+#### Banner/Logo
 	$a->config['system']['language'] = 'name';
 ###System Theme
 Choose a theme to be the default system theme. This can be over-ridden by user profiles.
 Default theme is "default".
 Config:
 	$a->config['system']['theme'] = 'theme-name';
 ###Proxy Configuration Settings
 If your site uses a proxy to connect to the internet, you may use these settings to communicate with the outside world.
 The outside world still needs to be able to see your website, or this will not be very useful.
 Config:
 	$a->config['system']['proxy'] = "http://proxyserver.domain:port";
 	$a->config['system']['proxyuser'] = "username:password";
 ###Network Timeout
 How long to wait on a network communication before timing out.
 Value is in seconds.
 Default is 60 seconds.
 Set to 0 for unlimited (not recommended).
 Config:
 	$a->config['system']['curl_timeout'] = 60;
 ###Banner/Logo
 Set the content for the site banner.
 The default logo is the Friendica logo and name.
 You may wish to provide HTML/CSS to style and/or position this content, as it may not be themed by default.
-Config:
+#### Language
-	$a->config['system']['banner'] = '<span id="logo-text">My Great Website</span>';
+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.
-###Maximum Image Size
+The Friendica community offers some translations.
 Some more compleate then others.
 See [this help page](/help/translations) for more information about the translation process.
-Maximum size in bytes of uploaded images.
+#### System Theme
 The default is set to 0, which means no limits.
-Config:
+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.
-	$a->config['system']['maximagesize'] = 1000000;
+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.
 The `vier` theme for instance is mobile friendly.
-###UTF-8 Regular Expressions
+### Registration
-During registrations, full names are checked using UTF-8 regular expressions.
+#### Register policy
 This requires PHP to have been compiled with a special setting to allow UTF-8 expressions.
 If you are completely unable to register accounts, set no_utf to true.
 The default is set to false (meaning UTF8 regular expressions are supported and working).
-Config:
+With this drop down selector you can set the nodes registration policy.
 You can chose between the following modes:
-	$a->config['system']['no_utf'] = true;
+* **open**: Everybody can register a new account and start using it right away.
 * **requires approval**: Everybody can register a new account, but the admin has to approve it before it can be used.
 * **closed**: No new registrations are possible.
-###Check Full Names
+##### 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 [.htconfig.php](/help/htconfig) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 #### Check Full Names
 You may find a lot of spammers trying to register on your site.
 During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name.
 If you would like to support people with only one name as their full name, you may change this setting to true.
 Default is false.
-Config:
+#### OpenID
 	$a->config['system']['no_regfullname'] = true;
 ###OpenID
 By default, OpenID may be used for both registration and logins.
 If you do not wish to make OpenID facilities available on your system (at all), set 'no_openid' to true.
 Default is false.
-Config:
+#### Multiple Registrations
 	$a->config['system']['no_openid'] = true;
 ###Multiple Registrations
 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 REGISTER_APPROVE is selected.
+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_extended_register' to true.
+You may prohibit logged in users from creating additional accounts by setting *block multible registrations* to true.
 Default is false.
-Config:
+### File upload
-	$a->config['system']['block_extended_register'] = true;
+#### Maximum Image Size
-Security settings
+Maximum size in bytes of uploaded images.
---
+The default is set to 0, which means no limits.
-###Verify SSL Certitificates
+### Policies
-By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates.
+#### Global Directory
 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.
 SSL encrypts all the data transmitted between sites (and to your browser). This allows you to have completely encrypted communications, and also protect your login session from hijacking.
 Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate. 
 However these aren't looked upon favourably in the security community because they can be subject to so-called "man-in-the-middle" attacks.
 If you wish, you can turn on strict certificate checking.
 This will mean you cannot connect (at all) to self-signed SSL sites.
-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 network.
-	$a->config['system']['verifyssl'] = true;
+#### Force Publish
-Corporate/Edu enhancements
+By default, each user can choose on their Settings page whether or not to have their profile published in the site directory.
---
+This setting forces all profiles on this site to be listed in the site directory and there is no option provided to the user to change it.
 Default is false.
-###Allowed Friend Domains
+#### Block Public
 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.
 Config:
 	$a->config['system']['allowed_sites'] = "sitea.com, *siteb.com";
 ###Allowed Email Domains
 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.  
 Config:
 	$a->config['system']['allowed_email'] = "sitea.com, *siteb.com";
 ###Block Public
 Set to true to block public access to all otherwise public personal pages on this site unless you are currently logged in.
 This blocks the viewing of profiles, friends, photos, the site directory and search pages to unauthorised persons.
@ -180,48 +126,198 @@ Unauthorised persons will also not be able to request friendship with site membe
 Default is false.
 Available in version 2.2 or greater.
-Config:
+#### Community pages for Visitors
-	$a->config['system']['block_public'] = true;
+The community pages show all public postings, separated by their origin being local or the entire network.
 With this setting you can select which community pages will be shown to visitors of your Friendica node.
 Your local users will always have access to both pages.
-###Force Publish
+**Note**: Several settings, like users hiding their contacts from the public will prevent the postings to show up on the global community page.
-By default, each user can choose on their Settings page whether or not to have their profile published in the site directory.
+#### Allowed Friend Domains
 This setting forces all profiles on this site to be listed in the site directory and there is no option provided to the user to change it.
 Default is false.
-Config:
+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.
-	$a->config['system']['publish_all'] = true;
+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.
-###Global Directory
+#### Allowed Email Domains
-This configures the URL to update the global directory, and is supplied in the default configuration.
+Comma separated list of domains which are allowed in email addresses for registrations to this site.
-The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
+This can lockout those who are not part of this organisation from registering here.
-This allows a private community to be completely isolated from the global network. 
+Wildcards are accepted.
 (Wildcard support on Windows platforms requires PHP5.3).
 By default, any (valid) email address is allowed in registrations.
-	$a->config['system']['directory'] = 'http://dir.friendi.ca';
+#### Allow Users to set remote_self
-Developer Settings
+If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in the advanced contact settings.
---
+Which means that postings by the remote self are automatically reposted by Friendica in their names.
-### Debugging
+This feature can be used to let the user mirror e.g. blog postings into their Friendica postings.
-Most useful when debugging protocol exchanges and tracking down other communications issues. 
+It is disabled by default, as it causes additional load on the server and may be misused to distribute SPAM.
-Config:
+As admin of the node you can also set this flag directly in the database.
 Before doing so, you should be sure you know what you do and have a backup of the database.
-	$a->config['system']['debugging'] = true;
+### Advanced
 	$a->config['system']['logfile'] = 'logfile.out';
 	$a->config['system']['loglevel'] = LOGGER_DEBUG;
-Turns on detailed debugging logs which will be stored in 'logfile.out' (which must be writeable by the webserver).
+#### Proxy Configuration Settings
 LOGGER_DEBUG will show a good deal of information about system activity but will not include detailed data.
 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. 
 If your site uses a proxy to connect to the internet, you may use these settings to communicate with the outside world.
 The outside world still needs to be able to see your website, or this will not be very useful.
-###PHP error logging
+#### Network Timeout
 How long to wait on a network communication before timing out.
 Value is in seconds.
 Default is 60 seconds.
 Set to 0 for unlimited (not recommended).
 #### Verify SSL Certitificates
 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.
 SSL encrypts all the data transmitted between sites (and to your browser).
 This allows you to have completely encrypted communications, and also protect your login session from hijacking.
 Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate.
 However these aren't looked upon favourably in the security community because they can be subject to so-called "man-in-the-middle" attacks.
 If you wish, you can turn on strict certificate checking.
 This will mean you cannot connect (at all) to self-signed SSL sites.
 #### Check upstream version
 If this option is enabled your Friendica node will check the upstream version once per day from the github repository.
 You can select if the stable version or the development version should be checked out.
 If there is a new version published, you will get notified in the admin panel summary page.
 ### Auto Discovered Contact Directory
 ### Performance
 ### Worker
 This section allows you to configure the background process that is triggered by the `cron` job that was created during the installation.
 The process does check the available system resources before creating a new worker for a task.
 Because of this, it may happen that the maximum number of worker processes you allow will not be reached.
 If your server setup does not allow you to use the `proc_open` function of PHP, please disable it in this section.
 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.
 This will then trigger the execution of the background process.
 ### Relocate
 ## Users
 This section of the panel let the admin control the users registered on the node.
 If you have selected "Requires approval" for the *Register policy* in the general nodes configuration, new registrations will be listed at the top of the page.
 There the admin can then approve or disapprove the request.
 Below the new registration block the current accounts on the Friendica node are listed.
 You can sort the user list by name, email, registration date, date of last login, date of last posting and the account type.
 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.
 ## 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.
 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.
 To simplify this process there is a button at the top of the page to reload all active Addons.
 ## Themes
 The Themes section of the admin panel works similar to the Addons section but let you control the themes on your Friendica node.
 Each theme has a dedicated subpage showing the current status, some information about the theme and a screen-shot of the Friendica interface using the theme.
 Should the theme offer special settings, admins can set a global default value here.
 You can activate and deactivate themes on their dedicated sub-pages thus making them available for the users of the node.
 To select a default theme for the Friendica node, see the *Site* section of the admin panel.
 ## Additional Features
 There are several optional features in Friendica like the *dislike* button.
 In this section of the admin panel you can select a default setting for your node and eventually fix it, so users cannot change the setting anymore.
 ## 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.
 ## 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.
 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.
 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.
 Don't panic!
 Friendica will not queue messages for all time but will sort out *dead* nodes automatically after a while and remove messages from the queue then.
 ## Server Blocklist
 This page allows to block all communications (inbound and outbound) with a specific domain name.
 Each blocked domain entry requires a reason that will be displayed on the [friendica](/friendica) page.
 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.
 ## Delete Item
 Using this page an admin can delete postings and eventually associated discussion threads from their Friendica node.
 To do so, they need to know the GUID of the posting.
 This can be found on the `/display` page of the posting, it is the last part of the URL displayed in the browsers navigation bar.
 You can get to the `/display` page by following the *Link to source*.
 ## Addon Features
 Some of the addons you can install for your Friendica node have settings which have to be set by the admin.
 All those addons will be listed in this area of the admin panels side bar with their names.
 ## Logs
 The log section of the admin panel is seperated 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.
 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.
 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.
 But due to the volume of information we recommend only enabling this when you are tracking down a specific problem.
 **The amount of data can grow the filesize of the logfile quickly**.
 You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_rotation) to keep the log file from growing too big.
 **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 ``.htconfig.php`` file.
 Use the following settings to redirect PHP errors to a file.
 Config:
@ -232,9 +328,61 @@ Config:
 	ini_set('display_errors', '0');
 This will put all PHP errors in the file php.out (which must be writeable by the webserver).
-Undeclared variables are occasionally referenced in the program and therefore we do not recommend using E_NOTICE or E_ALL.
+Undeclared variables are occasionally referenced in the program and therefore we do not recommend using `E_NOTICE` or `E_ALL`.
 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.
 ## Diagnostics
 In this section of the admin panel you find two tools to investigate what Friendica sees for certain ressources.
 These tools can help to clarify communication problems.
 For the *probe address* Friendica will display information for the address provided.
 With the second tool *check webfinger* you can request information about the thing identified by a webfinger (`someone@example.com`).
 # Exceptions to the rule
 There are four exceptions to the rule, that all the config will be read from the data base.
 These are the data base settings, the admin account settings, the path of PHP and information about an eventual installation of the node in a sub-directory of the (sub)domain.
 ## DB Settings
 With the following settings, you specify the data base server, the username and passwort for Friendica and the database to use.
    $db_host = 'your.db.host';
    $db_user = 'db_username';
    $db_pass = 'db_password';
    $db_data = 'database_name';
 ## Admin users
 You can set one, or more, accounts to be *Admin*.
 By default this will be the one account you create during the installation process.
 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.
    $a->config['admin_email'] = 'you@example.com, buddy@example.com';
 ## PHP Path
 Some of Friendicas processes are running in the background.
 For this you need to specify the path to the PHP binary to be used.
    $a->config['php_path'] = '{{$phpath}}';
 ## Subdirectory configuration
 It is possible to install Friendica into a subdirectory of your webserver.
 We strongly discurage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Socia, Hubzilla)
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
    $a->path = 'tests/friendica';
 ## Other exceptions
 Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in .htconfig.php](help/htconfig) section of the documentation.
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@ -21,11 +21,22 @@ You can tag a person on a different network or one that is **not in your social
 * @mike@macgirvin.com - This is called a "remote mention" and can only be an email-style locator, not a web URL.
-Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendica blocks incoming "mentions" from people with no relationship to you. This is a spam prevention measure.
+Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
 Friendica blocks incoming “mentions” from people with no relationship to you.
 The exception is an ongiong conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
 This is a spam prevention measure.
-Remote mentions are delivered using the OStatus protocol. This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora. 
+Remote mentions are delivered using the OStatus protocol.
 This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora. 
 As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
 These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
-Friendica makes no distinction between people and groups for the purpose of tagging. (Some other networks use !group to indicate a group.)
+Friendica makes no distinction between people and forums for the purpose of tagging.
 (Some other networks use !forum to indicate a forum.)
 If you sort your contacts into groups, you cannot @-mention these groups.
 But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting.
 See [Groups and Privacy](help/Groups-and-Privacy) for more details about grouping your contacts.
 **Topical Tags**
--- a/doc/Text_editor.md
+++ b/doc/Text_editor.md
@ -96,18 +96,3 @@ Click again on "show" or "don't show" to switch it off.
 You can search for contacts or groups with the search box.
 See also [Group and Privacy](help/Groups-and-Privacy)
 WYSIAWYG (What You See Is About What You Get)
 --------------------------------------------------
 Friendica can use TinyMCE as rich text editor. This way you can write beatifull post without the need to know [BBCode](help/BBCode).
 By default, rich editor is disabled. You can enable it from Settings -> [Aditional features](settings/features) page, turn on Richtext Editor and click "Submit".
 <figure>
 <img src="doc/img/friendica_rich_editor.png" alt="default editor">
 <figcaption>Rich editor, with default Friendica theme (duepuntozero)</figcaption>
 </figure>
--- a/doc/Update.md
+++ b/doc/Update.md
@ -0,0 +1,72 @@
 Updating Friendica
 ===============
 * [Home](help)
 ## Using a Friendica archive
 If you installed Friendica in the ``path/to/friendica`` folder:
 1. Unpack the new Friendica archive in ``path/to/friendica_new``.
 2. Copy ``.htconfig.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.
 6. If everything works, just delete the ``path/to/friendica_old`` folder.
 To update Addons from an archive, simply delete the ``path/to/friendica/addon`` and replace it with the provided archive.
 ## Using Git
 You can get the latest changes at any time with
    cd path/to/friendica
    git pull
    util/composer.phar install
 The addon tree has to be updated separately like so:
    cd path/to/friendica/addon
    git pull
 For both repositories:
 The default branch to use is the ``master`` branch, which is the stable version of Friendica.
 It is updated about four times a year on a fixed schedule.
 If you want to use and test bleeding edge code please checkout the ``develop`` branch.
 The new features and fixes will be merged from ``develop`` into ``master`` after a release candidate period before each release.
 Warning: The ``develop`` branch is unstable, and breaks on average once a month for at most 24 hours until a patch is submitted and merged.
 Be sure to pull frequently if you choose the ``develop`` branch.
 ### Considerations before upgrading Friendica
 #### MySQL >= 5.7.4
 Starting from MySQL version 5.7.4, the IGNORE keyword in ALTER TABLE statements is ignored.
 This prevents automatic table deduplication if a UNIQUE index is added to a Friendica table's structure.
 If a DB update fails for you while creating a UNIQUE index, make sure to manually deduplicate the table before trying the update again.
 #### Manual deduplication
 There are two main ways of doing it, either by manually removing the duplicates or by recreating the table.
 Manually removing the duplicates is usually faster if they're not too numerous.
 To manually remove the duplicates, you need to know the UNIQUE index columns available in `database.sql`.
 ```SQL
 SELECT GROUP_CONCAT(id), <index columns>, count(*) as count FROM users
 GROUP BY <index columns> HAVING count >= 2;
 /* delete or merge duplicate from above query */;
 ```
 If there are too many rows to handle manually, you can create a new table with the same structure as the table with duplicates and insert the existing content with INSERT IGNORE.
 To recreate the table you need to know the table structure available in `database.sql`.
 ```SQL
 CREATE TABLE <table_name>_new <rest of the CREATE TABLE>;
 INSERT IGNORE INTO <table_name>_new SELECT * FROM <table_name>;
 DROP TABLE <table_name>;
 RENAME TABLE <table_name>_new TO <table_name>;
 ```
 This method is slower overall, but it is better suited for large numbers of duplicates.
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@ -8,7 +8,9 @@ Getting started
 [Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers.
 No need to setup up a webserver, database etc. before actually starting.
-Vagrant creates a virtual machine (an Ubuntu 14.04) for you that you can just run inside VirtualBox and start to work directly on Friendica.
+Vagrant creates a virtual machine for you that you can just run inside VirtualBox and start to work directly on Friendica.
 It brings an Ubuntu Xenial (16.04) with PHP 7.0 and MySQL 5.7.16
 What you need to do:
@ -16,11 +18,14 @@ What you need to do:
 Please use an up-to-date vagrant version from https://www.vagrantup.com/downloads.html.
 2. Git clone your Friendica repository.
 Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
-3. Run "vagrant up" from inside the friendica clone.
+3. Run "vagrant up" from inside the friendica clone:
        $> vagrant up
 Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
-4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
+4. Run "vagrant ssh" to log into the virtual machine to log in to the VM:
-5. Open 192.168.22.10 in a browser.
+        $> vagrant ssh
-The mysql database is called "friendica", the mysql user and password both are "root".
+5. Open you test installation in a browser.
 Go to 192.168.22.10.
 The mysql database is called "friendica", the mysql user and password both are "friendica".
 6. Work on Friendica's code in your git clone on your machine (not in the VM).
 Your local working directory is set up as a shared directory with the VM (/vagrant).
 7. Check the changes in your browser in the VM.
@ -33,6 +38,13 @@ If you want to stop vagrant after finishing your work, run the following command
 		$> vagrant halt
 in the development directory.
 This will not delete the virtual machine.
 9. To ultimately delete the virtual machine run
        $> vagrant destroy
        $> rm /vagrant/.htconfig.php
 to make sure that you can start from scratch with another "vagrant up".
 The vagrant Friendica instance contains a test database.
 You will then have the following accounts to login:
@ -44,10 +56,3 @@ You will then have the following accounts to login:
  * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected. 
 For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
 **Important notice:**
 If you already had an Ubuntu 12.04 Vagrant VM, please run 
 	$> vagrant destroy
 before starting the new 14.04 machine.
--- a/doc/andfinally.md
+++ b/doc/andfinally.md
@ -1,22 +0,0 @@
 [[!meta title="And Finally..."]]
 And that brings the Quick Start to an end.
 Here are some more things to help get you started:
 **Groups**
 - <a href="http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
 - <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk">Let's Talk</a> a group for finding people and groups who share similar interests.
 - <a href="http://newzot.hydra.uberspace.de/profile/newzot">Local Friendica</a> a page for local Friendica groups</a>
 **Documentation**
 - <a href="help/Connectors">Connecting to more networks</a>
 - <a href="help">Help Index</a>
--- a/doc/api.md
+++ b/doc/api.md
--- a/doc/autoloader.md
+++ b/doc/autoloader.md
@ -0,0 +1,199 @@
 Autoloader with Composer
 ==========
 * [Home](help)
  * [Developer Intro](help/Developers-Intro)
 Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
 It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application through `boot.php`.
 * [Using Composer](help/Composer)
 ## A quick introduction to class autoloading
 The autoloader dynamically includes the file defining a class when it is first referenced, either by instantiating an object or simply making sure that it is available, without the need to explicitly use "require_once".
 Once it is set up you don't have to directly use it, you can directly use any class that is covered by the autoloader (currently `vendor` and `src`)
 Under the hood, Composer registers a callback with [`spl_autoload_register()`](http://php.net/manual/en/function.spl-autoload-register.php) that receives a class name as an argument and includes the corresponding class definition file.
 For more info about PHP autoloading, please refer to the [official PHP documentation](http://php.net/manual/en/language.oop5.autoload.php).
 ### Example
 Let's say you have a PHP file in `src/` that define a very useful class:
 ```php
 // src/ItemsManager.php
 <?php
 namespace Friendica;
 class ItemsManager {
 	public function getAll() { ... }
 	public function getByID($id) { ... }
 }
 ```
 The class `ItemsManager` has been declared in the `Friendica` namespace.
 Namespaces are useful to keep classes separated and avoid names conflicts (could be that a library you want to use also defines a class named `ItemsManager`, but as long as it is in another namespace, you don't have any problem)
 Let's say now that you need to load some items in a view, maybe in a fictional `mod/network.php`.
 In order for the Composer autoloader to work, it must first be included.
 In Friendica this is already done at the top of `boot.php`, with `require_once('vendor/autoload.php');`.
 The code will be something like:
 ```php
 // mod/network.php
 <?php
 function network_content(App $a) {
 	$itemsmanager = new Friendica\ItemsManager();
 	$items = $itemsmanager->getAll();
 	// pass $items to template
 	// return result
 }
 ```
 That's a quite simple example, but look: no `require()`!
 If you need to use a class, you can simply use it and you don't need to do anything else.
 Going further: now we have a bunch of `*Manager` classes that cause some code duplication.
 Let's define a `BaseManager` class, where we move all common code between all managers:
 ```php
 // src/BaseManager.php
 <?php
 namespace Friendica;
 class BaseManager {
 	public function thatFunctionEveryManagerUses() { ... }
 }
 ```
 and then let's change the ItemsManager class to use this code
 ```php
 // src/ItemsManager.php
 <?php
 namespace Friendica;
 class ItemsManager extends BaseManager {
 	public function getAll() { ... }
 	public function getByID($id) { ... }
 }
 ```
 Even though we didn't explicitly include the `src/BaseManager.php` file, the autoloader will when this class is first defined, because it is referenced as a parent class.
 It works with the "BaseManager" example here and it works when we need to call static methods:
 ```php
 // src/Dfrn.php
 <?php
 namespace Friendica;
 class Dfrn {
 	public static function  mail($item, $owner) { ... }
 }
 ```
 ```php
 // mod/mail.php
 <?php
 mail_post($a){
 	...
 	Friendica\Protocol\DFRN::mail($item, $owner);
 	...
 }
 ```
 If your code is in same namespace as the class you need, you don't need to prepend it:
 ```php
 // include/delivery.php
 <?php
 namespace Friendica;
 // this is the same content of current include/delivery.php,
 // but has been declared to be in "Friendica" namespace
 [...]
 switch($contact['network']) {
 	case NETWORK_DFRN:
 		if ($mail) {
 			$item['body'] = ...
 			$atom = DFRN::mail($item, $owner);
 		} elseif ($fsuggest) {
 			$atom = DFRN::fsuggest($item, $owner);
 			q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
 		} elseif ($relocate)
 			$atom = DFRN::relocate($owner, $uid);
 [...]
 ```
 This is the current code of `include/delivery.php`, and since the code is declared to be in the "Friendica" namespace, you don't need to write it when you need to use the "Dfrn" class.
 But if you want to use classes from another library, you need to use the full namespace, e.g.
 ```php
 // src/Diaspora.php
 <?php
 namespace Friendica;
 class Diaspora {
 	public function md2bbcode() {
 		$html = \Michelf\MarkdownExtra::defaultTransform($text);
 	}
 }
 ```
 if you use that class in many places of the code and you don't want to write the full path to the class every time, you can use the "use" PHP keyword
 ```php
 // src/Diaspora.php
 <?php
 namespace Friendica;
 use \Michelf\MarkdownExtra;
 class Diaspora {
 	public function md2bbcode() {
 		$html = MarkdownExtra::defaultTransform($text);
 	}
 }
 ```
 Note that namespaces are like paths in filesystem, separated by "\", with the first "\" being the global scope.
 You can go deeper if you want to, like:
 ```
 // src/Network/Dfrn.php
 <?php
 namespace Friendica\Network;
 class Dfrn {
 }
 ```
 Please note that the location of the file defining the class must be placed in the appropriate sub-folders of `src` if the namespace isn't plain `Friendica`.
 or
 ```
 // src/Dba/Mysql
 <?php
 namespace Friendica\Dba;
 class Mysql {
 }
 ```
 So you can think of namespaces as folders in a Unix file system, with global scope as the root ("\").
 ## Related
 * [Using Composer](help/Composer)
 * [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)
--- a/doc/database.md
+++ b/doc/database.md
@ -0,0 +1,56 @@
 Database Tables
 ===============
 * [Home](help)
 | Table                                                | Description                                      |
 |------------------------------------------------------|--------------------------------------------------|
 | [addon](help/database/db_addon)                      | registered addons                               |
 | [attach](help/database/db_attach)                    | file attachments                                 |
 | [auth_codes](help/database/db_auth_codes)            | OAuth usage                                      |
 | [cache](help/database/db_cache)                      | OEmbed cache                                     |
 | [challenge](help/database/db_challenge)              |                                                  |
 | [clients](help/database/db_clients)                  | OAuth usage                                      |
 | [config](help/database/db_config)                    | main configuration storage                       |
 | [contact](help/database/db_contact)                  | contact table                                    |
 | [conv](help/database/db_conv)                        | private messages                                 |
 | [conversation](help/database/db_conversation)        | Raw data and structure information for messages  |
 | [event](help/database/db_event)                      | Events                                           |
 | [fcontact](help/database/db_fcontact)                | friend suggestion stuff                          |
 | [fsuggest](help/database/db_fsuggest)                | friend suggestion stuff                          |
 | [gcign](help/database/db_gcign)                      | contacts ignored by friend suggestions           |
 | [gcontact](help/database/db_gcontact)                | global contacts                                  |
 | [glink](help/database/db_glink)                      | "friends of friends" linkages derived from poco  |
 | [group](help/database/db_group)                      | privacy groups, group info                       |
 | [group_member](help/database/db_group_member)        | privacy groups, member info                      |
 | [gserver](help/database/db_gserver)                  |                                                  |
 | [hook](help/database/db_hook)                        | addon hook registry                             |
 | [intro](help/database/db_intro)                      |                                                  |
 | [item](help/database/db_item)                        | all posts                                        |
 | [locks](help/database/db_locks)                      |                                                  |
 | [mail](help/database/db_mail)                        | private messages                                 |
 | [mailacct](help/database/db_mailacct)                |                                                  |
 | [manage](help/database/db_manage)                    | table of accounts that can "su" each other       |
 | [notify](help/database/db_notify)                    | notifications                                    |
 | [notify-threads](help/database/db_notify-threads)    |                                                  |
 | [oembed](help/database/db_oembed)                    | cache for OEmbed queries                         |
 | [parsed_url](help/database/db_parsed_url)            | cache for "parse_url" queries                    |
 | [participation](help/database/db_participation)      | Storage for participation messages from Diaspora |
 | [pconfig](help/database/db_pconfig)                  | personal (per user) configuration storage        |
 | [photo](help/database/db_photo)                      | photo storage                                    |
 | [poll](help/database/db_poll)                        | data for polls                                   |
 | [poll_result](help/database/db_poll_result)          | data for poll elements                           |
 | [profile](help/database/db_profile)                  | user profiles data                               |
 | [profile_check](help/database/db_profile_check)      | DFRN remote auth use                             |
 | [push_subscriber](help/database/db_push_subscriber)  |                                                  |
 | [queue](help/database/db_queue)                      |                                                  |
 | [register](help/database/db_register)                | registrations requiring admin approval           |
 | [search](help/database/db_search)                    |                                                  |
 | [session](help/database/db_session)                  | web session storage                              |
 | [sign](help/database/db_sign)                        | Diaspora signatures                              |
 | [term](help/database/db_term)                        | item taxonomy (categories, tags, etc.) table     |
 | [thread](help/database/db_thread)                    |                                                  |
 | [tokens](help/database/db_tokens)                    | OAuth usage                                      |
 | [user](help/database/db_user)                        | local user table                                 |
 | [userd](help/database/db_userd)                      |                                                  |
 | [workerqueue](help/database/db_workerqueue)          |                                                  |
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@ -0,0 +1,17 @@
 Table addon
 ===========
 | Field         | Description                                   | Type       | Null | Key | Default | Extra           |
 | ------------- | --------------------------------------------- | ---------- | ---- | --- | ------- | --------------- |
 | id            |                                               | int(11)    | NO   | PRI | NULL    | auto_increment  |
 | name          | addon base (file)name                        | char(255)  | NO   |     |         |                 |
 | version       | currently unused                              | char(255)  | NO   |     |         |                 |
 | installed     | currently always 1                            | tinyint(1) | NO   |     | 0       |                 |
 | hidden        | currently unused                              | tinyint(1) | NO   |     | 0       |                 |
 | timestamp     | file timestamp to check for reloads           | bigint(20) | NO   |     | 0       |                 |
 | plugin_admin  | 1 = has admin config, 0 = has no admin config | tinyint(1) | NO   |     | 0       |                 |
 Notes:
 These are addons which have been enabled by the site administrator on the addon page
 Return to [database documentation](help/database)
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@ -0,0 +1,22 @@
 Table attach
 ============
 | Field      | Description                                           | Type         | Null | Key | Default             | Extra           |
 | ---------- | ------------------------------------------------------| ------------ | ---- | --- | ------------------- | --------------- |
 | id         | generated index                                       | int(11)      | NO   | PRI | NULL                | auto_increment  |
 | uid        | user_id of owner                                      | int(11)      | NO   |     | 0                   |                 |
 | hash       | hash                                                  | varchar(64)  | NO   |     |                     |                 |
 | filename   | filename of original                                  | varchar(255) | NO   |     |                     |                 |
 | filetype   | mimetype                                              | varchar(64)  | NO   |     |                     |                 |
 | filesize   | size in bytes                                         | int(11)      | NO   |     | 0                   |                 |
 | data       | file data                                             | longblob     | NO   |     | NULL                |                 |
 | created    | creation time                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
 | edited     | last edit time                                        | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
 | allow_cid  | Access Control - list of allowed contact.id '<19><78> | mediumtext   | NO   |     | NULL                |                 |
 | allow_gid  | Access Control - list of allowed groups               | mediumtext   | NO   |     | NULL                |                 |
 | deny_cid   | Access Control - list of denied contact.id            | mediumtext   | NO   |     | NULL                |                 |
 | deny_gid   | Access Control - list of denied groups                | mediumtext   | NO   |     | NULL                |                 |
 Notes: Permissions are surrounded by angle chars. e.g. <4>
 Return to [database documentation](help/database)
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@ -0,0 +1,14 @@
 Table auth_codes
 ================
 OAuth2 authorisation register - currently implemented but unused
 | Field         | Description | Type         | Null | Key | Default | Extra |
 | ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
 | id            |             | varchar(40)  | NO   | PRI | NULL    |       |
 | client_id     |             | varchar(20)  | NO   |     |         |       |
 | redirect_uri  |             | varchar(200) | NO   |     |         |       |
 | expires       |             | int(11)      | NO   |     | 0       |       |
 | scope         |             | varchar(250) | NO   |     |         |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@ -0,0 +1,11 @@
 Table cache
 ===========
 | Field        | Description                        | Type         | Null | Key | Default             | Extra |
 | ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
 | k            | horizontal width + url or resource | varchar(255) | NO   | PRI | NULL                |       |
 | v            | OEmbed response from site          | text         | NO   |     | NULL                |       |
 | updated      | datetime of cache insertion        | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
 | expire_mode  |                                    | int(11)      | NO   |     | 0                   |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@ -0,0 +1,13 @@
 Table challenge
 ===============
 | Field       | Description      | Type             | Null | Key | Default | Extra          |
 |-------------|------------------|------------------|------|-----|---------|----------------|
 | id          | sequential ID    | int(10) unsigned | NO   | PRI | NULL    | auto_increment |
 | challenge   |                  | varchar(255)     | NO   |     |         |                |
 | dfrn-id     |                  | varchar(255)     | NO   |     |         |                |
 | expire      |                  | int(11)          | NO   |     | 0       |                |
 | type        |                  | varchar(255)     | NO   |     |         |                |
 | last_update |                  | varchar(255)     | NO   |     |         |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@ -0,0 +1,13 @@
 Table clients
 =============
 | Field         | Description | Type         | Null | Key | Default | Extra |
 | ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
 | client_id     |             | varchar(20)  | NO   | PRI | NULL    |       |
 | pw            |             | varchar(20)  | NO   |     |         |       |
 | redirect_uri  |             | varchar(200) | NO   |     |         |       |
 | name          |             | text         | YES  |     | NULL    |       |
 | icon          |             | text         | YES  |     | NULL    |       |
 | uid           |             | int(11)      | NO   |     | 0       |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@ -0,0 +1,11 @@
 Table config
 ============
 | Field | Description | Type             | Null | Key | Default | Extra           |
 | ----- | ----------- | ---------------- | ---- | --- | ------- | --------------- |
 | id    |             | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
 | cat   |             | char(255)        | NO   | MUL |         |                 |
 | k     |             | char(255)        | NO   |     |         |                 |
 | v     |             | text             | NO   |     | NULL    |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@ -0,0 +1,72 @@
 Table contact
 =============
 | Field                     | Description                                               | Type         | Null | Key | Default             | Extra          |
 |---------------------------|-----------------------------------------------------------|--------------|------|-----|---------------------|----------------|
 | id                        | sequential ID                                             | int(11)      | NO   | PRI | NULL                | auto_increment |
 | uid                       | user.id of the owner of this data                         | int(11)      | NO   | MUL | 0                   |                |
 | created                   |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | self                      | 1 if the contact is the user him/her self                 | tinyint(1)   | NO   |     | 0                   |                |
 | remote_self               |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | rel                       | The kind of the relation between the user and the contact | tinyint(1)   | NO   |     | 0                   |                |
 | duplex                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | network                   | Network protocol of the contact                           | varchar(255) | NO   |     |                     |                |
 | name                      | Name that this contact is known by                        | varchar(255) | NO   |     |                     |                |
 | nick                      | Nick- and user name of the contact                        | varchar(255) | NO   |     |                     |                |
 | location                  |                                                           | varchar(255) | NO   |     |                     |                |
 | about                     |                                                           | text         | NO   |     | NULL                |                |
 | keywords                  | public keywords (interests) of the contact                | text         | NO   |     | NULL                |                |
 | gender                    |                                                           | varchar(32)  | NO   |     |                     |                |
 | attag                     |                                                           | varchar(255) | NO   |     |                     |                |
 | photo                     | Link to the profile photo of the contact                  | text         | NO   |     | NULL                |                |
 | thumb                     | Link to the profile photo (thumb size)                    | text         | NO   |     | NULL                |                |
 | micro                     | Link to the profile photo (micro size)                    | text         | NO   |     | NULL                |                |
 | site-pubkey               |                                                           | text         | NO   |     | NULL                |                |
 | issued-id                 |                                                           | varchar(255) | NO   |     |                     |                |
 | dfrn-id                   |                                                           | varchar(255) | NO   |     |                     |                |
 | url                       |                                                           | varchar(255) | NO   |     |                     |                |
 | nurl                      |                                                           | varchar(255) | NO   |     |                     |                |
 | addr                      |                                                           | varchar(255) | NO   |     |                     |                |
 | alias                     |                                                           | varchar(255) | NO   |     |                     |                |
 | pubkey                    | RSA public key 4096 bit                                   | text         | NO   |     | NULL                |                |
 | prvkey                    | RSA private key 4096 bit                                  | text         | NO   |     | NULL                |                |
 | batch                     |                                                           | varchar(255) | NO   |     |                     |                |
 | request                   |                                                           | text         | NO   |     | NULL                |                |
 | notify                    |                                                           | text         | NO   |     | NULL                |                |
 | poll                      |                                                           | text         | NO   |     | NULL                |                |
 | confirm                   |                                                           | text         | NO   |     | NULL                |                |
 | poco                      |                                                           | text         | NO   |     | NULL                |                |
 | aes_allow                 |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | ret-aes                   |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | usehub                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | subhub                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | hub-verify                |                                                           | varchar(255) | NO   |     |                     |                |
 | last-update               | Date of the last try to update the contact info           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | success_update            | Date of the last successful contact update                | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | failure_update            | Date of the last failed update                            | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | name-date                 |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | uri-date                  |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | avatar-date               |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | term-date                 |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | last-item                 | date of the last post                                     | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | priority                  |                                                           | tinyint(3)   | NO   |     | 0                   |                |
 | blocked                   |                                                           | tinyint(1)   | NO   |     | 1                   |                |
 | readonly                  | posts of the contact are readonly                         | tinyint(1)   | NO   |     | 0                   |                |
 | writable                  |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | forum                     | contact is a forum                                        | tinyint(1)   | NO   |     | 0                   |                |
 | prv                       | contact is a private group                                | tinyint(1)   | NO   |     | 0                   |                |
 | hidden                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | archive                   |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | pending                   |                                                           | tinyint(1)   | NO   |     | 1                   |                |
 | rating                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | reason                    |                                                           | text         | NO   |     | NULL                |                |
 | closeness                 |                                                           | tinyint(2)   | NO   |     | 99                  |                |
 | info                      |                                                           | mediumtext   | NO   |     | NULL                |                |
 | profile-id                |                                                           | int(11)      | NO   |     | 0                   |                |
 | bdyear                    |                                                           | varchar(4)   | NO   |     |                     |                |
 | bd                        |                                                           | date         | NO   |     | 0001-01-01          |                |
 | notify_new_posts          |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | fetch_further_information |                                                           | tinyint(1)   | NO   |     | 0                   |                |
 | ffi_keyword_blacklist     |                                                           | mediumtext   | NO   |     | NULL                |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@ -0,0 +1,15 @@
 Table conv
 ==========
 | Field   | Description                               | Type             | Null | Key | Default             | Extra           |
 | ------- | ----------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
 | id      | sequential ID                             | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
 | guid    | A unique identifier for this conversation | varchar(64)      | NO   |     |                     |                 |
 | recips  | sender_handle;recipient_handle            | mediumtext       | NO   |     | NULL                |                 |
 | uid     | user_id of the owner of this data         | int(11)          | NO   | MUL | 0                   |                 |
 | creator | handle of creator                         | varchar(255)     | NO   |     |                     |                 |
 | created | creation timestamp                        | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 | updated | edited timestamp                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 | subject | subject of initial message                | mediumtext       | NO   |     | NULL                |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@ -0,0 +1,14 @@
 Table conversation
 ==================
 | Field             | Description                        | Type                | Null | Key | Default             | Extra          |
 |-------------------| ---------------------------------- |---------------------|------|-----|---------------------|----------------|
 | item-uri          | URI of the item                    | varbinary(255)      | NO   | PRI | NULL                |                |
 | reply-to-uri      | URI to which this item is a reply  | varbinary(255)      | NO   |     |                     |                |
 | conversation-uri  | GNU Social conversation URI        | varbinary(255)      | NO   |     |                     |                |
 | conversation-href | GNU Social conversation link       | varbinary(255)      | NO   |     |                     |                |
 | protocol          | The protocol of the item           | tinyint(1) unsigned | NO   |     | 0                   |                |
 | source            | Original source                    | mediumtext          | NO   |     |                     |                |
 | received          | Receiving date                     | datetime            | NO   |     | 0001-01-01          |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@ -0,0 +1,26 @@
 Table event
 ===========
 | Field      | Description                                            | Type                | Null | Key | Default             | Extra           |
 | ---------- | ----------------------------------------------- -------| ------------------- | ---- | --- | ------------------- | --------------- |
 | id         | sequential ID                                          | int(11)             | NO   | PRI | NULL                | auto_increment  |
 | uid        | user_id of the owner of this data                      | int(11)             | NO   | MUL | 0                   |                 |
 | cid        | contact_id (ID of the contact in contact table)        | int(11)             | NO   |     | 0                   |                 |
 | uri        |                                                        | varchar(255)        | NO   |     |                     |                 |
 | created    |  creation time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
 | edited     | last edit time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
 | start      | event start time                                       | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
 | finish     | event end time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
 | summary    |  short description or title of the event               | text                | NO   |     | NULL                |                 |
 | desc       | event description                                      | text                | NO   |     | NULL                |                 |
 | location   | event location                                         | text                | NO   |     | NULL                |                 |
 | type       | event or birthday                                      | varchar(255)        | NO   |     |                     |                 |
 | nofinish   | if event does have no end this is 1                    | tinyint(1)          | NO   |     | 0                   |                 |
 | adjust     | adjust to timezone of the recipient (0 or 1)           | tinyint(1)          | NO   |     | 1                   |                 |
 | ignore     | 0 or 1                                                 | tinyint(1) unsigned | NO   |     | 0                   |                 |
 | allow_cid  | Access Control - list of allowed contact.id '<19><78>' | mediumtext          | NO   |     | NULL                |                 |
 | allow_gid  | Access Control - list of allowed groups                | mediumtext          | NO   |     | NULL                |                 |
 | deny_cid   | Access Control - list of denied contact.id             | mediumtext          | NO   |     | NULL                |                 |
 | deny_gid   | Access Control - list of denied groups                 | mediumtext          | NO   |     | NULL                |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@ -0,0 +1,24 @@
 Table fcontact
 ==============
 | Field    | Description   | Type             | Null | Key | Default             | Extra           |
 | -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
 | id       | sequential ID | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
 | guid     | unique id     | varchar(64)      | NO   |     |                     |                 |
 | url      |               | varchar(255)     | NO   |     |                     |                 |
 | name     |               | varchar(255)     | NO   |     |                     |                 |
 | photo    |               | varchar(255)     | NO   |     |                     |                 |
 | request  |               | varchar(255)     | NO   |     |                     |                 |
 | nick     |               | varchar(255)     | NO   |     |                     |                 |
 | addr     |               | varchar(255)     | NO   | MUL |                     |                 |
 | batch    |               | varchar(255)     | NO   |     |                     |                 |
 | notify   |               | varchar(255)     | NO   |     |                     |                 |
 | poll     |               | varchar(255)     | NO   |     |                     |                 |
 | confirm  |               | varchar(255)     | NO   |     |                     |                 |
 | priority |               | tinyint(1)       | NO   |     | 0                   |                 |
 | network  |               | varchar(32)      | NO   |     |                     |                 |
 | alias    |               | varchar(255)     | NO   |     |                     |                 |
 | pubkey   |               | text             | NO   |     | NULL                |                 |
 | updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@ -0,0 +1,16 @@
 Table fsuggest
 ==============
 | Field   | Description | Type         | Null | Key | Default             | Extra           |
 | ------- | ----------- | ------------ | ---- | --- | ------------------- | --------------- |
 | id      |             | int(11)      | NO   | PRI | NULL                | auto_increment  |
 | uid     |             | int(11)      | NO   |     | 0                   |                 |
 | cid     |             | int(11)      | NO   |     | 0                   |                 |
 | name    |             | varchar(255) | NO   |     |                     |                 |
 | url     |             | varchar(255) | NO   |     |                     |                 |
 | request |             | varchar(255) | NO   |     |                     |                 |
 | photo   |             | varchar(255) | NO   |     |                     |                 |
 | note    |             | text         | NO   |     | NULL                |                 |
 | created |             | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_gcign.md
+++ b/doc/database/db_gcign.md
@ -0,0 +1,10 @@
 Table gcign
 ===========
 | Field | Description                    | Type    | Null | Key | Default | Extra           |
 | ----- | ------------------------------ | ------- | ---- | --- | ------- | --------------- |
 | id    | sequential ID                  | int(11) | NO   | PRI | NULL    | auto_increment  |
 | uid   | local user.id                  | int(11) | NO   | MUL | 0       |                 |
 | gcid  | gcontact.id of ignored contact | int(11) | NO   | MUL | 0       |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_gcontact.md
+++ b/doc/database/db_gcontact.md
@ -0,0 +1,32 @@
 Table gcontact
 ==============
 | Field        |Description                         | Type             | Null | Key | Default             | Extra          |
 |--------------|------------------------------------|------------------|------|-----|---------------------|----------------|
 | id           | sequential ID                      | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
 | name         | Name that this contact is known by | varchar(255)     | NO   |     |                     |                |
 | nick         | Nick- and user name of the contact | varchar(255)     | NO   |     |                     |                |
 | url          | Link to the contacts profile page  | varchar(255)     | NO   |     |                     |                |
 | nurl         |                                    | varchar(255)     | NO   | MUL |                     |                |
 | photo        | Link to the profile photo          | varchar(255)     | NO   |     |                     |                |
 | connect      |                                    | varchar(255)     | NO   |     |                     |                |
 | created      |                                    | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 | updated      |                                    | datetime         | YES  | MUL | 0001-01-01 00:00:00 |                |
 | last_contact |                                    | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 | last_failure |                                    | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 | location     |                                    | varchar(255)     | NO   |     |                     |                |
 | about        |                                    | text             | NO   |     | NULL                |                |
 | keywords     | puplic keywords (interests)        | text             | NO   |     | NULL                |                |
 | gender       |                                    | varchar(32)      | NO   |     |                     |                |
 | birthday     |                                    | varchar(32)      | NO   |     | 0001-01-01          |                |
 | community    | 1 if contact is forum account      | tinyint(1)       | NO   |     | 0                   |                |
 | hide         | 1 = should be hidden from search   | tinyint(1)       | NO   |     | 0                   |                |
 | nsfw         | 1 = contact posts nsfw content     | tinyint(1)       | NO   |     | 0                   |                |
 | network      | social network protocol            | varchar(255)     | NO   |     |                     |                |
 | addr         |                                    | varchar(255)     | NO   |     |                     |                |
 | notify       |                                    | text             | NO   |     |                     |                |
 | alias        |                                    | varchar(255)     | NO   |     |                     |                |
 | generation   |                                    | tinyint(3)       | NO   |     | 0                   |                |
 | server_url   | baseurl of the contacts server     | varchar(255)     | NO   |     |                     |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_glink.md
+++ b/doc/database/db_glink.md
@ -0,0 +1,13 @@
 Table glink
 ===========
 | Field   | Description      | Type             | Null | Key | Default             | Extra          |
 |---------|------------------|------------------|------|-----|---------------------|----------------|
 | id      | sequential ID    | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
 | cid     |                  | int(11)          | NO   | MUL | 0                   |                |
 | uid     |                  | int(11)          | NO   |     | 0                   |                |
 | gcid    |                  | int(11)          | NO   | MUL | 0                   |                |
 | zcid    |                  | int(11)          | NO   | MUL | 0                   |                |
 | updated |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@ -0,0 +1,12 @@
 Table group
 ===========
 | Field   | Description                                | Type             | Null | Key | Default | Extra           |
 | ------- | ------------------------------------------ | ---------------- | ---- | --- | ------- | --------------- |
 | id      | sequential ID                              | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
 | uid     | user.id owning this data                   | int(10) unsigned | NO   | MUL | 0       |                 |
 | visible | 1 indicates the member list is not private | tinyint(1)       | NO   |     | 0       |                 |
 | deleted | 1 indicates the group has been deleted     | tinyint(1)       | NO   |     | 0       |                 |
 | name    | human readable name of group               | varchar(255)     | NO   |     |         |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@ -0,0 +1,11 @@
 Table group_member
 ==================
 | Field      | Description                                                 | Type             | Null | Key | Default | Extra           |
 | ---------- | ----------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
 | id         | sequential ID                                               | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
 | uid        | user.id of the owner of this data                           | int(10) unsigned | NO   | MUL | 0       |                 |
 | gid        | groups.id of the associated group                           | int(10) unsigned | NO   |     | 0       |                 |
 | contact-id | contact.id  of the member assigned to the associated group  | int(10) unsigned | NO   |     | 0       |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@ -0,0 +1,24 @@
 Table gserver
 =============
 | Field            | Description               | Type             | Null | Key | Default             | Extra          |
 |------------------|---------------------------|------------------|------|-----|---------------------|----------------|
 | id               | sequential ID             | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
 | url              |                           | varchar(255)     | NO   |     |                     |                |
 | nurl             |                           | varchar(255)     | NO   | MUL |                     |                |
 | version          |                           | varchar(255)     | NO   |     |                     |                |
 | site_name        |                           | varchar(255)     | NO   |     |                     |                |
 | info             |                           | text             | NO   |     | NULL                |                |
 | register_policy  |                           | tinyint(1)       | NO   |     | 0                   |                |
 | registered-users |Number of registered users | int(10)          | NO   |     | 0                   |                |
 | poco             |                           | varchar(255)     | NO   |     |                     |                |
 | noscrape         |                           | varchar(255)     | NO   |     |                     |                |
 | network          |                           | varchar(32)      | NO   |     |                     |                |
 | platform         |                           | varchar(255)     | NO   |     |                     |                |
 | created          |                           | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 | last_poco_query  |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 | last_contact     |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 | last_failure     |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@ -0,0 +1,12 @@
 Table hook
 ==========
 | Field    | Description                                                                                                | Type             | Null | Key | Default | Extra           |
 | -------- | ---------------------------------------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
 | id       | sequential ID                                                                                              | int(11)          | NO   | PRI | NULL    | auto_increment  |
 | hook     | name of hook                                                                                               | varchar(255)     | NO   | MUL |         |                 |
 | file     | relative filename of hook handler                                                                          | varchar(255)     | NO   |     |         |                 |
 | function | function name of hook handler                                                                              | varchar(255)     | NO   |     |         |                 |
 | priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | int(11) unsigned | NO   |     | 0       |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@ -0,0 +1,18 @@
 Table intro
 ===========
 | Field      | Description      | Type             | Null | Key | Default             | Extra          |
 |------------|------------------|------------------|------|-----|---------------------|----------------|
 | id         | sequential ID    | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
 | uid        |                  | int(10) unsigned | NO   |     | 0                   |                |
 | fid        |                  | int(11)          | NO   |     | 0                   |                |
 | contact-id |                  | int(11)          | NO   |     | 0                   |                |
 | knowyou    |                  | tinyint(1)       | NO   |     | 0                   |                |
 | duplex     |                  | tinyint(1)       | NO   |     | 0                   |                |
 | note       |                  | text             | NO   |     | NULL                |                |
 | hash       |                  | varchar(255)     | NO   |     |                     |                |
 | datetime   |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 | blocked    |                  | tinyint(1)       | NO   |     | 1                   |                |
 | ignore     |                  | tinyint(1)       | NO   |     | 0                   |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_item.md
+++ b/doc/database/db_item.md
@ -0,0 +1,72 @@
 Table item
 ==========
 | Field         | Description                                                                                                                                                | Type                | Null | Key | Default             | Extra          |
 |---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|------|-----|---------------------|----------------|
 | id            | sequential ID                                                                                                                                              | int(10) unsigned    | NO   | PRI | NULL                | auto_increment |
 | guid          | A unique identifier for this item                                                                                                                          | varchar(255)        | NO   | MUL |                     |                |
 | uri           |                                                                                                                                                            | varchar(255)        | NO   | MUL |                     |                |
 | uid           | user.id which owns this copy of the item                                                                                                                   | int(10) unsigned    | NO   | MUL | 0                   |                |
 | contact-id    | contact.id                                                                                                                                                 | int(11)             | NO   | MUL | 0                   |                |
 | gcontact-id   | ID of the global contact                                                                                                                                   | int(11)             | NO   | MUL | 0                   |                |
 | type          |                                                                                                                                                            | varchar(255)        | NO   |     |                     |                |
 | wall          | This item was posted to the wall of uid                                                                                                                    | tinyint(1)          | NO   | MUL | 0                   |                |
 | gravity       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | parent        | item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item                                        | int(10) unsigned    | NO   | MUL | 0                   |                |
 | parent-uri    | uri of the parent to this item                                                                                                                             | varchar(255)        | NO   | MUL |                     |                |
 | extid         |                                                                                                                                                            | varchar(255         | NO   | MUL |                     |                |
 | thr-parent    | If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri                     | varchar(255)        | NO   |     |                     |                |
 | created       | Creation timestamp.                                                                                                                                        | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | edited        | Date of  last edit (default is created)                                                                                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | commented     | Date of last comment/reply to this item                                                                                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | received      | datetime                                                                                                                                                   | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | changed       | Date that something in the conversation changed, indicating clients should fetch the conversation again                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | owner-name    | Name of the owner of this item                                                                                                                             | varchar(255)        | NO   |     |                     |                |
 | owner-link    | Link to the profile page of the owner of this item                                                                                                         | varchar(255)        | NO   |     |                     |                |
 | owner-avatar  | Link to the avatar picture of the owner of this item                                                                                                       | varchar(255)        | NO   |     |                     |                |
 | owner-id      | Link to the contact table with uid=0 of the owner of this item                                                                                             | int(11)             | NO   | MUL | 0                   |                |
 | author-name   | Name of the author of this item                                                                                                                            | varchar(255)        | NO   |     |                     |                |
 | author-link   | Link to the profile page of the author of this item                                                                                                        | varchar(255)        | NO   |     |                     |                |
 | author-avatar | Link to the avatar picture of the author of this item                                                                                                      | varchar(255)        | NO   |     |                     |                |
 | author-id     | Link to the contact table with uid=0 of the author of this item                                                                                            | int(11)             | NO   | MUL | 0                   |                |
 | title         | item title                                                                                                                                                 | varchar(255)        | NO   |     |                     |                |
 | body          | item body content                                                                                                                                          | mediumtext          | NO   |     | NULL                |                |
 | app           | application which generated this item                                                                                                                      | varchar(255)        | NO   |     |                     |                |
 | verb          | ActivityStreams verb                                                                                                                                       | varchar(255)        | NO   |     |                     |                |
 | object-type   | ActivityStreams object type                                                                                                                                | varchar(255)        | NO   |     |                     |                |
 | object        | JSON encoded object structure unless it is an implied object (normal post)                                                                                 | text                | NO   |     | NULL                |                |
 | target-type   | ActivityStreams target type if applicable (URI)                                                                                                            | varchar(255)        | NO   |     |                     |                |
 | target        | JSON encoded target structure if used                                                                                                                      | text                | NO   |     | NULL                |                |
 | postopts      | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text                | NO   |     | NULL                |                |
 | plink         | permalink or URL toa displayable copy  of the message at its source                                                                                        | varchar(255)        | NO   |     |                     |                |
 | resource-id   | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type                                  | varchar(255)        | NO   | MUL |                     |                |
 | event-id      | Used to link to the event.id                                                                                                                               | int(11)             | NO   |     | 0                   |                |
 | tag           |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
 | attach        | JSON structure representing attachments to this item                                                                                                       | mediumtext          | NO   |     | NULL                |                |
 | inform        |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
 | file          |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
 | location      | text location where this item originated                                                                                                                   | varchar(255)        | NO   |     |                     |                |
 | coord         | longitude/latitude pair representing location where this item originated                                                                                   | varchar(255)        | NO   |     |                     |                |
 | allow_cid     | Access Control - list of allowed contact.id '<19><78>'                                                                                                     | mediumtext          | NO   |     | NULL                |                |
 | allow_gid     | Access Control - list of allowed groups                                                                                                                    | mediumtext          | NO   |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id                                                                                                                 | mediumtext          | NO   |     | NULL                |                |
 | deny_gid      | Access Control - list of denied groups                                                                                                                     | mediumtext          | NO   |     | NULL                |                |
 | private       | distribution is restricted                                                                                                                                 | tinyint(1)          | NO   |     | 0                   |                |
 | pubmail       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | moderated     |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | visible       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | spam          |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | starred       | item has been favourited                                                                                                                                   | tinyint(1)          | NO   |     | 0                   |                |
 | bookmark      | item has been bookmarked                                                                                                                                   | tinyint(1)          | NO   |     | 0                   |                |
 | unseen        | item has not been seen                                                                                                                                     | tinyint(1)          | NO   |     | 1                   |                |
 | deleted       | item has been deleted                                                                                                                                      | tinyint(1)          | NO   | MUL | 0                   |                |
 | origin        | item originated at this site                                                                                                                               | tinyint(1)          | NO   |     | 0                   |                |
 | forum_mode    |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 | last-child    |                                                                                                                                                            | tinyint(1) unsigned | NO   |     | 1                   |                |
 | mention       | The owner of this item was mentioned in it                                                                                                                 | tinyint(1)          | NO   |     | 0                   |                |
 | network       | Network from where the item comes from                                                                                                                     | varchar(32)         | NO   |     |                     |                |
 | rendered-hash |                                                                                                                                                            | varchar(32)         | NO   |     |                     |                |
 | rendered-html | item.body converted to html                                                                                                                                | mediumtext          | NO   |     | NULL                |                |
 | global        |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@ -0,0 +1,11 @@
 Table locks
 ===========
 | Field   | Description      | Type             | Null | Key | Default             | Extra          |
 |---------|------------------|------------------|------|-----|---------------------|----------------|
 | id      | sequential ID    | int(11)          | NO   | PRI | NULL                | auto_increment |
 | name    |                  | varchar(128)     | NO   |     |                     |                |
 | locked  |                  | tinyint(1)       | NO   |     | 0                   |                |
 | pid     | Process ID       | int(10) unsigned | NO   |     | 0                   |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@ -0,0 +1,24 @@
 Table mail
 ==========
 | Field      | Description                                  | Type             | Null | Key | Default             | Extra           |
 | ---------- | -------------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
 | id         | sequential ID                                | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
 | uid        | user.id of the owner of this data            | int(10) unsigned | NO   | MUL | 0                   |                 |
 | guid       | A unique identifier for this private message | int(10) unsigned | NO   | MUL |                     |                 |
 | from-name  | name of the sender                           | varchar(255)     | NO   |     |                     |                 |
 | from-photo | contact photo link of the sender             | varchar(255)     | NO   |     |                     |                 |
 | from-url   | profile linke of the sender                  | varchar(255)     | NO   |     |                     |                 |
 | contact-id | contact.id                                   | varchar(255)     | NO   |     |                     |                 |
 | convid     | conv.id                                      | int(11) unsigned | NO   | MUL | 0                   |                 |
 | title      |                                              | varchar(255)     | NO   |     |                     |                 |
 | body       |                                              | mediumtext       | NO   |     | NULL                |                 |
 | seen       | if message visited it is 1                   | varchar(255)     | NO   |     | 0                   |                 |
 | reply      |                                              | varchar(255)     | NO   | MUL | 0                   |                 |
 | replied    |                                              | varchar(255)     | NO   |     | 0                   |                 |
 | unknown    | if sender not in the contact table this is 1 | varchar(255)     | NO   |     | 0                   |                 |
 | uri        |                                              | varchar(255)     | NO   | MUL |                     |                 |
 | parent-uri |                                              | varchar(255)     | NO   | MUL |                     |                 |
 | created    | creation time of the private message         | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@ -0,0 +1,20 @@
 Table mailacct
 ==============
 | Field        | Description      | Type         | Null | Key | Default             | Extra          |
 |--------------|------------------|--------------|------|-----|---------------------|----------------|
 | id           | sequential ID    | int(11)      | NO   | PRI | NULL                | auto_increment |
 | uid          |                  | int(11)      | NO   |     | 0                   |                |
 | server       |                  | varchar(255) | NO   |     |                     |                |
 | port         |                  | int(11)      | NO   |     | 0                   |                |
 | ssltype      |                  | varchar(16)  | NO   |     |                     |                |
 | mailbox      |                  | varchar(255) | NO   |     |                     |                |
 | user         |                  | varchar(255) | NO   |     |                     |                |
 | pass         |                  | text         | NO   |     | NULL                |                |
 | reply_to     |                  | varchar(255) | NO   |     |                     |                |
 | action       |                  | int(11)      | NO   |     | 0                   |                |
 | movetofolder |                  | varchar(255) | NO   |     |                     |                |
 | pubmail      |                  | tinyint(1)   | NO   |     | 0                   |                |
 | last_check   |                  | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@ -0,0 +1,10 @@
 Table manage
 ============
 | Field | Description   | Type    | Null | Key | Default | Extra           |
 | ----- | ------------- | ------- | ---- | --- | ------- | --------------- |
 | id    | sequential ID | int(11) | NO   | PRI | NULL    | auto_increment  |
 | uid   | user.id       | int(11) | NO   | MUL | 0       |                 |
 | mid   |               | int(11) | NO   |     | 0       |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@ -0,0 +1,12 @@
 Table notify-threads
 ====================
 | Field              | Description      | Type             | Null | Key | Default | Extra          |
 |--------------------|------------------|------------------|------|-----|---------|----------------|
 | id                 | sequential ID    | int(11)          | NO   | PRI | NULL    | auto_increment |
 | notify-id          |                  | int(11)          | NO   |     | 0       |                |
 | master-parent-item |                  | int(10) unsigned | NO   | MUL | 0       |                |
 | parent-item        |                  | int(10) unsigned | NO   |     | 0       |                |
 | receiver-uid       |                  | int(11)          | NO   | MUL | 0       |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@ -0,0 +1,24 @@
 Table notify
 ============
 | Field      | Description                       | Type         | Null | Key | Default             | Extra           |
 | ---------- | --------------------------------- | ------------ | ---- | --- | ------------------- | --------------- |
 | id         | sequential ID                     | int(11)      | NO   | PRI | NULL                | auto_increment  |
 | hash       |                                   | varchar(64)  | NO   |     |                     |                 |
 | type       |                                   | int(11)      | NO   |     | 0                   |                 |
 | name       |                                   | varchar(255) | NO   |     |                     |                 |
 | url        |                                   | varchar(255) | NO   |     |                     |                 |
 | photo      |                                   | varchar(255) | NO   |     |                     |                 |
 | date       |                                   | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
 | msg        |                                   | mediumtext   | YES  |     | NULL                |                 |
 | uid        | user.id of the owner of this data | int(11)      | NO   | MUL | 0                   |                 |
 | link       |                                   | varchar(255) | NO   |     |                     |                 |
 | iid        | item.id                           | int(11)      | NO   |     | 0                   |                 |
 | parent     |                                   | int(11)      | NO   |     | 0                   |                 |
 | seen       |                                   | tinyint(1)   | NO   |     | 0                   |                 |
 | verb       |                                   | varchar(255) | NO   |     |                     |                 |
 | otype      |                                   | varchar(16)  | NO   |     |                     |                 |
 | name_cache | Cached bbcode parsing of name     | tinytext     | YES  |     | NULL                |                 |
 | msg_cache  | Cached bbcode parsing of msg      | mediumtext   | YES  |     | NULL                |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@ -0,0 +1,11 @@
 Table oembed
 ============
 | Field        | Description                        | Type         | Null | Key | Default             | Extra |
 | ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
 | url          | page url                           | varchar(255) | NO   | PRI | NULL                |       |
 | maxwidth     | Maximum width passed to Oembed     | int(11)      | NO   | PRI | 0                   |       |
 | content      | OEmbed data of the page            | text         | NO   |     | NULL                |       |
 | created      | datetime of creation               | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@ -0,0 +1,12 @@
 Table parsed_url
 ================
 | Field        | Description                        | Type         | Null | Key | Default             | Extra |
 | ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
 | url          | page url                           | varchar(255) | NO   | PRI | NULL                |       |
 | guessing     | is the "guessing" mode active?     | tinyint(1)   | NO   | PRI | 0                   |       |
 | oembed       | is the data the result of oembed?  | tinyint(1)   | NO   | PRI | 0                   |       |
 | content      | page data                          | text         | NO   |     | NULL                |       |
 | created      | datetime of creation               | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_particiation.md
+++ b/doc/database/db_particiation.md
@ -0,0 +1,10 @@
 Table participation
 ===================
 | Field       | Description      | Type             | Null | Key | Default             | Extra |
 |-------------|------------------|------------------|------|-----|---------------------|-------|
 | iid         | item id          | int(10) unsigned | NO   | PRI |                     |       |
 | server      | Name of server   | varchar(60)      | NO   | PRI |                     |       |
 | cid         | contact id       | int(10) unsigned | NO   |     |                     |       |
 Return to [database documentation](help/database)
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@ -0,0 +1,12 @@
 Table pconfic
 =============
 | Field | Description | Type       | Null | Key | Default | Extra          |
 |-------|-------------|------------|------|-----|---------|----------------|
 | id    |             | int(11)    | NO   | PRI | NULL    | auto_increment |
 | uid   |             | int(11)    | NO   | MUL | 0       |                |
 | cat   |             | char(255)  | NO   |     |         |                |
 | k     |             | char(255)  | NO   |     |         |                |
 | v     |             | mediumtext | NO   |     | NULL    |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@ -0,0 +1,29 @@
 Table photo
 ===========
 | Field       | Description                                            | Type             | Null | Key | Default             | Extra           |
 | ----------- | ------------------------------------------------------ | ---------------- | ---- | --- | ------------------- | --------------- |
 | id          | sequential ID                                          | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
 | uid         | user.id of the owner of this data                      | int(10) unsigned | NO   | MUL | 0                   |                 |
 | contact-id  | contact.id                                             | int(10) unsigned | NO   |     | 0                   |                 |
 | guid        | A unique identifier for this photo                     | varchar(64)      | NO   | MUL |                     |                 |
 | resource-id |                                                        | varchar(255)     | NO   | MUL |                     |                 |
 | created     | creation date                                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 | edited      | last edited date                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 | title       |                                                        | varchar(255)     | NO   |     |                     |                 |
 | desc        |                                                        | text             | NO   |     | NULL                |                 |
 | album       | The name of the album to which the photo belongs       | varchar(255)     | NO   |     |                     |                 |
 | filename    |                                                        | varchar(255)     | NO   |     |                     |                 |
 | type        |  image type                                            | varchar(128)     | NO   |     | image/jpeg          |                 |
 | height      |                                                        | smallint(6)      | NO   |     | 0                   |                 |
 | width       |                                                        | smallint(6)      | NO   |     | 0                   |                 |
 | size        |                                                        | int(10) unsigned | NO   |     | 0                   |                 |
 | data        |                                                        | mediumblob       | NO   |     | NULL                |                 |
 | scale       |                                                        | tinyint(3)       | NO   |     | 0                   |                 |
 | profile     |                                                        | tinyint(1)       | NO   |     | 0                   |                 |
 | allow_cid   | Access Control - list of allowed contact.id '<19><78>' | mediumtext       | NO   |     | NULL                |                 |
 | allow_gid   | Access Control - list of allowed groups                | mediumtext       | NO   |     | NULL                |                 |
 | deny_cid    | Access Control - list of denied contact.id             | mediumtext       | NO   |     | NULL                |                 |
 | deny_gid    | Access Control - list of denied groups                 | mediumtext       | NO   |     | NULL                |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_poll.md
+++ b/doc/database/db_poll.md
@ -0,0 +1,19 @@
 Table poll
 ==========
 | Field | Description | Type       | Null | Key | Default | Extra          |
 |-------|-------------|------------|------|-----|---------|----------------|
 | id    |             | int(11)    | NO   | PRI | NULL    | auto_increment |
 | uid   |             | int(11)    | NO   | MUL | 0       |                |
 | q0    |             | mediumtext | NO   |     | NULL    |                |
 | q1    |             | mediumtext | NO   |     | NULL    |                |
 | q2    |             | mediumtext | NO   |     | NULL    |                |
 | q3    |             | mediumtext | NO   |     | NULL    |                |
 | q4    |             | mediumtext | NO   |     | NULL    |                |
 | q5    |             | mediumtext | NO   |     | NULL    |                |
 | q6    |             | mediumtext | NO   |     | NULL    |                |
 | q7    |             | mediumtext | NO   |     | NULL    |                |
 | q8    |             | mediumtext | NO   |     | NULL    |                |
 | q9    |             | mediumtext | NO   |     | NULL    |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_poll_result.md
+++ b/doc/database/db_poll_result.md
@ -0,0 +1,10 @@
 Table poll_result
 =================
 | Field   | Description      | Type    | Null | Key | Default | Extra          |
 |---------|------------------|---------|------|-----|---------|----------------|
 | id      | sequential ID    | int(11) | NO   | PRI | NULL    | auto_increment |
 | poll_id |                  | int(11) | NO   | MUL | 0       |                |
 | choice  |                  | int(11) | NO   | MUL | 0       |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@ -0,0 +1,48 @@
 Table profile
 =============
 | Field        | Description                                   | Type         | Null | Key | Default             | Extra          |
 |--------------|-----------------------------------------------|--------------|------|-----|---------------------|----------------|
 | id           | sequential ID                                 | int(11)      | NO   | PRI | NULL                | auto_increment |
 | uid          | user.id of the owner of this data             | int(11)      | NO   |     | 0                   |                |
 | profile-name | Name of the profile                           | varchar(255) | NO   |     |                     |                |
 | is-default   | Mark this profile as default profile          | tinyint(1)   | NO   |     | 0                   |                |
 | hide-friends | Hide friend list from viewers of this profile | tinyint(1)   | NO   |     | 0                   |                |
 | name         |                                               | varchar(255) | NO   |     |                     |                |
 | pdesc        | Title or description                          | varchar(255) | NO   |     |                     |                |
 | dob          | Day of birth                                  | varchar(32)  | NO   |     | 0001-01-01          |                |
 | address      |                                               | varchar(255) | NO   |     |                     |                |
 | locality     |                                               | varchar(255) | NO   |     |                     |                |
 | region       |                                               | varchar(255) | NO   |     |                     |                |
 | postal-code  |                                               | varchar(32)  | NO   |     |                     |                |
 | country-name |                                               | varchar(255) | NO   |     |                     |                |
 | hometown     |                                               | varchar(255) | NO   | MUL |                     |                |
 | gender       |                                               | varchar(32)  | NO   |     |                     |                |
 | marital      |                                               | varchar(255) | NO   |     |                     |                |
 | with         |                                               | text         | NO   |     | NULL                |                |
 | howlong      |                                               | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 | sexual       |                                               | varchar(255) | NO   |     |                     |                |
 | politic      |                                               | varchar(255) | NO   |     |                     |                |
 | religion     |                                               | varchar(255) | NO   |     |                     |                |
 | pub_keywords |                                               | text         | NO   |     | NULL                |                |
 | prv_keywords |                                               | text         | NO   |     | NULL                |                |
 | likes        |                                               | text         | NO   |     | NULL                |                |
 | dislikes     |                                               | text         | NO   |     | NULL                |                |
 | about        |                                               | text         | NO   |     | NULL                |                |
 | summary      |                                               | varchar(255) | NO   |     |                     |                |
 | music        |                                               | text         | NO   |     | NULL                |                |
 | book         |                                               | text         | NO   |     | NULL                |                |
 | tv           |                                               | text         | NO   |     | NULL                |                |
 | film         |                                               | text         | NO   |     | NULL                |                |
 | interest     |                                               | text         | NO   |     | NULL                |                |
 | romance      |                                               | text         | NO   |     | NULL                |                |
 | work         |                                               | text         | NO   |     | NULL                |                |
 | education    |                                               | text         | NO   |     | NULL                |                |
 | contact      |                                               | text         | NO   |     | NULL                |                |
 | homepage     |                                               | varchar(255) | NO   |     |                     |                |
 | photo        |                                               | varchar(255) | NO   |     |                     |                |
 | thumb        |                                               | varchar(255) | NO   |     |                     |                |
 | publish      | publish default profile in local directory    | tinyint(1)   | NO   |     | 0                   |                |
 | net-publish  | publish profile in global directory           | tinyint(1)   | NO   |     | 0                   |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@ -0,0 +1,13 @@
 Table profile_check
 ===================
 | Field    | Description   | Type             | Null | Key | Default | Extra           |
 | -------- | ------------- | ---------------- | ---- | --- | ------- | --------------- |
 | id       | sequential ID | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
 | uid      | user.id       | int(10) unsigned | NO   |     | 0       |                 |
 | cid      | contact.id    | int(10) unsigned | NO   |     | 0       |                 |
 | dfrn_id  |               | varchar(255)     | NO   |     |         |                 |
 | sec      |               | varchar(255)     | NO   |     | 0       |                 |
 | expire   |               | int(11)          | NO   |     | NULL    |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@ -0,0 +1,10 @@
 Table push_subscriber
 =====================
 | Field   | Description      | Type    | Null | Key | Default | Extra          |
 |---------|------------------|---------|------|-----|---------|----------------|
 | id      | sequential ID    | int(11) | NO   | PRI | NULL    | auto_increment |
 | poll_id |                  | int(11) | NO   | MUL | 0       |                |
 | choice  |                  | int(11) | NO   | MUL | 0       |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_queue.md
+++ b/doc/database/db_queue.md
@ -0,0 +1,14 @@
 Table queue
 ===========
 | Field   | Description      | Type        | Null | Key | Default             | Extra          |
 |---------|------------------|-------------|------|-----|---------------------|----------------|
 | id      | sequential ID    | int(11)     | NO   | PRI | NULL                | auto_increment |
 | cid     |                  | int(11)     | NO   | MUL | 0                   |                |
 | network |                  | varchar(32) | NO   | MUL |                     |                |
 | created |                  | datetime    | NO   | MUL | 0001-01-01 00:00:00 |                |
 | last    |                  | datetime    | NO   | MUL | 0001-01-01 00:00:00 |                |
 | content |                  | mediumtext  | NO   |     | NULL                |                |
 | batch   |                  | tinyint(1)  | NO   | MUL | 0                   |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@ -0,0 +1,13 @@
 Table register
 ==============
 | Field    | Description   | Type             | Null | Key | Default             | Extra           |
 | -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
 | id       | sequential ID | int(11) unsigned | NO   | PRI | NULL                | auto_increment  |
 | hash     |               | varchar(255)     | NO   |     |                     |                 |
 | created  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
 | uid      | user.id       | int(11) unsigned | NO   |     |                     |                 |
 | password |               | varchar(255)     | NO   |     |                     |                 |
 | language |               | varchar(16)      | NO   |     |                     |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@ -0,0 +1,10 @@
 Table search
 ============
 | Field | Description      | Type         | Null | Key | Default | Extra          |
 |-------|------------------|--------------|------|-----|---------|----------------|
 | id    | sequential ID    | int(11)      | NO   | PRI | NULL    | auto_increment |
 | uid   |                  | int(11)      | NO   | MUL | 0       |                |
 | term  |                  | varchar(255) | NO   | MUL |         |                |
 Return to [database documentation](help/database)
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@ -0,0 +1,11 @@
 Table session
 =============
 | Field  | Description   | Type                | Null | Key | Default | Extra           |
 | ------ | ------------- | ------------------- | ---- | --- | ------- | --------------- |
 | id     | sequential ID | bigint(20) unsigned | NO   | PRI | NULL    | auto_increment  |
 | sid    |               | varchar(255)        | NO   | MUL |         |                 |
 | data   |               | text                | NO   |     | NULL    |                 |
 | expire |               | int(10) unsigned    | NO   | MUL | 0       |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_sign.md
+++ b/doc/database/db_sign.md
@ -0,0 +1,12 @@
 Table sign
 ==========
 | Field        | Description   | Type             | Null | Key | Default | Extra           |
 | ------------ | ------------- | ---------------- | ---- | --- | ------- | --------------- |
 | id           | sequential ID | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
 | iid          | item.id       | int(10) unsigned | NO   | MUL | 0       |                 |
 | signed_text  |               | mediumtext       | NO   |     | NULL    |                 |
 | signature    |               | text             | NO   |     | NULL    |                 |
 | signer       |               | varchar(255)     | NO   |     |         |                 |
 Return to [database documentation](help/database)
--- a/doc/database/db_term.md
+++ b/doc/database/db_term.md
@ -0,0 +1,19 @@
 Table term
 ==========
 | Field    | Description   | Type                | Null | Key | Default             | Extra          |
 |----------| ------------- |---------------------|------|-----|---------------------|----------------|
 | tid      |               | int(10) unsigned    | NO   | PRI | NULL                | auto_increment |
 | oid      |               | int(10) unsigned    | NO   | MUL | 0                   |                |
 | otype    |               | tinyint(3) unsigned | NO   | MUL | 0                   |                |
 | type     |               | tinyint(3) unsigned | NO   | MUL | 0                   |                |
 | term     |               | varchar(255)        | NO   |     |                     |                |
 | url      |               | varchar(255)        | NO   |     |                     |                |
 | aid      |               | int(10) unsigned    | NO   |     | 0                   |                |
 | uid      |               | int(10) unsigned    | NO   | MUL | 0                   |                |
 | guid     |               | varchar(255)        | NO   | MUL |                     |                |
 | created  |               | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | received |               | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
 | global   |               | tinyint(1)          | NO   |     | 0                   |                |
 Return to [database documentation](help/database)
--- a/Show more
+++ b/Show more