[Misc] Fix deprecated URLs

README.md

@@ -1,19 +1,19 @@
 # XWiki Platform
 
-[XWiki Platform](http://platform.xwiki.org/xwiki/bin/view/Main/) is a generic wiki platform offering runtime services for applications built on top of it.
+[XWiki Platform](http://www.xwiki.org/xwiki/bin/view/Documentation/) is a generic wiki platform offering runtime services for applications built on top of it.
 
-XWiki Platform, XWiki Enterprise, XWiki Commons and XWiki Rendering are part of the [XWiki.org](http://www.xwiki.org/) software forge. They are released together and share the same version.
+XWiki Commons, XWiki Rendering and XWiki Platform are part of the [XWiki.org](http://www.xwiki.org/) software forge. They are released together and share the same version.
 
 ## Documentation
-* [API](http://platform.xwiki.org/xwiki/bin/view/DevGuide/API)
+* [API](http://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/API/)
 * [Development Zone](http://dev.xwiki.org/xwiki/bin/view/Community/)
 * Guides:
-  * [Developer Guide](http://platform.xwiki.org/xwiki/bin/view/DevGuide/)
-  * [Administrator Guide](http://platform.xwiki.org/xwiki/bin/view/AdminGuide/)
-  * [User Guide](http://enterprise.xwiki.org/xwiki/bin/view/GettingStarted/)
+  * [Developer Guide](http://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/)
+  * [Administrator Guide](http://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/)
+  * [User Guide](http://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/GettingStarted/)
 
 ## Download
-Read our [Download and Installation](http://enterprise.xwiki.org/xwiki/bin/view/Main/Download) instructions.
+Read our [Download and Installation](http://www.xwiki.org/xwiki/bin/view/Download/) instructions.
 
 ## Release Notes
 Read our [Release Notes](http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/).

xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxLinks.xml

@@ -91,7 +91,7 @@ The full format of a link is **##[label {> or |}] (resource) [@interWikiAlias
 **** **##pageName##**: A required string containing the name of the linked wiki page. Example: ##WebHome##
 ** **##queryString##**: An optional query string for specifying parameters that will be used in the rendered URL. Example: ##mydata1=5&mydata2=Hello##
 ** **##anchor##**: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for headings. Example: ##HTableOfContents##
-* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
+* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
 * **##target##**: An optional string corresponding to the HTML ##target## attribute for a HTML ##A## link element. This element is used when rendering the link. It defaults to opening the link in the current window. Examples: ##_self##, ##_blank##
 
 === 2.0 Links ===
@@ -128,7 +128,7 @@ The part in ##( )## is required, while the parts in ##[ ]## are optional.
 
 The full format of a link is **##[label>>] (resource) [@interWikiAlias] [||parameters]##**
 
-* **##label##**: An optional string which will be displayed to the user as the link name when rendered. The label may contain XWiki Syntax. If no label is specified a default label will be generated. The generation pattern can be changed, see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]. Example: ##My Page##
+* **##label##**: An optional string which will be displayed to the user as the link name when rendered. The label may contain XWiki Syntax. If no label is specified a default label will be generated. The generation pattern can be changed, see the [[Admin Guide>>http://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/]]. Example: ##My Page##
 * **##resource##**: The full link reference using the following syntax: **##(reference) [?queryString] [#anchor]##**
 ** **##reference##**: The link reference in one of the following forms:
 *** **URL**: Any URL in the form of **##protocol:~/~/path##**. Examples: ##http:~/~/xwiki.org##, ##https:~/~/svn.xwiki.org/##
@@ -145,7 +145,7 @@ The full format of a link is **##[label>>] (resource) [@interWikiAlias] [|
 **** **##emailAddress##**: Targeted email address. Example: "##john@smith.com##"
 ** **##queryString##**: An optional query string for specifying parameters that will be used in the rendered URL. Example: ##mydata1=5&mydata2=Hello##
 ** **##anchor##**: An optional anchor name pointing to an anchor defined in the referenced link. Note that in XWiki anchors are automatically created for headings. Example: ##HTableOfContents##
-* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
+* **##interWikiAlias##**: An optional [[Inter Wiki>>http://en.wikipedia.org/wiki/InterWiki]] alias as defined in the InterWiki Map (see the [[Admin Guide>>http://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/]]). This is only valid for wiki page names. Example: ##wikipedia##
 * **##parameters##**: An optional list of parameters passed to the link. Example: ##target="~_blank"## (open in new window)
 
 === 2.1 Links ===

xwiki-platform-core/xwiki-platform-web/src/main/webapp/resources/js/xwiki/xwiki.js

@@ -803,7 +803,7 @@ function openURL(url) {
  * @return
  */
 function openHelp() {
-    win = open( "http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax?xpage=print", "XWikiSyntax", "titlebar=0,width=750,height=480,resizable,scrollbars");
+    win = open( "http://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/Features/XWikiSyntax/WebHome?xpage=print", "XWikiSyntax", "titlebar=0,width=750,height=480,resizable,scrollbars");
     if( win ) {
         win.focus();
     }

xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/src/main/resources/XWiki/XWikiClasses.xml

@@ -63,7 +63,7 @@
   #end
 #end
 {{/velocity}}
-This tool allows to define structured data types (classes) in your wiki. Please consult the [[developer's guide>>http://platform.xwiki.org/xwiki/bin/DevGuide/]] to get familiar with the XWiki data model and the public APIs.
+This tool allows to define structured data types (classes) in your wiki. Please consult the [[developer's guide>>http://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/]] to get familiar with the XWiki data model and the public APIs.
 
 = Templates for new data types =
 

xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.cfg.vm

@@ -265,7 +265,7 @@ xwiki.virtual.usepath=$xwikiCfgVirtualUsepath
 # xwiki.servletpath=
 #-# The fallback servlet mapping name to use in the generated URLs. Unlike xwiki.servletpath, this is the value used
 #-# when the correct setting could not be determined from the request URL. A good way to use this setting is to achieve
-#-# short URLs, see http://platform.xwiki.org/xwiki/bin/Main/ShortURLs
+#-# short URLs, see https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/ShortURLs/
 # xwiki.defaultservletpath=bin/
 
 #-# Whether the /view/ part of the URL should be included if the target action is 'view'.