ACTUALIZA MW a 1.31.3, SMW a 3.0.2 y extensiones menores

13 files changed, 258 insertions, 1222 deletions

diff --git a/www/wiki/docs/distributors.txt b/www/wiki/docs/distributors.txt
index f19574c0..729dffa3 100644
--- a/www/wiki/docs/distributors.txt
+++ b/www/wiki/docs/distributors.txt
@@ -87,10 +87,15 @@ which the user can edit by hand thereafter. It's just a plain old PHP file,
 and can contain any PHP statements. It usually sets global variables that are
 used for configuration, and includes files used by any extensions.
 
-Distributors can easily change the installer behavior, including LocalSettings
-generated, by placing their overrides into mw-config/overrides directory. Doing
-that is highly preferred to modifying MediaWiki code directly. See
-mw-config/overrides/README for more details and examples.
+Distributors can easily change the default settings by creating
+includes/PlatformSettings.php with overrides/additions to the default settings.
+The installer will automatically include the platform defaults when generating
+the user's LocalSettings.php file.
+
+Furthermore, distributors can change the installer behavior, by placing their
+overrides into mw-config/overrides directory. Doing that is highly preferred
+to modifying MediaWiki code directly. See mw-config/overrides/README for more
+details and examples.
 
 There's a new maintenance/install.php script which could be used for performing
 an install through the command line.
@@ -162,14 +167,14 @@ There are several other pieces of software that MediaWiki can make good use of.
 Distributors might choose to install these automatically with MediaWiki and
 perhaps configure it to use them (see Configuration section of this document):
 
-  * APC (Alternative PHP Cache), XCache, or similar: Will greatly speed up the
+  * APC (Alternative PHP Cache) or similar: Will greatly speed up the
   execution of MediaWiki, and all other PHP applications, at some cost in
   memory usage. Will be used automatically for the most part.
   * clamav: Can be used for virus scanning of uploaded files. Enable with
   "$wgAntivirus = 'clamav';".
   * DjVuLibre: Allows processing of DjVu files. To enable this, set
   "$wgDjvuDump = 'djvudump'; $wgDjvuRenderer = 'ddjvu'; $wgDjvuTxt = 'djvutxt';".
-  * HTML Tidy: Fixes errors in HTML at runtime. Can be enabled with 
+  * HTML Tidy: Fixes errors in HTML at runtime. Can be enabled with
 	"$wgUseTidy = true;".
   * ImageMagick: For resizing images. "$wgUseImageMagick = true;" will enable
   it. PHP's GD can also be used, but ImageMagick is preferable.
