Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2

Signed-off-by: Roland Häder <roland@mxchange.org>
2025-01-23 01:02:38 +01:00 · 2017-06-13 23:26:06 +02:00 · 2017-06-13 23:26:06 +02:00 · 4e49939421
commit 4e49939421
parent e9c9c47a84 de5a0dadb0
165 changed files with 63565 additions and 40577 deletions
--- a/148
+++ b/148
@ -1,10 +1,64 @@
+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, hypolite, 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 [heluecht, thanks to Vít Šesták 'v6ak' for reporting the problem]
+    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 [heluecht]
+    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]
@ -12,22 +66,22 @@ Version 3.5.1 (2017-03-12)
    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 [heluecht]
+    Improvements to the database handling [annando]
    Improvements to the admin panel [tobiasd, Hypolite]
-    Improvements to the update process [heluecht]
-    Improvements to the handling of worker processes [heluecht]
-    Improvements to the performance [heluecht, 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 [heluecht]
+    Improvements to the OStatus protocol implementation [annando]
    Improvements to the installation wizzard [tobiasd]
-    Improvements to the Diaspora connectivity [heluecht, Hypolite]
+    Improvements to the Diaspora connectivity [annando, Hypolite]
    Work on PHP7 compatibility [ddorian1]
    Code cleanup [Hypolite, Quix0r]
-    Initial federation with Mastodon [heluecht]
-    The worker process can now also be started from the frontend [heluecht]
-    Deletion of postings is now done in the background [heluecht]
-    Extension of the DFRN transmitted information fields [heluecht]
+    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]
@ -46,16 +100,16 @@ Version 3.5.1 (2017-03-12)
    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 [heluecht]
-    Improvements to the jappixmini addon [heluecht]
-    Improvements to the gpluspost addon [heluecht]
-    Improvements to the performance of the Twitter bridge when using workers [heluecht]
-    Diaspora Export addon is now working again [heluecht]
+    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 [heluecht]
+    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 [heluecht]
-    Twitter-bridge now supports quotes and long posts when importing tweets [heluecht]
+    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, 
@ -67,48 +121,48 @@ Version 3.5.1 (2017-03-12)

 Version 3.5 (2016-09-13)
  Friendica Core:
-    NEW Optional local directory with possible federated contacts [heluecht]
+    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, heluecht, 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, heluecht, 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 [heluecht]
-    Code cleanup [heluecht, QuixOr]
-    Improvements to the API and Friendica specific extensions [heluecht, fabrixxm, gerhard6380]
+    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) [heluecht]
-    Improvements on the themes (quattro, vier, frost) [rabuzarus, fabrixxm, stieben, heluecht, Quix0r, tobiasd]
+    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 [heluecht]
-    Improvements to the UI (contacts, hotkeys, remember me, ARIA, code hightlighting) [rabuzarus, heluecht, tobiasd]
-    Improvements to the background process (poller, worker) [heluecht]
-    Improvements to the admin panel [tobiasd, heluecht, fabrixxm]
-    Improvements to the performance [heluecht]
+    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 [heluecht]
-    Improvements to the DDoS detection [heluecht]
-    Improvements to the calendar/events module [heluecht, rabuzarus]
+    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 [heluecht]
-    Reworked the notifications code [fabrixxm, rabuzarus, heluecht]
+    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 [heluecht]
-    Removed now unused simplepie from library [heluecht]
+    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 [heluecht]
-    Pumpio Connector [heluecht]
-    Rendertime [heluecht]
-    wppost [heluecht]
+    Twitter Connector [annando]
+    Pumpio Connector [annando]
+    Rendertime [annando]
+    wppost [annando]
    showmore [rabuzarus]
-    fromgplus [heluecht]
-    app.net Connector [heluecht]
-    GNU Social Connector [heluecht]
+    fromgplus [annando]
+    app.net Connector [annando]
+    GNU Social Connector [annando]
    LDAP [Olivier Mehani]
    smileybutton [rabuzarus]
    retriver [mexon]
--- a/INSTALL.txt
+++ b/INSTALL.txt
@ -71,9 +71,14 @@ 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
-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. 
+note any error messages and correct these before continuing.
+
+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:

--- a/2
+++ b/2
@ -1 +1 @@
-3.5.2-dev
+3.5.3-dev
--- a/boot.php
+++ b/boot.php
@ -35,12 +35,13 @@ require_once 'include/features.php';
 require_once 'include/identity.php';
 require_once 'update.php';
 require_once 'include/dbstructure.php';
