Merge branch 'remove/wiki' into 3.2.x

Author: marc1706

development/extensions/modification_to_extension.rst

@@ -689,7 +689,7 @@ In the ``getSubscribedEvents()`` method we tell the system which events we
 want to subscribe our new custom functions to.
 In our case we want to subscribe to two events: the ``core.page_header`` event 
 and the ``core.user_setup`` event (a full list
-of events can be found `here <https://wiki.phpbb.com/Event_List>`_):
+of events can be found `here <https://area51.phpbb.com/docs/dev/3.3.x/extensions/events_list.html>`_):
 
 .. code-block:: php
 
@@ -756,7 +756,7 @@ you need one file per template event.
 The filename includes the event name. In order to add the Newspage link
 next to the FAQ link, we need to use the
 ``'overall_header_navigation_prepend'`` event (a full list of events can be
-found `here <https://wiki.phpbb.com/Event_List>`_).
+found `here <https://area51.phpbb.com/docs/dev/3.3.x/extensions/events_list.html>`_).
 
 So we add the
 ``styles/prosilver/template/event/overall_header_navigation_prepend_listener.html``
@@ -787,8 +787,7 @@ Compatibility
 =============
 
 In some cases the compatibility of functions and classes could not be kept,
-while increasing their power for 3.1. You can see a list of these in the Wiki-Article
-about `PhpBB3.1 <https://wiki.phpbb.com/PhpBB3.1>`_
+while increasing their power for 3.1.
 
 Pagination
 ----------

development/extensions/tutorial_authentication.rst

@@ -108,7 +108,7 @@ authentication provider class is show below:
 
 The service file
 ^^^^^^^^^^^^^^^^
-For proper `dependency injection <https://wiki.phpbb.com/Dependency_Injection_Container>`_
+For proper :ref:`dependency injection <dependency-injection>`
 the provider must be added to ``services.yml``. The name of the service 
 must be in the form of ``auth.provider.<service name>`` in order for phpBB to register it.
 The arguments are those of the provider's constructor and may be empty if no arguments are

development/extensions/tutorial_events.rst

@@ -30,7 +30,7 @@ multiple useful injection points. A typical template event looks like:
 
 .. seealso::
 
-    View the full list of `Template events <https://wiki.phpbb.com/Event_List#Template_Events>`_ in our Wiki.
+    View the full list of `Template events <https://area51.phpbb.com/docs/dev/3.3.x/extensions/events_list.html#template-events>`_ in our Wiki.
 
 Listening for an event
 ----------------------
@@ -115,7 +115,7 @@ Listeners
 
 .. seealso::
 
-    View the full list of supported `PHP events <https://wiki.phpbb.com/Event_List>`_ in our Wiki.
+    View the full list of supported `PHP events <https://area51.phpbb.com/docs/dev/3.3.x/extensions/events_list.html#php-events>`_ in our Wiki.
 
 The event listener
 ------------------

development/extensions/tutorial_key_concepts.rst

@@ -16,6 +16,7 @@ This tutorial explains:
  * `Language files`_
  * `Javascript and CSS files`_
 
+.. _dependency-injection:
 
 Dependency injection
 ====================
@@ -74,8 +75,7 @@ controllers and event listeners. The exceptions to this are any ACP/MCP/UCP file
 
 .. seealso::
 
-    * `Dependency Injection Container Wiki <https://wiki.phpbb.com/Dependency_Injection_Container>`_
-    * `Symfony: The DependencyInjection Component <http://symfony.com/doc/2.3/components/dependency_injection/introduction.html>`_
+    * `Symfony: The DependencyInjection Component <https://symfony.com/doc/2.8/components/dependency_injection.html>`_
 
 
 PHP files
@@ -197,7 +197,7 @@ An example directory structure for an extension with universal (all) files and t
 .. seealso::
 
     * `Twig Template Syntax <http://twig.sensiolabs.org/>`_ at Sensio Labs.
-    * `phpBB Template Syntax <https://wiki.phpbb.com/Tutorial.Template_syntax#Syntax_elements>`_ Wiki page.
+    * :ref:`Tutorial: Template Syntax <tutorial-template-syntax>`.
     * The phpBB Customisation Database `Template Validation Policy <https://www.phpbb.com/extensions/rules-and-policies/validation-policy/#templates>`_.
 
 Language files

development/extensions/tutorial_templates.rst

@@ -1,3 +1,5 @@
+.. _tutorial-template-syntax:
+
 =========================
 Tutorial: Template syntax
 =========================

development/language/usage.rst

@@ -110,7 +110,7 @@ Using the Language System in template files
 ===========================================
 
 Language entries in
-`Using the Template System <https://wiki.phpbb.com/Using_the_phpBB3.0_Template_System>`_
+:ref:`Template Syntax <tutorial-template-syntax>`
 are a major improvement since phpBB 3.0. There is no longer a need to manually
 assign these in the PHP file; language entries of loaded language files can be
 used automatically.

readme.md

@@ -5,7 +5,6 @@ Documentation for board visitors, moderators and administrators. Can be seen onl
 ## Patches
 
 Do you have an improvement? Did you fix a bug? Fork our GitHub repo, make your changes in a separate branch and send a pull request.
-Please read the [Git Sub-Project Guidelines](http://wiki.phpbb.com/Sub-Project_Contribution_Guidelines) before forking and fixing bugs.
 
 ## Translations