diff --git a/www/wiki/docs/extension.schema.json b/www/wiki/docs/extension.schema.json
deleted file mode 100644
index c895b2a9..00000000
--- a/www/wiki/docs/extension.schema.json
+++ /dev/null
@@ -1,986 +0,0 @@
-{
-	"$schema": "http://json-schema.org/schema#",
-	"description": "MediaWiki extension.json schema",
-	"type": "object",
-	"properties": {
-		"manifest_version": {
-			"type": "integer",
-			"description": "Version of the extension.json schema the extension.json file is in.",
-			"required": true
-		},
-		"name": {
-			"type": "string",
-			"description": "The extension's canonical name.",
-			"required": true
-		},
-		"namemsg": {
-			"type": "string",
-			"description": "i18n message key of the extension's name."
-		},
-		"type": {
-			"type": "string",
-			"description": "The extension's type, as an index to $wgExtensionCredits.",
-			"default": "other"
-		},
-		"author": {
-			"type": [
-				"string",
-				"array"
-			],
-			"description": "Extension's authors.",
-			"items": {
-				"type": "string"
-			}
-		},
-		"version": {
-			"type": "string",
-			"description": "The version of this release of the extension."
-		},
-		"url": {
-			"type": "string",
-			"description": "URL to the homepage for the extension.",
-			"format": "uri"
-		},
-		"description": {
-			"type": "string",
-			"description": "Raw description of the extension."
-		},
-		"descriptionmsg": {
-			"type": "string",
-			"description": "Message key for a i18n message describing the extension."
-		},
-		"license-name": {
-			"type": "string",
-			"description": "Short identifier for the license under which the extension is released.",
-			"enum": [
-				"0BSD",
-				"AAL",
-				"Abstyles",
-				"Adobe-2006",
-				"Adobe-Glyph",
-				"ADSL",
-				"AFL-1.1",
-				"AFL-1.2",
-				"AFL-2.0",
-				"AFL-2.1",
-				"AFL-3.0",
-				"Afmparse",
-				"AGPL-1.0",
-				"AGPL-3.0",
-				"AGPL-3.0-only",
-				"AGPL-3.0-or-later",
-				"Aladdin",
-				"AMDPLPA",
-				"AML",
-				"AMPAS",
-				"ANTLR-PD",
-				"Apache-1.0",
-				"Apache-1.1",
-				"Apache-2.0",
-				"APAFML",
-				"APL-1.0",
-				"APSL-1.0",
-				"APSL-1.1",
-				"APSL-1.2",
-				"APSL-2.0",
-				"Artistic-1.0",
-				"Artistic-1.0-cl8",
-				"Artistic-1.0-Perl",
-				"Artistic-2.0",
-				"Bahyph",
-				"Barr",
-				"Beerware",
-				"BitTorrent-1.0",
-				"BitTorrent-1.1",
-				"Borceux",
-				"BSD-1-Clause",
-				"BSD-2-Clause",
-				"BSD-2-Clause-FreeBSD",
-				"BSD-2-Clause-NetBSD",
-				"BSD-2-Clause-Patent",
-				"BSD-3-Clause",
-				"BSD-3-Clause-Attribution",
-				"BSD-3-Clause-Clear",
-				"BSD-3-Clause-LBNL",
-				"BSD-3-Clause-No-Nuclear-License",
-				"BSD-3-Clause-No-Nuclear-License-2014",
-				"BSD-3-Clause-No-Nuclear-Warranty",
-				"BSD-4-Clause",
-				"BSD-4-Clause-UC",
-				"BSD-Protection",
-				"BSD-Source-Code",
-				"BSL-1.0",
-				"bzip2-1.0.5",
-				"bzip2-1.0.6",
-				"Caldera",
-				"CATOSL-1.1",
-				"CC-BY-1.0",
-				"CC-BY-2.0",
-				"CC-BY-2.5",
-				"CC-BY-3.0",
-				"CC-BY-4.0",
-				"CC-BY-NC-1.0",
-				"CC-BY-NC-2.0",
-				"CC-BY-NC-2.5",
-				"CC-BY-NC-3.0",
-				"CC-BY-NC-4.0",
-				"CC-BY-NC-ND-1.0",
-				"CC-BY-NC-ND-2.0",
-				"CC-BY-NC-ND-2.5",
-				"CC-BY-NC-ND-3.0",
-				"CC-BY-NC-ND-4.0",
-				"CC-BY-NC-SA-1.0",
-				"CC-BY-NC-SA-2.0",
-				"CC-BY-NC-SA-2.5",
-				"CC-BY-NC-SA-3.0",
-				"CC-BY-NC-SA-4.0",
-				"CC-BY-ND-1.0",
-				"CC-BY-ND-2.0",
-				"CC-BY-ND-2.5",
-				"CC-BY-ND-3.0",
-				"CC-BY-ND-4.0",
-				"CC-BY-SA-1.0",
-				"CC-BY-SA-2.0",
-				"CC-BY-SA-2.5",
-				"CC-BY-SA-3.0",
-				"CC-BY-SA-4.0",
-				"CC0-1.0",
-				"CDDL-1.0",
-				"CDDL-1.1",
-				"CDLA-Permissive-1.0",
-				"CDLA-Sharing-1.0",
-				"CECILL-1.0",
-				"CECILL-1.1",
-				"CECILL-2.0",
-				"CECILL-2.1",
-				"CECILL-B",
-				"CECILL-C",
-				"ClArtistic",
-				"CNRI-Jython",
-				"CNRI-Python",
-				"CNRI-Python-GPL-Compatible",
-				"Condor-1.1",
-				"CPAL-1.0",
-				"CPL-1.0",
-				"CPOL-1.02",
-				"Crossword",
-				"CrystalStacker",
-				"CUA-OPL-1.0",
-				"Cube",
-				"curl",
-				"D-FSL-1.0",
-				"diffmark",
-				"DOC",
-				"Dotseqn",
-				"DSDP",
-				"dvipdfm",
-				"ECL-1.0",
-				"ECL-2.0",
-				"eCos-2.0",
-				"EFL-1.0",
-				"EFL-2.0",
-				"eGenix",
-				"Entessa",
-				"EPL-1.0",
-				"EPL-2.0",
-				"ErlPL-1.1",
-				"EUDatagrid",
-				"EUPL-1.0",
-				"EUPL-1.1",
-				"EUPL-1.2",
-				"Eurosym",
-				"Fair",
-				"Frameworx-1.0",
-				"FreeImage",
-				"FSFAP",
-				"FSFUL",
-				"FSFULLR",
-				"FTL",
-				"GFDL-1.1",
-				"GFDL-1.1-only",
-				"GFDL-1.1-or-later",
-				"GFDL-1.2",
-				"GFDL-1.2-only",
-				"GFDL-1.2-or-later",
-				"GFDL-1.3",
-				"GFDL-1.3-only",
-				"GFDL-1.3-or-later",
-				"Giftware",
-				"GL2PS",
-				"Glide",
-				"Glulxe",
-				"gnuplot",
-				"GPL-1.0",
-				"GPL-1.0+",
-				"GPL-1.0-only",
-				"GPL-1.0-or-later",
-				"GPL-2.0",
-				"GPL-2.0+",
-				"GPL-2.0-only",
-				"GPL-2.0-or-later",
-				"GPL-2.0-with-autoconf-exception",
-				"GPL-2.0-with-bison-exception",
-				"GPL-2.0-with-classpath-exception",
-				"GPL-2.0-with-font-exception",
-				"GPL-2.0-with-GCC-exception",
-				"GPL-3.0",
-				"GPL-3.0+",
-				"GPL-3.0-only",
-				"GPL-3.0-or-later",
-				"GPL-3.0-with-autoconf-exception",
-				"GPL-3.0-with-GCC-exception",
-				"gSOAP-1.3b",
-				"HaskellReport",
-				"HPND",
-				"IBM-pibs",
-				"ICU",
-				"IJG",
-				"ImageMagick",
-				"iMatix",
-				"Imlib2",
-				"Info-ZIP",
-				"Intel",
-				"Intel-ACPI",
-				"Interbase-1.0",
-				"IPA",
-				"IPL-1.0",
-				"ISC",
-				"JasPer-2.0",
-				"JSON",
-				"LAL-1.2",
-				"LAL-1.3",
-				"Latex2e",
-				"Leptonica",
-				"LGPL-2.0",
-				"LGPL-2.0+",
-				"LGPL-2.0-only",
-				"LGPL-2.0-or-later",
-				"LGPL-2.1",
-				"LGPL-2.1+",
-				"LGPL-2.1-only",
-				"LGPL-2.1-or-later",
-				"LGPL-3.0",
-				"LGPL-3.0+",
-				"LGPL-3.0-only",
-				"LGPL-3.0-or-later",
-				"LGPLLR",
-				"Libpng",
-				"libtiff",
-				"LiLiQ-P-1.1",
-				"LiLiQ-R-1.1",
-				"LiLiQ-Rplus-1.1",
-				"LPL-1.0",
-				"LPL-1.02",
-				"LPPL-1.0",
-				"LPPL-1.1",
-				"LPPL-1.2",
-				"LPPL-1.3a",
-				"LPPL-1.3c",
-				"MakeIndex",
-				"MirOS",
-				"MIT",
-				"MIT-advertising",
-				"MIT-CMU",
-				"MIT-enna",
-				"MIT-feh",
-				"MITNFA",
-				"Motosoto",
-				"mpich2",
-				"MPL-1.0",
-				"MPL-1.1",
-				"MPL-2.0",
-				"MPL-2.0-no-copyleft-exception",
-				"MS-PL",
-				"MS-RL",
-				"MTLL",
-				"Multics",
-				"Mup",
-				"NASA-1.3",
-				"Naumen",
-				"NBPL-1.0",
-				"NCSA",
-				"Net-SNMP",
-				"NetCDF",
-				"Newsletr",
-				"NGPL",
-				"NLOD-1.0",
-				"NLPL",
-				"Nokia",
-				"NOSL",
-				"Noweb",
-				"NPL-1.0",
-				"NPL-1.1",
-				"NPOSL-3.0",
-				"NRL",
-				"NTP",
-				"Nunit",
-				"OCCT-PL",
-				"OCLC-2.0",
-				"ODbL-1.0",
-				"OFL-1.0",
-				"OFL-1.1",
-				"OGTSL",
-				"OLDAP-1.1",
-				"OLDAP-1.2",
-				"OLDAP-1.3",
-				"OLDAP-1.4",
-				"OLDAP-2.0",
-				"OLDAP-2.0.1",
-				"OLDAP-2.1",
-				"OLDAP-2.2",
-				"OLDAP-2.2.1",
-				"OLDAP-2.2.2",
-				"OLDAP-2.3",
-				"OLDAP-2.4",
-				"OLDAP-2.5",
-				"OLDAP-2.6",
-				"OLDAP-2.7",
-				"OLDAP-2.8",
-				"OML",
-				"OpenSSL",
-				"OPL-1.0",
-				"OSET-PL-2.1",
-				"OSL-1.0",
-				"OSL-1.1",
-				"OSL-2.0",
-				"OSL-2.1",
-				"OSL-3.0",
-				"PDDL-1.0",
-				"PHP-3.0",
-				"PHP-3.01",
-				"Plexus",
-				"PostgreSQL",
-				"psfrag",
-				"psutils",
-				"Python-2.0",
-				"Qhull",
-				"QPL-1.0",
-				"Rdisc",
-				"RHeCos-1.1",
-				"RPL-1.1",
-				"RPL-1.5",
-				"RPSL-1.0",
-				"RSA-MD",
-				"RSCPL",
-				"Ruby",
-				"SAX-PD",
-				"Saxpath",
-				"SCEA",
-				"Sendmail",
-				"SGI-B-1.0",
-				"SGI-B-1.1",
-				"SGI-B-2.0",
-				"SimPL-2.0",
-				"SISSL",
-				"SISSL-1.2",
-				"Sleepycat",
-				"SMLNJ",
-				"SMPPL",
-				"SNIA",
-				"Spencer-86",
-				"Spencer-94",
-				"Spencer-99",
-				"SPL-1.0",
-				"StandardML-NJ",
-				"SugarCRM-1.1.3",
-				"SWL",
-				"TCL",
-				"TCP-wrappers",
-				"TMate",
-				"TORQUE-1.1",
-				"TOSL",
-				"Unicode-DFS-2015",
-				"Unicode-DFS-2016",
-				"Unicode-TOU",
-				"Unlicense",
-				"UPL-1.0",
-				"Vim",
-				"VOSTROM",
-				"VSL-1.0",
-				"W3C",
-				"W3C-19980720",
-				"W3C-20150513",
-				"Watcom-1.0",
-				"Wsuipa",
-				"WTFPL",
-				"wxWindows",
-				"X11",
-				"Xerox",
-				"XFree86-1.1",
-				"xinetd",
-				"Xnet",
-				"xpp",
-				"XSkat",
-				"YPL-1.0",
-				"YPL-1.1",
-				"Zed",
-				"Zend-2.0",
-				"Zimbra-1.3",
-				"Zimbra-1.4",
-				"Zlib",
-				"zlib-acknowledgement",
-				"ZPL-1.1",
-				"ZPL-2.0",
-				"ZPL-2.1"
-			]
-		},
-		"requires": {
-			"type": "object",
-			"description": "Indicates what versions of MediaWiki core are required. This syntax may be extended in the future, for example to check dependencies between other extensions.",
-			"properties": {
-				"MediaWiki": {
-					"type": "string",
-					"description": "Version constraint string against MediaWiki core."
-				}
-			}
-		},
-		"ResourceFileModulePaths": {
-			"type": "object",
-			"description": "Default paths to use for all ResourceLoader file modules",
-			"additionalProperties": false,
-			"properties": {
-				"localBasePath": {
-					"type": "string",
-					"description": "Base path to prepend to all local paths, relative to current directory"
-				},
-				"remoteExtPath": {
-					"type": "string",
-					"description": "Base path to prepend to all remote paths, relative to $wgExtensionAssetsPath"
-				},
-				"remoteSkinPath": {
-					"type": "string",
-					"description": "Base path to prepend to all remote paths, relative to $wgStylePath"
-				}
-			}
-		},
-		"ResourceModules": {
-			"type": "object",
-			"description": "ResourceLoader modules to register",
-			"patternProperties": {
-				"^[a-zA-Z0-9-\\.]+$": {
-					"type": "object",
-					"anyOf": [
-						{
-							"description": "A ResourceLoaderFileModule definition",
-							"additionalProperties": false,
-							"properties": {
-								"localBasePath": {
-									"type": "string",
-									"description": "Base path to prepend to all local paths in $options. Defaults to $IP"
-								},
-								"remoteBasePath": {
-									"type": "string",
-									"description": "Base path to prepend to all remote paths in $options. Defaults to $wgScriptPath"
-								},
-								"remoteExtPath": {
-									"type": "string",
-									"description": "Equivalent of remoteBasePath, but relative to $wgExtensionAssetsPath"
-								},
-								"skipFunction": {
-									"type": "string",
-									"description": "Path to a file containing a JavaScript \"skip function\", if desired."
-								},
-								"scripts": {
-									"type": ["string", "array"],
-									"description": "Scripts to always include (array of file paths)",
-									"items": {
-										"type": "string"
-									}
-								},
-								"languageScripts": {
-									"type": "object",
-									"description": "Scripts to include in specific language contexts (mapping of language code to file path(s))",
-									"patternProperties": {
-										"^[a-zA-Z0-9-]{2,}$": {
-											"type": [
-												"string",
-												"array"
-											],
-											"items": {
-												"type": "string"
-											}
-										}
-									}
-								},
-								"skinScripts": {
-									"type": "object",
-									"description": "Scripts to include in specific skin contexts (mapping of skin name to script(s)",
-									"patternProperties": {
-										".+": {
-											"type": [
-												"string",
-												"array"
-											],
-											"items": {
-												"type": "string"
-											}
-										}
-									}
-								},
-								"debugScripts": {
-									"type": ["string", "array"],
-									"description": "Scripts to include in debug contexts",
-									"items": {
-										"type": "string"
-									}
-								},
-								"loaderScripts": {
-									"type": ["string", "array"],
-									"description": "Scripts to include in the startup module",
-									"items": {
-										"type": "string"
-									}
-								},
-								"dependencies": {
-									"type": ["string", "array"],
-									"description": "Modules which must be loaded before this module",
-									"items": {
-										"type": "string"
-									}
-								},
-								"styles": {
-									"type": ["string", "array", "object"],
-									"description": "Styles to always load",
-									"items": {
-										"type": "string"
-									}
-								},
-								"skinStyles": {
-									"type": "object",
-									"description": "Styles to include in specific skin contexts (mapping of skin name to style(s))",
-									"patternProperties": {
-										".+": {
-											"type": [
-												"string",
-												"array"
-											],
-											"items": {
-												"type": "string"
-											}
-										}
-									}
-								},
-								"messages": {
-									"type": ["string", "array"],
-									"description": "Messages to always load",
-									"items": {
-										"type": "string"
-									}
-								},
-								"group": {
-									"type": "string",
-									"description": "Group which this module should be loaded together with"
-								},
-								"position": {
-									"type": "string",
-									"description": "Position on the page to load this module at",
-									"enum": [
-										"bottom",
-										"top"
-									]
-								},
-								"templates": {
-									"type": ["object", "array"],
-									"description": "Templates to be loaded for client-side usage"
-								},
-								"targets": {
-									"type": ["string", "array"],
-									"description": "ResourceLoader target the module can run on",
-									"items": {
-										"type": "string"
-									}
-								}
-							}
-						},
-						{
-							"description": "A ResourceLoaderImageModule definition",
-							"additionalProperties": false,
-							"properties": {
-								"class": {
-									"enum": ["ResourceLoaderImageModule"]
-								},
-								"data": {
-									"type": "string"
-								},
-								"prefix": {
-									"type": "string"
-								},
-								"selector": {
-									"type": "string"
-								},
-								"selectorWithoutVariant": {
-									"type": "string"
-								},
-								"selectorWithVariant": {
-									"type": "string"
-								},
-								"variants": {
-									"type": "object"
-								},
-								"images": {
-									"type": "object"
-								},
-								"position": {
-									"enum": [
-										"top",
-										"bottom"
-									]
-								}
-							}
-						},
-						{
-							"description": "An arbitrary ResourceLoaderModule definition",
-							"properties": {
-								"class": {
-									"type": "string",
-									"pattern": "^((?!ResourceLoader(File|Image)Module).)*$"
-								}
-							},
-							"required": ["class"]
-						}
-					]
-				}
-			}
-		},
-		"ResourceModuleSkinStyles": {
-			"type": "object",
-			"description": "ResourceLoader modules for custom skin styles"
-		},
-		"ResourceLoaderSources": {
-			"type": "object",
-			"description": "ResourceLoader sources to register"
-		},
-		"ResourceLoaderLESSVars": {
-			"type": "object",
-			"description": "ResourceLoader LESS variables"
-		},
-		"ResourceLoaderLESSImportPaths": {
-			"type": "object",
-			"description": "ResourceLoader import paths"
-		},
-		"ConfigRegistry": {
-			"type": "object",
-			"description": "Registry of factory functions to create Config objects"
-		},
-		"SessionProviders": {
-			"type": "object",
-			"description": "Session providers"
-		},
-		"AuthManagerAutoConfig": {
-			"type": "object",
-			"description": "AuthManager auto-configuration",
-			"additionalProperties": false,
-			"properties": {
-				"preauth": {
-					"type": "object",
-					"description": "Pre-authentication providers"
-				},
-				"primaryauth": {
-					"type": "object",
-					"description": "Primary authentication providers"
-				},
-				"secondaryauth": {
-					"type": "object",
-					"description": "Secondary authentication providers"
-				}
-			}
-		},
-		"CentralIdLookupProviders": {
-			"type": "object",
-			"description": "Central ID lookup providers"
-		},
-		"namespaces": {
-			"type": "array",
-			"description": "Method to add extra namespaces",
-			"items": {
-				"type": "object",
-				"properties": {
-					"id": {
-						"type": "integer"
-					},
-					"constant": {
-						"type": "string"
-					},
-					"name": {
-						"type": "string"
-					},
-					"gender": {
-						"type": "object",
-						"properties": {
-							"male": {
-								"type": "string"
-							},
-							"female": {
-								"type": "string"
-							}
-						}
-					},
-					"subpages": {
-						"type": "boolean",
-						"default": false
-					},
-					"content": {
-						"type": "boolean",
-						"default": false
-					},
-					"defaultcontentmodel": {
-						"type": "string"
-					},
-					"protection": {
-						"type": ["string", "array"],
-						"description": "Userright(s) required to edit in this namespace"
-					},
-					"capitallinkoverride": {
-						"type": "boolean",
-						"description": "Set $wgCapitalLinks on a per-namespace basis"
-					},
-					"conditional": {
-						"type": "boolean",
-						"description": "Whether the namespace is conditional upon configuration and should not be registered (requires separate registration via a hook)",
-						"default": false
-					}
-				},
-				"required": ["id", "constant", "name"]
-			}
-		},
-		"TrackingCategories": {
-			"type": "array",
-			"description": "Tracking category message keys",
-			"items": {
-				"type": "string"
-			}
-		},
-		"DefaultUserOptions": {
-			"type": "object",
-			"description": "Default values of user options"
-		},
-		"HiddenPrefs": {
-			"type": "array",
-			"description": "Preferences users cannot set",
-			"items": {
-				"type": "string"
-			}
-		},
-		"GroupPermissions": {
-			"type": "object",
-			"description": "Default permissions to give to user groups",
-			"patternProperties": {
-				"^[a-z]+$": {
-					"type": "object",
-					"patternProperties": {
-						"^[a-z]+$": {
-							"type": "boolean"
-						}
-					}
-				}
-			}
-		},
-		"RevokePermissions": {
-			"type": "object",
-			"description": "Default permissions to revoke from user groups",
-			"patternProperties": {
-				"^[a-z]+$": {
-					"type": "object",
-					"patternProperties": {
-						"^[a-z]+$": {
-							"type": "boolean"
-						}
-					}
-				}
-			}
-		},
-		"ImplicitGroups": {
-			"type": "array",
-			"description": "Implicit groups"
-		},
-		"GroupsAddToSelf": {
-			"type": "object",
-			"description": "Groups a user can add to themselves"
-		},
-		"GroupsRemoveFromSelf": {
-			"type": "object",
-			"description": "Groups a user can remove from themselves"
-		},
-		"AddGroups": {
-			"type": "object",
-			"description": "Groups a user can add to users"
-		},
-		"RemoveGroups": {
-			"type": "object",
-			"description": "Groups a user can remove from users"
-		},
-		"AvailableRights": {
-			"type": "array",
-			"description": "User rights added by the extension",
-			"items": {
-				"type": "string"
-			}
-		},
-		"ContentHandlers": {
-			"type": "object",
-			"description": "Mapping of model ID to class name",
-			"patternProperties": {
-				"^[A-Za-z]+$": {
-					"type": "string"
-				}
-			}
-		},
-		"RateLimits": {
-			"type": "object",
-			"description": "Rate limits"
-		},
-		"RecentChangesFlags": {
-			"type": "object",
-			"description": "Flags (letter symbols) shown on RecentChanges pages"
-		},
-		"MediaHandlers": {
-			"type": "object",
-			"description": "Plugins for media file type handling. Each entry in the array maps a MIME type to a PHP class name."
-		},
-		"ExtensionFunctions": {
-			"type": [
-				"array",
-				"string"
-			],
-			"description": "Function to call after setup has finished",
-			"items": {
-				"type": "string"
-			}
-		},
-		"ExtensionMessagesFiles": {
-			"type": "object",
-			"description": "File paths containing PHP internationalization data"
-		},
-		"MessagesDirs": {
-			"type": "object",
-			"description": "Directory paths containing JSON internationalization data"
-		},
-		"ExtensionEntryPointListFiles": {
-			"type": "object"
-		},
-		"SpecialPages": {
-			"type": "object",
-			"description": "SpecialPages implemented in this extension (mapping of page name to class name)"
-		},
-		"AutoloadClasses": {
-			"type": "object"
-		},
-		"Hooks": {
-			"type": [ "string", "object" ],
-			"description": "Hooks this extension uses (mapping of hook name to callback)"
-		},
-		"JobClasses": {
-			"type": "object",
-			"description": "Job types this extension implements (mapping of job type to class name)"
-		},
-		"LogTypes": {
-			"type": "array",
-			"description": "List of new log types this extension uses"
-		},
-		"LogRestrictions": {
-			"type": "object"
-		},
-		"FilterLogTypes": {
-			"type": "object"
-		},
-		"ActionFilteredLogs": {
-			"type": "object",
-			"description": "List of log types which can be filtered by log actions",
-			"patternProperties": {
-				"^[a-z-]+$": {
-					"type": "object",
-					"patternProperties": {
-						"^[a-z-]+$": {
-							"type": "array",
-							"items": {
-								"type": "string"
-							}
-						}
-					}
-				}
-			}
-		},
-		"LogNames": {
-			"type": "object"
-		},
-		"LogHeaders": {
-			"type": "object"
-		},
-		"LogActions": {
-			"type": "object"
-		},
-		"LogActionsHandlers": {
-			"type": "object"
-		},
-		"Actions": {
-			"type": "object"
-		},
-		"APIModules": {
-			"type": "object"
-		},
-		"APIFormatModules": {
-			"type": "object"
-		},
-		"APIMetaModules": {
-			"type": "object"
-		},
-		"APIPropModules": {
-			"type": "object"
-		},
-		"APIListModules": {
-			"type": "object"
-		},
-		"ValidSkinNames": {
-			"type": "object"
-		},
-		"FeedClasses": {
-			"type": "object",
-			"description": "Available feeds objects"
-		},
-		"SkinOOUIThemes": {
-			"type": "object"
-		},
-		"callback": {
-			"type": [
-				"array",
-				"string"
-			],
-			"description": "A function to be called right after MediaWiki processes this file"
-		},
-		"config": {
-			"type": "object",
-			"description": "Configuration options for this extension",
-			"properties": {
-				"_prefix": {
-					"type": "string",
-					"default": "wg",
-					"description": "Prefix to put in front of configuration settings when exporting them to $GLOBALS"
-				}
-			},
-			"patternProperties": {
-				"^[a-zA-Z_\u007f-\u00ff][a-zA-Z0-9_\u007f-\u00ff]*$": {
-					"properties": {
-						"_merge_strategy": {
-							"type": "string",
-							"enum": [
-								"array_merge_recursive",
-								"array_plus_2d",
-								"array_plus",
-								"array_merge"
-							],
-							"default": "array_merge"
-						}
-					}
-				}
-			}
-		},
-		"ParserTestFiles": {
-			"type": "array",
-			"description": "Parser test suite files to be run by parserTests.php when no specific filename is passed to it"
-		},
-		"load_composer_autoloader": {
-			"type": "boolean",
-			"description": "Load the composer autoloader for this extension, if one is present"
-		}
-	}
-}
diff --git a/www/wiki/docs/extension.schema.v1.json b/www/wiki/docs/extension.schema.v1.json
index 7cfebcaf..0763e7de 100644
--- a/www/wiki/docs/extension.schema.v1.json
+++ b/www/wiki/docs/extension.schema.v1.json
@@ -210,8 +210,8 @@
 									"description": "Group which this module should be loaded together with"
 								},
 								"deprecated": {
-									"type": ["object", "boolean"],
-									"description": "Whether the module is deprecated and usage is discouraged. Either a boolean or an object with key message can be used to customise deprecation message."
+									"type": ["object", "string", "boolean"],
+									"description": "Whether the module is deprecated and usage is discouraged. Either a boolean, or a string or an object with key message can be used to customise deprecation message."
 								},
 								"position": {
 									"type": "string",
@@ -567,6 +567,10 @@
 			"type": "object",
 			"description": "SpecialPages implemented in this extension (mapping of page name to class name)"
 		},