+require_once 'include/poller.php';

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
-define ( 'FRIENDICA_VERSION',      '3.5.2-dev' );
+define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1224      );
+define ( 'DB_UPDATE_VERSION',      1229      );

 /**
 * @brief Constant with a HTML line break.
@ -457,6 +458,13 @@ if (!defined("SIGTERM")) {
 	define("SIGTERM", 15);
 }

+/**
+ * Depending on the PHP version this constant does exist - or not.
+ * See here: http://php.net/manual/en/curl.constants.php#117928
+ */
+if (!defined('CURLE_OPERATION_TIMEDOUT')) {
+        define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
+}
 /**
 *
 * Reverse the effect of magic_quotes_gpc if it is enabled.
@ -985,7 +993,7 @@ function notice($s) {
 function info($s) {
 	$a = get_app();

-	if (local_user() AND get_pconfig(local_user(), 'system', 'ignore_info')) {
+	if (local_user() && get_pconfig(local_user(), 'system', 'ignore_info')) {
 		return;
 	}

@ -1055,7 +1063,7 @@ function proc_run($cmd) {
 	$arr = array('args' => $args, 'run_cmd' => true);

 	call_hooks("proc_run", $arr);
-	if (!$arr['run_cmd'] OR ! count($args)) {
+	if (!$arr['run_cmd'] || ! count($args)) {
 		return;
 	}

@ -1088,18 +1096,8 @@ function proc_run($cmd) {
 		return;
 	}

-	// Checking number of workers
-	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
-
-	// Get number of allowed number of worker threads
-	$queues = intval(get_config("system", "worker_queues"));
-
-	if ($queues == 0) {
-		$queues = 4;
-	}
-
 	// If there are already enough workers running, don't fork another one
-	if ($workers[0]["workers"] >= $queues) {
+	if (poller_too_much_workers()) {
 		return;
 	}

@ -1375,7 +1373,7 @@ function get_server() {
 	$server = get_config("system", "directory");

 	if ($server == "") {
-		$server = "http://dir.friendi.ca";
+		$server = "http://dir.friendica.social";
 	}

 	return($server);
@ -1409,7 +1407,7 @@ function clear_cache($basepath = "", $path = "") {
 		$path = $basepath;
 	}

-	if (($path == "") OR (!is_dir($path))) {
+	if (($path == "") || (!is_dir($path))) {
 		return;
 	}

@ -1426,10 +1424,10 @@ function clear_cache($basepath = "", $path = "") {
 		if ($dh = opendir($path)) {
 			while (($file = readdir($dh)) !== false) {
 				$fullpath = $path . "/" . $file;
-				if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
+				if ((filetype($fullpath) == "dir") && ($file != ".") && ($file != "..")) {
 					clear_cache($basepath, $fullpath);
 				}
-				if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
+				if ((filetype($fullpath) == "file") && (filectime($fullpath) < (time() - $cachetime))) {
 					unlink($fullpath);
 				}
 			}
@ -1446,7 +1444,7 @@ function get_itemcachepath() {
 	}

 	$itemcache = get_config('system', 'itemcache');
-	if (($itemcache != "") AND App::directory_usable($itemcache)) {
+	if (($itemcache != "") && App::directory_usable($itemcache)) {
 		return $itemcache;
 	}

@ -1473,7 +1471,7 @@ function get_itemcachepath() {
 */
 function get_spoolpath() {
 	$spoolpath = get_config('system', 'spoolpath');
-	if (($spoolpath != "") AND App::directory_usable($spoolpath)) {
+	if (($spoolpath != "") && App::directory_usable($spoolpath)) {
 		// We have a spool path and it is usable
 		return $spoolpath;
 	}
@ -1508,7 +1506,7 @@ function get_temppath() {

 	$temppath = get_config("system", "temppath");

-	if (($temppath != "") AND App::directory_usable($temppath)) {
+	if (($temppath != "") && App::directory_usable($temppath)) {
 		// We have a temp path and it is usable
 		return $temppath;
 	}
@ -1517,7 +1515,7 @@ function get_temppath() {
 	$temppath = sys_get_temp_dir();

 	// Check if it is usable
-	if (($temppath != "") AND App::directory_usable($temppath)) {
+	if (($temppath != "") && App::directory_usable($temppath)) {
 		// To avoid any interferences with other systems we create our own directory
 		$new_temppath = $temppath . "/" . $a->get_hostname();
 		if (!is_dir($new_temppath)) {
@ -1640,7 +1638,7 @@ function argv($x) {
 function infinite_scroll_data($module) {

 	if (get_pconfig(local_user(), 'system', 'infinite_scroll')
-		AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
+		&& ($module == "network") && ($_GET["mode"] != "minimal")) {

 		// get the page number
 		if (is_string($_GET["page"])) {
@ -1653,12 +1651,12 @@ function infinite_scroll_data($module) {

 		// try to get the uri from which we load the content
 		foreach ($_GET AS $param => $value) {
-			if (($param != "page") AND ($param != "q")) {
+			if (($param != "page") && ($param != "q")) {
 				$reload_uri .= "&" . $param . "=" . urlencode($value);
 			}
 		}

-		if (($a->page_offset != "") AND ! strstr($reload_uri, "&offset=")) {
+		if (($a->page_offset != "") && ! strstr($reload_uri, "&offset=")) {
 			$reload_uri .= "&offset=" . urlencode($a->page_offset);
 		}

--- a/database.sql
+++ b/database.sql
@ -1,6 +1,6 @@
 -- ------------------------------------------
-- Friendica 3.5.2-dev (Asparagus)
-- DB_UPDATE_VERSION 1221
+-- Friendica 3.5.3dev (Asparagus)
+-- DB_UPDATE_VERSION 1228
 -- ------------------------------------------


@ -193,7 +193,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 --
 CREATE TABLE IF NOT EXISTS `conv` (
 	`id` int(10) unsigned NOT NULL auto_increment,
-	`guid` varchar(64) NOT NULL DEFAULT '',
+	`guid` varchar(255) NOT NULL DEFAULT '',
 	`recips` text,
 	`uid` int(11) NOT NULL DEFAULT 0,
 	`creator` varchar(255) NOT NULL DEFAULT '',
@ -270,7 +270,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
 	 PRIMARY KEY(`id`),
 	 INDEX `addr` (`addr`(32)),
-	 INDEX `url` (`url`)
+	 UNIQUE INDEX `url` (`url`(190))
 ) DEFAULT COLLATE utf8mb4_general_ci;

 --
@ -355,7 +355,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`generation` tinyint(3) NOT NULL DEFAULT 0,
 	`server_url` varchar(255) NOT NULL DEFAULT '',
 	 PRIMARY KEY(`id`),
-	 INDEX `nurl` (`nurl`(64)),
+	 UNIQUE INDEX `nurl` (`nurl`(190)),
 	 INDEX `name` (`name`(64)),
 	 INDEX `nick` (`nick`(32)),
 	 INDEX `addr` (`addr`(64)),
@ -425,7 +425,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
 	`last_contact` datetime DEFAULT '0001-01-01 00:00:00',
 	`last_failure` datetime DEFAULT '0001-01-01 00:00:00',
 	 PRIMARY KEY(`id`),
-	 INDEX `nurl` (`nurl`(32))
+	 UNIQUE INDEX `nurl` (`nurl`(190))
 ) DEFAULT COLLATE utf8mb4_general_ci;

 --
@ -544,6 +544,7 @@ CREATE TABLE IF NOT EXISTS `item` (
 	 INDEX `uid_parenturi` (`uid`,`parent-uri`(190)),
 	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
 	 INDEX `authorid_created` (`author-id`,`created`),
+	 INDEX `ownerid` (`owner-id`),
 	 INDEX `uid_uri` (`uid`,`uri`(190)),
 	 INDEX `resource-id` (`resource-id`),
 	 INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
@ -579,7 +580,7 @@ CREATE TABLE IF NOT EXISTS `locks` (
 	`id` int(11) NOT NULL auto_increment,
 	`name` varchar(128) NOT NULL DEFAULT '',
 	`locked` tinyint(1) NOT NULL DEFAULT 0,
-	`created` datetime DEFAULT '0001-01-01 00:00:00',
+	`pid` int(10) unsigned NOT NULL DEFAULT 0,
 	 PRIMARY KEY(`id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;

@ -589,7 +590,7 @@ CREATE TABLE IF NOT EXISTS `locks` (
 CREATE TABLE IF NOT EXISTS `mail` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`uid` int(10) unsigned NOT NULL DEFAULT 0,
-	`guid` varchar(64) NOT NULL DEFAULT '',
+	`guid` varchar(255) NOT NULL DEFAULT '',
 	`from-name` varchar(255) NOT NULL DEFAULT '',
 	`from-photo` varchar(255) NOT NULL DEFAULT '',
 	`from-url` varchar(255) NOT NULL DEFAULT '',
@ -608,7 +609,8 @@ CREATE TABLE IF NOT EXISTS `mail` (
 	 INDEX `uid_seen` (`uid`,`seen`),
 	 INDEX `convid` (`convid`),
 	 INDEX `uri` (`uri`(64)),
-	 INDEX `parent-uri` (`parent-uri`(64))
+	 INDEX `parent-uri` (`parent-uri`(64)),
+	 INDEX `contactid` (`contact-id`)
 ) DEFAULT COLLATE utf8mb4_general_ci;

 --
@ -746,6 +748,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`deny_cid` mediumtext,
 	`deny_gid` mediumtext,
 	 PRIMARY KEY(`id`),
+	 INDEX `contactid` (`contact-id`),
 	 INDEX `uid_contactid` (`uid`,`contact-id`),
 	 INDEX `uid_profile` (`uid`,`profile`),
 	 INDEX `uid_album_scale_created` (`uid`,`album`(32),`scale`,`created`),
@ -1019,6 +1022,9 @@ CREATE TABLE IF NOT EXISTS `thread` (
 	 INDEX `uid_network_created` (`uid`,`network`,`created`),
 	 INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
 	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
+	 INDEX `contactid` (`contact-id`),
+	 INDEX `ownerid` (`owner-id`),
+	 INDEX `authorid` (`author-id`),
 	 INDEX `uid_created` (`uid`,`created`),
 	 INDEX `uid_commented` (`uid`,`commented`),
 	 INDEX `uid_wall_created` (`uid`,`wall`,`created`)
@ -1108,6 +1114,9 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
 	`pid` int(11) NOT NULL DEFAULT 0,
 	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-	 PRIMARY KEY(`id`)
+	 PRIMARY KEY(`id`),
+	 INDEX `pid` (`pid`),
+	 INDEX `parameter` (`parameter`(192)),
+	 INDEX `priority_created` (`priority`,`created`)
 ) DEFAULT COLLATE utf8mb4_general_ci;

--- 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
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@ -61,17 +61,17 @@ table.bbcodes > * > tr > th {
  <td><span style="color:  red;">red</span></td>
 </tr>
 <tr>
-  <td>[url=http://www.friendica.com]Friendica[/url]</td>
-  <td><a href="http://www.friendica.com" target="external-link">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
-  <td>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</td>
-  <td><img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto"></td>
+  <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]http://friendica.com/sites/default/files/friendika-32.png[/img]<br>
+  <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="http://friendica.com/sites/default/files/friendika-32.png" style="width: 64px;"></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>
@ -82,7 +82,7 @@ table.bbcodes > * > tr > th {
  <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 pixel)</td>
+  <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>
@ -99,23 +99,23 @@ table.bbcodes > * > tr > th {
  <th>Result</th>
 </tr>
 <tr>
-  <td>[url]http://friendica.com[/url]</td>
-  <td><a href="http://friendica.com">http://friendica.com</a></td>
+  <td>[url]http://friendi.ca[/url]</td>
+  <td><a href="http://friendi.ca">http://friendi.ca</a></td>
 </tr>
 <tr>
-  <td>[url=http://friendica.com]Friendica[/url]</td>
-  <td><a href="http://friendica.com">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca">Friendica</a></td>
 </tr>
 <tr>
-  <td>[bookmark]http://friendica.com[/bookmark]<br><br>
-#^[url]http://friendica.com[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">http://friendica.com</a></h4></span></td>
+  <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://friendica.com]Bookmark[/bookmark]<br><br>
-#^[url=http://friendica.com]Bookmark[/url]<br><br>
-#[url=http://friendica.com]^[/url][url=http://friendica.com]Bookmark[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">Bookmark</a></h4></span></td>
+  <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>
@ -490,7 +490,7 @@ Page title with a link to *url* will be shown.</td>

 ## Map

-This require "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+This requires "openstreetmap" or "Google Maps" addon version 1.3 or newer.
 If the addon isn't activated, the raw coordinates are shown instead.

 <table class="bbcodes">
@ -514,10 +514,10 @@ If the addon isn't activated, the raw coordinates are shown instead.

 ## Abstract for longer posts

-If you want to spread your post to several third party networks you can have the problem that these networks have a length limitation like on Twitter.
+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.

-Friendica is using a semi intelligent mechanism to generate a fitting abstract.
-But it can be interesting to define a custom abstract that will only be displayed on the external network.
+Friendica uses a semi-intelligent mechanism to generate a fitting abstract.
+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>
@ -566,7 +566,7 @@ Instead you have to name the explicit network:
 <tr>
  <td>
 [abstract]These days I had a strange encounter...[/abstract]<br>
-[abstract=goog]Helly my dear Google+ followers. You have to read my newest blog post![/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>
@ -574,7 +574,7 @@ While taking pictures in the woods I had a really strange encounter...</td>
 </tr>
 </table>

-The [abstract] element isn't working with connectors where we post the HTML like Tumblr, Wordpress or Pump.io.
+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
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@ -5,9 +5,9 @@ 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://helpers.pyxis.uberspace.de/profile/helpers) and report your problem there.
-Maybe someone from another node encountered the problem as well and can help you.
+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](https://github.com/friendica/friendica/issues).
 Please perform a search to see if there's already an open bug that matches yours before submitting anything.
@ -15,6 +15,6 @@ Please perform a search to see if there's already an open bug that matches yours
 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,7 +3,7 @@ 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
@ -14,13 +14,13 @@ IRC-Chat Plugin
 After activating the plugin, 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.
-At last, solve the captchas and click the connect button.
+You can choose any name you like for the room, even something like #superchatwhosenameisonlyknownbyme.
+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.
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@ -64,6 +64,7 @@ Here's a few primers if you are new to Friendica or to the PSR-2 coding standard
 * 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

--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@ -176,7 +176,7 @@ Depending on the features of the client you might encounter some glitches in usa
 ###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 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) or you can use the Librelist mailing list.
 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).
@ -188,7 +188,7 @@ Admin

 ###Can I configure multiple domains with the same code instance?

-No, this function is no longer supported from Friendica 3.3 onwards.
+No, this function is no longer supported as of Friendica 3.3 onwards.

 <a name="sources"></a>

--- 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.

--- a/doc/Install.md
+++ b/doc/Install.md
@ -82,6 +82,8 @@ Restart mysql and you should be fine.
 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
--- 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/Settings.md
+++ b/doc/Settings.md
@ -130,7 +130,7 @@ By default, any (valid) email address is allowed in registrations.

 #### Allow Users to set remote_self

-If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in die advanced contact 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.

 This feature can be used to let the user mirror e.g. blog postings into their Friendica postings.
@ -212,7 +212,7 @@ To simplify this process there is a button at the top of the page to reload all
 ## Themes

 The Themes section of the admin panel works similar to the Plugins section but let you control the themes on your Friendica node.
-Each theme has a dedicated suppage showing the current status, some information about the theme and a screen-shot of the Friendica interface using the theme.
+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.
--- 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
@ -3,7 +3,7 @@ Friendica API

 * [Home](help)

-The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public).
+The Friendica API aims to be compatible with the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public).

 Please refer to the linked documentation for further information.

@ -43,13 +43,13 @@ In this document, endpoints which requires auth are marked with "AUTH" after end
 * network: network of the user

 #### Errors
-When an error occour in API call, an HTTP error code is returned, with an error message
+When an error occurs in API call, an HTTP error code is returned, with an error message
 Usually:
- 400 Bad Request: if parameter are missing or items can't be found
- 403 Forbidden: if authenticated user is missing
- 405 Method Not Allowed: if API was called with invalid method, eg. GET when API require POST
- 501 Not Implemented: if requested API doesn't exists
- 500 Internal Server Error: on other error contitions
+- 400 Bad Request: if parameters are missing or items can't be found
+- 403 Forbidden: if the authenticated user is missing
+- 405 Method Not Allowed: if API was called with an invalid method, eg. GET when API require POST
+- 501 Not Implemented: if the requested API doesn't exist
+- 500 Internal Server Error: on other error conditions

 Error body is

@ -89,7 +89,7 @@ Unofficial Twitter command. It shows all direct answers (excluding the original
 * id: id of the post
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * include_entities: "true" shows entities for pictures and links (Default: false)

@ -103,7 +103,7 @@ Unofficial Twitter command. It shows all direct answers (excluding the original
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * getText: Defines the format of the status field. Can be "html" or "plain"
 * include_entities: "true" shows entities for pictures and links (Default: false)
@ -117,7 +117,7 @@ Unofficial Twitter command. It shows all direct answers (excluding the original
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * getText: Defines the format of the status field. Can be "html" or "plain"
 * friendica_verbose: "true" enables different error returns (default: "false")
@ -128,7 +128,7 @@ Shows all direct messages of a conversation
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * getText: Defines the format of the status field. Can be "html" or "plain"
 * uri: URI of the conversation
@ -139,7 +139,7 @@ Shows all direct messages of a conversation
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * getText: Defines the format of the status field. Can be "html" or "plain"
 * include_entities: "true" shows entities for pictures and links (Default: false)
@ -182,7 +182,7 @@ HTTP 400 BadRequest
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * include_entities: "true" shows entities for pictures and links (Default: false)

@ -208,26 +208,26 @@ Set this values will result in an empty array.
 ---
 ### followers/ids (*; AUTH)
 #### Parameters
-* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
+* stringify_ids: Send id numbers as text (true) or integers (false)? (default: false)

 #### Unsupported parameters
 * user_id
 * screen_name
 * cursor

-Friendica doesn't allow showing followers of other users.
+Friendica doesn't allow showing the followers of other users.

 ---
 ### friends/ids (*; AUTH)
 #### Parameters
-* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
+* stringify_ids: Send the id numbers as text (true) or integers (false)? (default: false)

 #### Unsupported parameters
 * user_id
 * screen_name
 * cursor

-Friendica doesn't allow showing friends of other users.
+Friendica doesn't allow showing the friends of other users.

 ---
 ### help/test (*)
@ -283,7 +283,7 @@ Friendica doesn't allow showing friends of other users.
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * exclude_replies: don't show replies (default: false)
 * conversation_id: Shows all statuses of a given conversation.
@ -299,7 +299,7 @@ Friendica doesn't allow showing friends of other users.
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * exclude_replies: don't show replies (default: false)
 * conversation_id: Shows all statuses of a given conversation.
@ -315,7 +315,7 @@ Friendica doesn't allow showing friends of other users.
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * include_entities: "true" shows entities for pictures and links (Default: false)

@ -329,7 +329,7 @@ Friendica doesn't allow showing friends of other users.
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * exclude_replies: don't show replies (default: false)
 * conversation_id: Shows all statuses of a given conversation.
@ -343,7 +343,7 @@ Friendica doesn't allow showing friends of other users.
 #### Parameters
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * include_entities: "true" shows entities for pictures and links (Default: false)

@ -403,7 +403,7 @@ Friendica doesn't allow showing friends of other users.
 * screen_name: screen name (for technical reasons, this value is not unique!)
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * exclude_replies: don't show replies (default: false)
 * conversation_id: Shows all statuses of a given conversation.
@ -426,7 +426,7 @@ It shows all direct answers (excluding the original post) to a given id.
 * id: id of the post
 * count: Items per page (default: 20)
 * page: page number
-* since_id: minimal id
+* since_id: minimum id
 * max_id: maximum id
 * include_entities: "true" shows entities for pictures and links (Default: false)

@ -640,7 +640,7 @@ If the note is linked to an item, the item is returned, just like one of the "st

 If the note is not linked to an item, a success status is returned:

-* "success" (json) | "&lt;status&gt;success&lt;/status&gt;" (xml)
+* "success" (json) | <status>success</status>;" (xml)


 ---
@ -671,8 +671,8 @@ json
 ```
 	{
 		"id": "photo id"
-		"created": "date(YYYY-MM-GG HH:MM:SS)",
-		"edited": "date(YYYY-MM-GG HH:MM:SS)",
+		"created": "date(YYYY-MM-DD HH:MM:SS)",
+		"edited": "date(YYYY-MM-DD HH:MM:SS)",
 		"title": "photo title",
 		"desc": "photo description",
 		"album": "album name",
@ -695,8 +695,8 @@ xml
 ```
 	<photo>
 		<id>photo id</id>
-		<created>date(YYYY-MM-GG HH:MM:SS)</created>
-		<edited>date(YYYY-MM-GG HH:MM:SS)</edited>
+		<created>date(YYYY-MM-DD HH:MM:SS)</created>
+		<edited>date(YYYY-MM-DD HH:MM:SS)</edited>
 		<title>photo title</title>
 		<desc>photo description</desc>
 		<album>album name</album>
@ -793,13 +793,13 @@ On error:
 * album: name of the album to be deleted (always necessary)
 * album_new (optional): can be used to change the album of a single photo if photo_id is specified
 * allow_cid/allow_gid/deny_cid/deny_gid (optional): on create: empty string or omitting = public photo, specify in format '```<x><y><z>```' for private photo;
-			on update: keys need to be present with empty values for setting a private photo now to public
+			on update: keys need to be present with empty values for changing a private photo to public

 both calls point to one function for creating AND updating photos.
 Saves data for the scales 0-2 to database (see above for scale description).
 Call adds non-visible entries to items table to enable authenticated contacts to comment/like the photo.
 Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited group.
-Currently it is best way to inform user that updating rights is not the best way, offer a solution to add photo as a new photo with the new rights.
+Currently it is best to inform user that updating rights is not the right way to do this, and offer a solution to add photo as a new photo with the new rights instead.

 #### Return values

@ -884,8 +884,8 @@ On success: Array of:
 * profiles: array of the profile data

 On error:
-HTTP 403 Forbidden: when no authentication provided
-HTTP 400 Bad Request: if given profile_id is not in db or not assigned to authenticated user
+HTTP 403 Forbidden: when no authentication was provided
+HTTP 400 Bad Request: if given profile_id is not in the database or is not assigned to the authenticated user

 General description of profile data in API returns:
 * profile_id
@ -913,7 +913,7 @@ The following API calls are implemented in GNU Social but not in Friendica: (inc
 * blocks/create
 * blocks/destroy

-The following API calls from the Twitter API aren't implemented neither in Friendica nor in GNU Social:
+The following API calls from the Twitter API are not implemented in either Friendica or GNU Social:

 * statuses/mentions_timeline
 * statuses/retweets/:id
@ -990,7 +990,6 @@ The following API calls from the Twitter API aren't implemented neither in Frien

 ## Usage Examples
 ### BASH / cURL
-Betamax has documentated some example API usage from a [bash script](https://en.wikipedia.org/wiki/Bash_(Unix_shell) employing [curl](https://en.wikipedia.org/wiki/CURL) (see [his posting](https://betamax65.de/display/betamax65/43539)).

 /usr/bin/curl -u USER:PASS https://YOUR.FRIENDICA.TLD/api/statuses/update.xml -d source="some source id" -d status="the status you want to post"

--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@ -1,11 +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                   |                |
-| created |                  | datetime     | YES  |     | 0001-01-01 00:00:00 |                |
+| 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/de/Account-Basics.md
+++ b/doc/de/Account-Basics.md
@ -9,37 +9,37 @@ Account - Basics
 Nicht alle Friendica-Knoten bieten die Möglichkeit zur Registrierung. 
 Wenn die Registrierung möglich ist, wird ein "Registrieren"-Link unter dem Login-Feld auf der Startseite angezeigt, der zur Registrierungsseite führt. 
 Die Stärke unseres Netzwerks ist, dass die verschiedenen Knoten komplett kompatibel zueinander sind. 
-Wenn der Knoten, den Du besuchst, keine Registrierung anbietet, oder wenn Du glaubst, dass Dir eine andere Seite möglicherweise besser gefällt, dann kannst Du hier eine <a href="http://dir.friendica.com/siteinfo">Liste von öffentlichen Servern (Knoten)</a> finden und den Knoten heraus suchen, der am Besten zu Deinen Anforderungen passt. 
+Wenn der Knoten, den Du besuchst, keine Registrierung anbietet, oder wenn Du glaubst, dass Dir eine andere Seite möglicherweise besser gefällt, dann kannst Du hier eine <a href="https://dir.friendica.social/servers">Liste von öffentlichen Servern (Knoten)</a> finden und den Knoten heraus suchen, der am Besten zu Deinen Anforderungen passt.

-Wenn Du Deinen eigenen Server aufsetzen willst, kannst Du das ebenfalls machen. 
-Besuche <a href="http://friendica.com/download">die Friendica-Webseite</a>, um den Code mit den Installationsanleitungen herunterzuladen. 
+Wenn Du Deinen eigenen Server aufsetzen willst, kannst Du das ebenfalls machen.
+Besuche <a href="http://friendi.ca">die Friendica-Webseite</a>, um den Code mit den Installationsanleitungen herunterzuladen.
 Es ist ein einfacher Installationsprozess, den jeder mit ein wenig Erfahrungen im Webseiten-Hosting oder mit grundlegenden Linux-Erfahrungen einfach handhaben kann.


 *OpenID*

-Das erste Feld auf der Registrierungsseite ist für eine OpenID-Adresse. 
-Wenn Du keine OpenID-Adresse hast oder nicht wünschst, diese zu nutzen, dann lasse das Feld frei. 
-Wenn Du einen OpenID-Account hast und diesen nutzen willst, gib die Adresse in das Feld ein und klicke auf "Registrieren". 
-Friendica wird versuchen, so viele Informationen wie möglich von Deinem OpenID-Provider zu übernehmen, um diese in Dein Profil auf dieser Seite einzutragen. 
+Das erste Feld auf der Registrierungsseite ist für eine OpenID-Adresse.
+Wenn Du keine OpenID-Adresse hast oder nicht wünschst, diese zu nutzen, dann lasse das Feld frei.
+Wenn Du einen OpenID-Account hast und diesen nutzen willst, gib die Adresse in das Feld ein und klicke auf "Registrieren".
+Friendica wird versuchen, so viele Informationen wie möglich von Deinem OpenID-Provider zu übernehmen, um diese in Dein Profil auf dieser Seite einzutragen.


 *Dein vollständiger Name*

-Bitte trage Deinen vollständigen Namen **so ein, wie Du ihn im System anzeigen lassen willst**. 
+Bitte trage Deinen vollständigen Namen **so ein, wie Du ihn im System anzeigen lassen willst**.
 Viele Leute nutzen ihren richtigen Namen hierfür, allerdings besteht für dich keine Pflicht, das auch so zu machen.


 *Email-Adresse*

-Bitte trage eine richtige Email-Adresse ein. 
-Deine Email-Adresse wird **niemals** veröffentlicht. 
-Wir benötigen diese, um Dir Account-Informationen und die Login-Daten zu schicken. 
-Du erhältst zudem von Zeit zu Zeit Benachrichtigungen über eingegangene Nachrichten oder Punkte, die Deine Aufmerksamkeit benötigen. 
-Du hast aber auch die Möglichkeit, diese Nachrichten in Deinen Account-Einstellungen komplett abzuschalten. 
+Bitte trage eine richtige Email-Adresse ein.
+Deine Email-Adresse wird **niemals** veröffentlicht.
+Wir benötigen diese, um Dir Account-Informationen und die Login-Daten zu schicken.
+Du erhältst zudem von Zeit zu Zeit Benachrichtigungen über eingegangene Nachrichten oder Punkte, die Deine Aufmerksamkeit benötigen.
+Du hast aber auch die Möglichkeit, diese Nachrichten in Deinen Account-Einstellungen komplett abzuschalten.

-Du musst nicht Deine Haupt-Email-Adresse sein, jedoch wird eine funktionierende Adresse benötigt. 
-Ohne dieses kannst Du weder Dein Initialpasswort erhalten, noch Dein Passwort zurücksetzen. 
+Du musst nicht Deine Haupt-Email-Adresse sein, jedoch wird eine funktionierende Adresse benötigt.
+Ohne dieses kannst Du weder Dein Initialpasswort erhalten, noch Dein Passwort zurücksetzen.
 Dies ist die einzige persönliche Information, die korrekt sein muss.
 

@ -85,7 +85,7 @@ Falls Du Schwierigkeiten beim Login hast, prüfe bitte, ob z. B. Deine Feststell

 **Passwort ändern**

-Besuche nach Deinem ersten Login bitte die Einstellungsseite und wechsle das Passwort in eines, dass Du Dir merken kannst. 
+Besuche nach Deinem ersten Login bitte die Einstellungsseite und wechsle das Passwort in eines, dass Du Dir merken kannst.


 **Der Anfang**
@ -95,7 +95,7 @@ Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beide

 **Persönliche Daten exportieren**

-Du kannst eine Kopie Deiner persönlichen Daten in einer XML-Datei exportieren. 
+Du kannst eine Kopie Deiner persönlichen Daten in einer XML-Datei exportieren.
 Gehe hierzu in Deinen Einstellungen auf "Persönliche Daten exportieren".


--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@ -61,17 +61,17 @@ table.bbcodes > * > tr > th {
  <td><span style="color:  red;">rot</span></td>
 </tr>
 <tr>
-  <td>[url=http://www.friendica.com]Friendica[/url]</td>
-  <td><a href="http://www.friendica.com" target="external-link">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
-  <td>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</td>
-  <td><img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto"></td>
+  <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]http://friendica.com/sites/default/files/friendika-32.png[/img]<br>
+  <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="http://friendica.com/sites/default/files/friendika-32.png" style="width: 64px;"></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]kleiner Text[/size]</td>
@ -99,23 +99,23 @@ table.bbcodes > * > tr > th {
  <th>Ergebnis</th>
 </tr>
 <tr>
-  <td>[url]http://friendica.com[/url]</td>
-  <td><a href="http://friendica.com">http://friendica.com</a></td>
+  <td>[url]http://friendi.ca[/url]</td>
+  <td><a href="http://friendi.ca">http://friendi.ca</a></td>
 </tr>
 <tr>
-  <td>[url=http://friendica.com]Friendica[/url]</td>
-  <td><a href="http://friendica.com">Friendica</a></td>
+  <td>[url=http://friendi.ca.com]Friendica[/url]</td>
+  <td><a href="http://friendi.ca.com">Friendica</a></td>
 </tr>
 <tr>
-  <td>[bookmark]http://friendica.com[/bookmark]<br><br>
-#^[url]http://friendica.com[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">http://friendica.com</a></h4></span></td>
+  <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://friendica.com]Lesezeichen[/bookmark]<br><br>
-#^[url=http://friendica.com]Lesezeichen[/url]<br><br>
-#[url=http://friendica.com]^[/url][url=http://friendica.com]Lesezeichen[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="http://friendica.com" rel="oembed"></a><a href="http://friendica.com" target="_blank">Lesezeichen</a></h4></span></td>
+  <td>[bookmark=http://friendi.ca]Lesezeichen[/bookmark]<br><br>
+#^[url=http://friendi.ca]Lesezeichen[/url]<br><br>
+#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Lesezeichen[/url]</td>
+  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank">Lesezeichen</a></h4></span></td>
 </tr>
 <tr>
  <td>[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora Beitrag mit GUID[/url]</td>
--- a/doc/de/andfinally.md
+++ b/doc/de/andfinally.md
@ -1,19 +0,0 @@
-... und zuletzt
-===============
-
-Und damit sind wir auch schon am Ende der Schnellstartanleitung. 
-
-Hier sind noch einige weitere Dinge, die Dir den Start vereinfachen können. 
-
-**Gruppen**
-
-
- <a href="http://helpers.pyxis.uberspace.de/profile/helpers">Friendica Support</a> - Probleme?  Dann ist das der Platz, um zu fragen!
-
-
-**Dokumentation**
-
- <a href="help/Connectors">Zu weiteren Netzwerken verbinden</a>
- <a href="help">Zur Startseite der Hilfe</a>
-
-
--- a/doc/de/makingnewfriends.md
+++ b/doc/de/makingnewfriends.md
@ -1,27 +0,0 @@
-Neue Freunde finden
-==============
-
-* [Zur Startseite der Hilfe](help)
-
-Hier siehst du die Kontaktvorschläge. 
-Wenn du dich mal verirrt hast, kannst du <a href="help/makenewfriends">diesen Link klicken</a> und wieder hierher kommen. 
-
-Diese Seite ist ein wenig wie die Kontaktvorschläge in Facebook. 
-Jeder auf dieser Liste hat zugestimmt, als Kontaktvorschlag zu erscheinen. 
-Das bedeutet, das sie Anfragen meist nicht ablehnen, da sie neue Leute kennenlernen wollen. 
-
-Siehst du jemanden, dessen Aussehen du magst? 
-Klicke auf den "Verbinden"-Button beim Foto. 
-Als nächstes kommst du zur Seite "Freundschafts-/Kontaktanfrage". 
-Fülle das Formular wie vorgegeben aus und trage optional eine kleine Notiz ein. 
-Nun musst du nur noch auf die Bestätigung warten. 
-Beachte dabei, dass es sich um reale Personen handelt und es somit etwas dauern kann. 
-Jetzt, nachdem du jemanden hinzugefügt hast, weißt du vielleicht nicht mehr, wie du zurückkommst. 
-Klicke einfach auf den Link oben auf dieser Seite und du kommst zurück zur Seite mit den Kontaktvorschlägen, um weitere Personen hinzuzufügen.