+		"AutoloadNamespaces": {
+			"type": "object",
+			"description": "Mapping of PSR-4 compliant namespace to directory for autoloading"
+		},
 		"AutoloadClasses": {
 			"type": "object"
 		},
diff --git a/www/wiki/docs/extension.schema.v2.json b/www/wiki/docs/extension.schema.v2.json
index 75a4f2c6..e13129bb 100644
--- a/www/wiki/docs/extension.schema.v2.json
+++ b/www/wiki/docs/extension.schema.v2.json
@@ -211,8 +211,8 @@
 									"description": "Group with which this module should be loaded"
 								},
 								"deprecated": {
-									"type": ["object", "boolean"],
-									"description": "Whether the module is deprecated and usage is discouraged. Either a boolean or an object with key message can be used to customise deprecation message."
+									"type": ["object", "string", "boolean"],
+									"description": "Whether the module is deprecated and usage is discouraged. Either a boolean, or a string or an object with key message can be used to customise deprecation message."
 								},
 								"position": {
 									"type": "string",
@@ -588,6 +588,10 @@
 			"type": "object",
 			"description": "SpecialPages implemented in this extension (mapping of page name to class name)"
 		},
+		"AutoloadNamespaces": {
+			"type": "object",
+			"description": "Mapping of PSR-4 compliant namespace to directory for autoloading"
+		},
 		"AutoloadClasses": {
 			"type": "object"
 		},
@@ -665,7 +669,7 @@
 		},
 		"SkinOOUIThemes": {
 			"type": "object",
-			"description": "Map of skin names to OOjs UI themes to use. Same format as ResourceLoaderOOUIModule::$builtinSkinThemeMap."
+			"description": "Map of skin names to OOUI themes to use. Same format as ResourceLoaderOOUIModule::$builtinSkinThemeMap."
 		},
 		"PasswordPolicy": {
 			"type": "object",
diff --git a/www/wiki/docs/globals.txt b/www/wiki/docs/globals.txt
index 8b4c755b..5bdb31c1 100644
--- a/www/wiki/docs/globals.txt
+++ b/www/wiki/docs/globals.txt
@@ -9,7 +9,7 @@ in a much more flexible way. Consider the elegance of:
     # Generate the article HTML as if viewed by a web request
     $article = new Article( Title::newFromText( $t ) );
     $article->view();
- 
+
 versus
 
     # Save current globals
diff --git a/www/wiki/docs/hooks.txt b/www/wiki/docs/hooks.txt
index a19e9fc0..d932148e 100644
--- a/www/wiki/docs/hooks.txt
+++ b/www/wiki/docs/hooks.txt
@@ -689,6 +689,8 @@ $destTitle: destination title (object)
 'ArticlePageDataBefore': Before loading data of an article from the database.
 &$wikiPage: WikiPage (object) that data will be loaded
 &$fields: fields (array) to load from the database
+&$tables: tables (array) to load from the database
+&$joinConds: join conditions (array) to load from the database
 
 'ArticlePrepareTextForEdit': Called when preparing text to be saved.
 $wikiPage: the WikiPage being saved
@@ -949,7 +951,7 @@ $id: the page ID (original ID in case of page deletions)
 in a Category page. Gives extensions the opportunity to batch load any
 related data about the pages.
 $type: The category type. Either 'page', 'file' or 'subcat'
-$res: Query result from DatabaseBase::select()
+$res: Query result from Wikimedia\Rdbms\IDatabase::select()
 
 'CategoryViewer::generateLink': Before generating an output link allow
 extensions opportunity to generate a more specific or relevant link.
@@ -1207,6 +1209,14 @@ $row: the DB row for this line
   Currently only data attributes reserved to MediaWiki are allowed
   (see Sanitizer::isReservedDataAttribute).
 
+'DeleteUnknownPreferences': Called by the cleanupPreferences.php maintenance script to build a WHERE clause with which
+to delete preferences that are not known about. This hook is used by extensions that have dynamically-named preferences
+that should not be deleted in the usual cleanup process. For example, the Gadgets extension creates preferences prefixed
+with 'gadget-', and so anything with that prefix is excluded from the deletion.
+&where: An array that will be passed as the $cond parameter to IDatabase::select() to determine what will be deleted
+  from the user_properties table.
+$db: The IDatabase object, useful for accessing $db->buildLike() etc.
+
 'DifferenceEngineAfterLoadNewText': called in DifferenceEngine::loadNewText()
 after the new revision's content has been loaded into the class member variable
 $differenceEngine->mNewContent but before returning true from this function.
@@ -1664,6 +1674,13 @@ $query: query options passed to Title::getInternalURL()
 'GetIP': modify the ip of the current user (called only once).
 &$ip: string holding the ip as determined so far
 
+'GetLangPreferredVariant': Called in LanguageConverter#getPreferredVariant() to
+  allow fetching the language variant code from cookies or other such
+  alternative storage.
+&$req: language variant from the URL (string) or boolean false if no variant
+  was specified in the URL; the value of this variable comes from
+  LanguageConverter#getURLVariant()
+
 'GetLinkColours': modify the CSS class of an array of page links.
 $linkcolour_ids: array of prefixed DB keys of the pages linked to,
   indexed by page_id.
@@ -1838,6 +1855,11 @@ $revisionInfo: Array of revision information
 Return false to stop further processing of the tag
 $reader: XMLReader object
 
+'ImportHandleUnknownUser': When a user doesn't exist locally, this hook is called
+to give extensions an opportunity to auto-create it. If the auto-creation is
+successful, return false.
+$name: User name
+
 'ImportHandleUploadXMLTag': When parsing a XML tag in a file upload.
 Return false to stop further processing of the tag
 $reader: XMLReader object
@@ -2319,6 +2341,7 @@ $wikiPage: the WikiPage edited
 $rev: the new revision
 $baseID: the revision ID this was based off, if any
 $user: the editing user
+&$tags: tags to apply to the edit and recent change
 
 'OldChangesListRecentChangesLine': Customize entire recent changes line, or
 return false to omit the line from RecentChanges and Watchlist special pages.
@@ -2587,6 +2610,12 @@ RejectParserCacheValue hook) because MediaWiki won't do it for you.
   callable here. The callable is passed the ParserOptions object and the option
   name.
 
+'ParserOutputPostCacheTransform': Called from ParserOutput::getText() to do
+post-cache transforms.
+$parserOutput: The ParserOutput object.
+&$text: The text being transformed, before core transformations are done.
+&$options: The options array being used for the transformation.
+
 'ParserSectionCreate': Called each time the parser creates a document section
 from wikitext. Use this to apply per-section modifications to HTML (like
 wrapping the section in a DIV).  Caveat: DIVs are valid wikitext, and a DIV
@@ -2766,12 +2795,6 @@ configuration variables to JavaScript. Things that depend on the current page
 or request state must be added through MakeGlobalVariablesScript instead.
 &$vars: array( variable name => value )
 
-'ResourceLoaderGetLessVars': DEPRECATED! Called in ResourceLoader::getLessVars
-to add global LESS variables. Loaded after $wgResourceLoaderLESSVars is added.
-Global LESS variables are deprecated. Use ResourceLoaderModule::getLessVars()
-instead to expose variables only in modules that need them.
-&$lessVars: array of variables already added
-
 'ResourceLoaderJqueryMsgModuleMagicWords': Called in
 ResourceLoaderJqueryMsgModule to allow adding magic words for jQueryMsg.
 The value should be a string, and they can depend only on the
@@ -2797,14 +2820,14 @@ called after the addition of 'qunit' and MediaWiki testing resources.
   added to any module.
 &$ResourceLoader: object
 
-'RevisionInsertComplete': Called after a revision is inserted into the database.
-&$revision: the Revision
-$data: the data stored in old_text.  The meaning depends on $flags: if external
-  is set, it's the URL of the revision text in external storage; otherwise,
-  it's the revision text itself.  In either case, if gzip is set, the revision
-  text is gzipped.
-$flags: a comma-delimited list of strings representing the options used.  May
-  include: utf8 (this will always be set for new revisions); gzip; external.
+'RevisionRecordInserted': Called after a revision is inserted into the database.
+$revisionRecord: the RevisionRecord that has just been inserted.
+
+'RevisionInsertComplete': DEPRECATED! Use RevisionRecordInserted hook instead.
+Called after a revision is inserted into the database.
+$revision: the Revision
+$data: DEPRECATED! Always null!
+$flags: DEPRECATED! Always null!
 
 'SearchableNamespaces': An option to modify which namespaces are searchable.
 &$arr: Array of namespaces ($nsId => $name) which will be used.
@@ -2940,6 +2963,7 @@ $result: The SearchResult object
 $terms: String of the search terms entered
 $specialSearch: The SpecialSearch object
 &$query: Array of query string parameters for the link representing the search result.
+&$attributes: Array of title link attributes, can be modified by extension.
 
 'SidebarBeforeOutput': Allows to edit sidebar just before it is output by skins.
 Warning: This hook is run on each display. You should consider to use
@@ -3507,6 +3531,12 @@ blank form with no error message; use UploadVerification and UploadVerifyFile
 instead.
 &$form: UploadForm object
 
+'UploadForm:getInitialPageText': After the initial page text for file uploads
+is generated, to allow it to be altered.
+&$pageText: the page text
+$msg: array of header messages
+$config: Config object
+
 'UploadForm:initial': Before the upload form is generated. You might set the
 member-variables $uploadFormTextTop and $uploadFormTextAfterSummary to inject
 text (HTML) either before or after the editform.
@@ -3789,12 +3819,16 @@ After a user's group memberships are changed.
 $add: Array of strings corresponding to groups added
 $remove: Array of strings corresponding to groups removed
 
-'UserSaveOptions': Called just before saving user preferences/options.
-$user: User object
-&$options: Options, modifiable
+'UserSaveOptions': Called just before saving user preferences. Hook handlers can either add or
+manipulate options, or reset one back to it's default to block changing it. Hook handlers are also
+allowed to abort the process by returning false, e.g. to save to a global profile instead. Compare
+to the UserSaveSettings hook, which is called after the preferences have been saved.
+$user: The User for which the options are going to be saved
+&$options: The users options as an associative array, modifiable
 
-'UserSaveSettings': Called when saving user settings.
-$user: User object
+'UserSaveSettings': Called directly after user preferences (user_properties in the database) have
+been saved. Compare to the UserSaveOptions hook, which is called before.
+$user: The User for which the options have been saved
 
 'UserSetCookies': DEPRECATED! If you're trying to replace core session cookie
 handling, you want to create a subclass of MediaWiki\Session\CookieSessionProvider
@@ -3903,14 +3937,15 @@ dumps. One, and only one hook should set this, and return false.
 &$opts: Options to use for the query
 &$join: Join conditions
 
-'WikiPageDeletionUpdates': manipulate the list of DataUpdates to be applied when
+'WikiPageDeletionUpdates': manipulate the list of DeferrableUpdates to be applied when
 a page is deleted. Called in WikiPage::getDeletionUpdates(). Note that updates
 specific to a content model should be provided by the respective Content's
 getDeletionUpdates() method.
 $page: the WikiPage
-$content: the Content to generate updates for (or null, if the Content could not be loaded
-due to an error)
-&$updates: the array of DataUpdate objects. Hook function may want to add to it.
+$content: the Content to generate updates for, or null in case the page revision could not be
+  loaded. The delete will succeed despite this.
+&$updates: the array of objects that implement DeferrableUpdate. Hook function may want to add to
+  it.
 
 'WikiPageFactory': Override WikiPage class used for a title
 $title: Title of the page
diff --git a/www/wiki/docs/ontology.owl b/www/wiki/docs/ontology.owl
index 6b2e0b7f..19476a35 100644
--- a/www/wiki/docs/ontology.owl
+++ b/www/wiki/docs/ontology.owl
@@ -38,6 +38,11 @@
     <rdfs:comment>MediaWiki category.</rdfs:comment>
   </owl:Class>
 
+  <owl:Class rdf:about="&mediawiki;HiddenCategory">
+    <rdfs:label>HiddenCategory</rdfs:label>
+    <rdfs:comment>MediaWiki hidden category.</rdfs:comment>
+  </owl:Class>
+
   <!--
   ///////////////////////////////////////////////////////////////////////////////////////
   //
@@ -53,4 +58,18 @@
       <rdfs:domain rdf:resource="&mediawiki;Category"/>
   </owl:ObjectProperty>
 
+  <owl:DatatypeProperty rdf:about="&mediawiki;pages">
+      <rdfs:label>pages</rdfs:label>
+      <rdfs:comment>Number of articles belonging to this category.</rdfs:comment>
+      <rdfs:range rdf:resource="&mediawiki;Category"/>
+      <rdfs:range rdf:resource="&xsd;integer"/>
+  </owl:DatatypeProperty>
+
+  <owl:DatatypeProperty rdf:about="&mediawiki;subcategories">
+      <rdfs:label>subcategories</rdfs:label>
+      <rdfs:comment>Number of subcategories belonging to this category.</rdfs:comment>
+      <rdfs:range rdf:resource="&mediawiki;Category"/>
+      <rdfs:range rdf:resource="&xsd;integer"/>
+  </owl:DatatypeProperty>
+
 </rdf:RDF>
diff --git a/www/wiki/docs/scripts.txt b/www/wiki/docs/scripts.txt
index 53dff36e..dff428c5 100644
--- a/www/wiki/docs/scripts.txt
+++ b/www/wiki/docs/scripts.txt
@@ -39,14 +39,10 @@ Primary scripts:
     maintenance/archives/patch-profiling.sql patch to the database.
 
     To enable the profileinfo.php itself, you'll need to set $wgDBadminuser
-    and $wgDBadminpassword in your LocalSettings.php, as well as $wgEnableProfileInfo 
+    and $wgDBadminpassword in your LocalSettings.php, as well as $wgEnableProfileInfo
     See also https://www.mediawiki.org/wiki/Manual:Profiling .
 
   thumb.php
     Script used to resize images if it is configured to be done when the web
     browser requests the image and not when generating the page. This script can
     be used as a 404 handler to generate image thumbs when they don't exist.
-
-There is also a file with a .php5 extension for each script. They can be used if
-the web server needs a .php5 to run the file with the PHP 5 engine and runs .php
-scripts with PHP 4. You should not use them anymore.
diff --git a/www/wiki/docs/skin.txt b/www/wiki/docs/skin.txt
index a3c8c334..0b4e0bda 100644
--- a/www/wiki/docs/skin.txt
+++ b/www/wiki/docs/skin.txt
@@ -26,7 +26,7 @@ supporting them became too heavy to bear. Those were:
 
 * Nostalgia: A skin which looks like Wikipedia did in its first year (2001).
   This skin is now used for the old Wikipedia snapshot at
-  http://nostalgia.wikipedia.org/
+  https://nostalgia.wikipedia.org/
 
 * Chick: A lightweight Monobook skin with no sidebar. The sidebar links were
   given at the bottom of the page instead.
diff --git a/www/wiki/docs/uidesign/child-selector-emu.html b/www/wiki/docs/uidesign/child-selector-emu.html
deleted file mode 100644
index dedb3a67..00000000
--- a/www/wiki/docs/uidesign/child-selector-emu.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>CSS Child selector emulation for IE 6</title>
-	<style>
-		/** Common rules **/
-		body  { background-color: #CCC; }
-		table { border:1px black solid; }
-		caption {
-			background-color: #98fb98;
-			border:1px solid #40FF40;
-		}
-
-		/** "old" rules" **/
-		table.global th,
-		table.global td
-		{
-			border: 1px red solid;
-			background-color:white;
-			padding:1em;
-		}
-		table.global th
-		{
-			background-color: #ffc0cb;
-		}
-
-		/** second table. Try to emulate child selector */
-		table.childemu th,
-	   	table.childemu td {
-			border: 1px red solid;
-			background-color:white;
-			padding:1em;
-		}
-		table.childemu th
-		{
-			background-color: #ffc0cb;
-		}
-
-		/** Reset style applied in childemu classes */
-		/** TODO: find the real default value!! */
-		table.childemu tr * th,
-		table.childemu tr * td {
-			border: none;
-			background-color: transparent;
-			padding: 0;
-		}
-
-
-		/** child selector emulation */
-	</style>
-</head>
-<body>
-<p>
-The following table show how nested tables inherit colors from the wikitable class (here it was renamed "global").
-</p>
-<table class="global">
-<caption>Global table</caption>
-<tr>
-	<th>TH: should have pink bg</th>
-</tr>
-<tr>
-	<td>TD: white bg</td>
-</tr>
-<tr>
-	<td>
-		<table class="nested">
-		<caption>Nested table</caption>
-		<tr>
-			<th>Nested TH: transparent</th>
-			<td>Nested TD: transparent</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-
-<p>
-With child selector we could limit the wikitable styling to the direct childs of the table. Unfortunately, Internet Explorer 6.0 does not support child selector. See <a href="https://bugzilla.wikimedia.org/show_bug.cgi?id=33752">our bug #33752</a>.
-</p>
-<table class="childemu">
-<caption>Global table</caption>
-<tr>
-	<th>TH: should have pink bg</th>
-</tr>
-<tr>
-	<td>TD: white bg</td>
-</tr>
-<tr>
-	<td>
-		<table class="nested">
-		<caption>Nested table</caption>
-		<tr>
-			<th>Nested TH: transparent</th>
-			<td>Nested TD: transparent</td>
-		</tr>
-		</table>
-	</td>
-</tr>
-</table>
-<p><strong>NOTE:</strong>The nested caption keep the green background. The nested table keep the black border. This is because those declarations are global so we did not reset them.</p>
diff --git a/www/wiki/docs/uidesign/mediawiki.action.history.diff.html b/www/wiki/docs/uidesign/mediawiki.action.history.diff.html
deleted file mode 100644
index 615558f2..00000000
--- a/www/wiki/docs/uidesign/mediawiki.action.history.diff.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<head>
-	<meta charset="utf-8">
-	<link rel="stylesheet" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">
-	<link rel="stylesheet" media="print" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">
-</head>
-<body>
-
-<p>This show various styles for our diff action. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">resources/src/mediawiki.action/mediawiki.action.history.diff.css</a></code>.</p>
-<p>This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.</p>
-<p>Try it out in print mode, too. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">resources/src/mediawiki.action/mediawiki.action.history.diff.print.css</a></code>.</p>
-
-<p>Practical example copied from MediaWiki's HTML output:</p>
-
-<table class="diff diff-contentalign-left">
-	<colgroup><col class="diff-marker">
-	<col class="diff-content">
-	<col class="diff-marker">
-	<col class="diff-content">
-	</colgroup>
-<tbody>
-<tr>
-	<td class="diff-marker">−</td>
-	<td class="diff-deletedline"><div>Lorem ipsum dolor sit amet<del class="diffchange diffchange-inline">, consectetur adipisicing elit</del>, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div></td>
-	<td class="diff-marker">+</td>
-	<td class="diff-addedline"><div>Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div></td>
-</tr>
-<tr>
-	<td class="diff-marker">−</td>
-	<td class="diff-deletedline"></td>
-	<td colspan="2" class="diff-empty">&nbsp;</td>
-</tr>
-<tr>
-	<td class="diff-marker">−</td>
-	<td class="diff-deletedline"><div>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div></td>
-	<td colspan="2" class="diff-empty">&nbsp;</td>
-</tr>
-<tr>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"></td>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"></td>
-</tr>
-<tr>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"><div>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</div></td>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"><div>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</div></td>
-</tr>
-<tr>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"></td>
-	<td class="diff-marker">&nbsp;</td>
-	<td class="diff-context"></td>
-</tr>
-<tr>
-	<td class="diff-marker">−</td>
-	<td class="diff-deletedline"><div>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim<del class="diffchange diffchange-inline"> id est laborum</del>.</div></td>
-	<td class="diff-marker">+</td>
-	<td class="diff-addedline"><div>Excepteur sint occaecat cupidatat non proident, sunt<ins class="diffchange diffchange-inline"> reprehenderit in voluptate</ins> in culpa qui officia deserunt mollit anim.</div></td>
-</tr>
-<tr>
-	<td colspan="2" class="diff-empty">&nbsp;</td>
-	<td class="diff-marker">+</td>
-	<td class="diff-addedline"></td>
-</tr>
-<tr>
-	<td colspan="2" class="diff-empty">&nbsp;</td>
-	<td class="diff-marker">+</td>
-	<td class="diff-addedline"><div>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div></td>
-</tr>
-</tbody></table>
-
-<p>Below are some basic lines being applied one or two classes. Mainly for debugging purposes.</p>
-
-<table class="diff">
-	<tr><th>Diff</th></tr>
-
-	<tr><td class="diff-addedline"><code>diff-addedline</code>: added line</td></tr>
-	<tr><td class="diff-deletedline"><code>diff-deletedline</code>: deleted line</td></tr>
-	<tr><td class="diff-context"><code>diff-context</code>: context</td></tr>
-
-	<tr><th>Same as above with a <code>&lt;ins&gt;</code> or <code>&lt;del&gt;</code> child element having the <code>diffchange</code> class:</th></tr>
-
-	<tr><td class="diffchange">Diffchange</td></tr>
-	<tr><td class="diff-addedline"><ins class="diffchange">Added line + diffchange</ins></td></tr>
-	<tr><td class="diff-deletedline"><del class="diffchange">Deleted line + diffchange</del></td></tr>
-</table>
-
-</body>
-</html>
diff --git a/www/wiki/docs/uidesign/mediawiki.diff.html b/www/wiki/docs/uidesign/mediawiki.diff.html
index 0372595c..cd13dbac 100644
--- a/www/wiki/docs/uidesign/mediawiki.diff.html
+++ b/www/wiki/docs/uidesign/mediawiki.diff.html
@@ -88,5 +88,54 @@
 	<tr><td class="diff-deletedline"><del class="diffchange">Deleted line + diffchange</del></td></tr>
 </table>
 
+<p>Here an example for the diff output when a whole paragraph was moved:</p>
+
+<table class="diff diff-contentalign-left">
+	<colgroup><col class="diff-marker">
+		<col class="diff-content">
+		<col class="diff-marker">
+		<col class="diff-content">
+	</colgroup><tbody>
+<tr>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+</tr>
+<tr>
+	<td class="diff-marker"><a class="mw-diff-movedpara-left" href="#movedpara_3_1_rhs">⚫</a></td>
+	<td class="diff-deletedline"><div><a name="movedpara_1_1_lhs"></a>Lorem ipsum alias non veritatis porro quidem harum ut et at ab sit atque soluta deleniti architecto ut pariatur? Non consequat. Aut minus occaecat quas lorem impedit, earum praesentium enim reprehenderit, anim consequat. Et maiores consequatur incidunt, nostrud non consectetur, ut eiusmod mollit anim eum vitae qui obcaecati molestiae nostrud dolore hic aperiam commodo nihil omnis aliquam irure expedita minima ut fugiat, error odi.</div></td>
+	<td colspan="2" class="diff-empty">&nbsp;</td>
+</tr>
+<tr>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+</tr>
+<tr>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"><div>Lorem ipsum sunt ducimus, quos aut quia a nulla molestiae doloremque dolorem inventore vel officia temporibus at ut iste totam officiis impedit, quaerat voluptate fugiat esse est sit, assumenda quis quaerat provident, laborum molestiae esse, quam qui cillum velit, mollit veniam, consequuntur esse, dolorem do amet, maiores ad dolores dolor duis aut amet, adipisicing est.</div></td>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"><div>Lorem ipsum sunt ducimus, quos aut quia a nulla molestiae doloremque dolorem inventore vel officia temporibus at ut iste totam officiis impedit, quaerat voluptate fugiat esse est sit, assumenda quis quaerat provident, laborum molestiae esse, quam qui cillum velit, mollit veniam, consequuntur esse, dolorem do amet, maiores ad dolores dolor duis aut amet, adipisicing est.</div></td>
+</tr>
+<tr>
+	<td colspan="2" class="diff-empty">&nbsp;</td>
+	<td class="diff-marker">+</td>
+	<td class="diff-addedline"></td>
+</tr>
+<tr>
+	<td colspan="2" class="diff-empty">&nbsp;</td>
+	<td class="diff-marker"><a class="mw-diff-movedpara-right" href="#movedpara_1_1_lhs">⚫</a></td>
+	<td class="diff-addedline"><div><a name="movedpara_3_1_rhs"></a>Lorem ipsum alias non veritatis porro quidem harum ut et at ab sit atque soluta deleniti architecto ut pariatur? Non consequat. Aut minus occaecat quas lorem impedit, earum praesentium enim reprehenderit, anim consequat. Et maiores consequatur incidunt, nostrud non consectetur, ut eiusmod mollit anim eum vitae qui obcaecati molestiae nostrud dolore hic aperiam commodo nihil omnis aliquam irure expedita minima ut fugiat, error odi.</div></td>
+</tr>
+<tr>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+	<td class="diff-marker">&nbsp;</td>
+	<td class="diff-context"></td>
+</tr>
+</tbody></table>
+
 </body>
 </html>
diff --git a/www/wiki/docs/uidesign/monospace.html b/www/wiki/docs/uidesign/monospace.html
index f2b988e2..cdaf580a 100644
--- a/www/wiki/docs/uidesign/monospace.html
+++ b/www/wiki/docs/uidesign/monospace.html
@@ -2,16 +2,25 @@
 <html lang="en" dir="ltr">
 <head>
 	<style>
-		pre {
+		pre,
+		textarea {
 			border: 1px dashed #AAA;
 			background-color: #E0E0E0;
 			color: #000000;
-			margin: 1em 10%;
 			padding: 0.5em;
+			height: 1em;
+			width: 90%;
 		}
 		blockquote {
 			font-style: italic;
 		}
+		table {
+			width: 100%;
+			table-layout: fixed;
+		}
+		td {
+			padding: 0.5em;
+		}
 	</style>
 </head>
 <body>
@@ -33,45 +42,138 @@ font besides just "monospace", those browsers will no longer treat it as
 monospace and use 0.8 x 16px = 13px instead.
 </blockquote>
 <p>
+Additionally, it seems that textareas have their own font-size set in Chrome
+(but not Firefox and other browsers), making them unaffected by this behavior.
+</p>
+<p>
 Below are various rendering:
 </p>
 
+<table>
+
+<tr>
+<th>&lt;pre&gt;</th>
+<th>&lt;textarea&gt;</th>
+</tr>
+
+<tr>
+<td>
 <pre style='
 font-family: monospace;'>
 font-family: monospace;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace;'>
+font-family: monospace;
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: "Courier New";'>
 font-family: "Courier New";
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: "Courier New";'>
+font-family: "Courier New";
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: Courier;'>
 font-family: Courier;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: Courier;'>
+font-family: Courier;
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: monospace, monospace;'>
 font-family: monospace, monospace;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace, monospace;'>
+font-family: monospace, monospace;
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: monospace, "Courier New";'>
 font-family: monospace, "Courier New";
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace, "Courier New";'>
+font-family: monospace, "Courier New";
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: monospace, Courier;'>
 font-family: monospace, Courier;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace, Courier;'>
+font-family: monospace, Courier;
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: monospace, Verdana;'>
 font-family: monospace, Verdana;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace, Verdana;'>
+font-family: monospace, Verdana;
+</textarea>
+</td>
+</tr>
 
+<tr>
+<td>
 <pre style='
 font-family: monospace, DOESNOTEXISTREALLY;'>
 font-family: monospace, DOESNOTEXISTREALLY;
 </pre>
+</td>
+<td>
+<textarea style='
+font-family: monospace, DOESNOTEXISTREALLY;'>
+font-family: monospace, DOESNOTEXISTREALLY;
+</textarea>
+</td>
+</tr>
+
+</table>