resolve merge conflicts

docs/extensiondev.rst

@@ -29,13 +29,7 @@ be something like "Flask-SimpleXML".  Make sure to include the name
 This is how users can then register dependencies to your extension in
 their :file:`setup.py` files.
 
-Flask sets up a redirect package called :data:`flask.ext` where users
-should import the extensions from.  If you for instance have a package
-called ``flask_something`` users would import it as
-``flask.ext.something``.  This is done to transition from the old
-namespace packages.  See :ref:`ext-import-transition` for more details.
-
-But how do extensions look like themselves?  An extension has to ensure
+But what do extensions look like themselves?  An extension has to ensure
 that it works with multiple Flask application instances at once.  This is
 a requirement because many people will use patterns like the
 :ref:`app-factories` pattern to create their application as needed to aid
@@ -355,60 +349,62 @@ new releases.  These approved extensions are listed on the `Flask
 Extension Registry`_ and marked appropriately.  If you want your own
 extension to be approved you have to follow these guidelines:
 
-0. An approved Flask extension requires a maintainer. In the event an
-   extension author would like to move beyond the project, the project should
-   find a new maintainer including full source hosting transition and PyPI
-   access.  If no maintainer is available, give access to the Flask core team.
-1. An approved Flask extension must provide exactly one package or module
-   named ``flask_extensionname``.
-2. It must ship a testing suite that can either be invoked with ``make test``
-   or ``python setup.py test``.  For test suites invoked with ``make
-   test`` the extension has to ensure that all dependencies for the test
-   are installed automatically.  If tests are invoked with ``python setup.py
-   test``, test dependencies can be specified in the `setup.py` file.  The
-   test suite also has to be part of the distribution.
-3. APIs of approved extensions will be checked for the following
-   characteristics:
+0.  An approved Flask extension requires a maintainer. In the event an
+    extension author would like to move beyond the project, the project should
+    find a new maintainer including full source hosting transition and PyPI
+    access.  If no maintainer is available, give access to the Flask core team.
+1.  An approved Flask extension must provide exactly one package or module
+    named ``flask_extensionname``.
+2.  It must ship a testing suite that can either be invoked with ``make test``
+    or ``python setup.py test``.  For test suites invoked with ``make
+    test`` the extension has to ensure that all dependencies for the test
+    are installed automatically.  If tests are invoked with ``python setup.py
+    test``, test dependencies can be specified in the :file:`setup.py` file.  The
+    test suite also has to be part of the distribution.
+3.  APIs of approved extensions will be checked for the following
+    characteristics:
 
    -   an approved extension has to support multiple applications
        running in the same Python process.
    -   it must be possible to use the factory pattern for creating
        applications.
 
-4. The extension must be BSD/MIT/WTFPL licensed.
-5. The naming scheme for official extensions is *Flask-ExtensionName* or
-   *ExtensionName-Flask*.
-6. Approved extensions must define all their dependencies in the
-   `setup.py` file unless a dependency cannot be met because it is not
-   available on PyPI.
-7. The extension must have documentation that uses one of the two Flask
-   themes for Sphinx documentation.
-8. The ``zip_safe`` flag in the setup script must be set to ``False``,
+4.  The license must be BSD/MIT/WTFPL licensed.
+5.  The naming scheme for official extensions is *Flask-ExtensionName* or
+    *ExtensionName-Flask*.
+6.  Approved extensions must define all their dependencies in the
+    :file:`setup.py` file unless a dependency cannot be met because it is not
+    available on PyPI.
+7.  The extension must have documentation that uses one of the two Flask
+    themes for Sphinx documentation.
+8.  The setup.py description (and thus the PyPI description) has to
+    link to the documentation, website (if there is one) and there
+    must be a link to automatically install the development version
+    (``PackageName==dev``).
+9. The ``zip_safe`` flag in the setup script must be set to ``False``,
    even if the extension would be safe for zipping.
-9. An extension currently has to support Python 2.7, Python 3.3 and higher.
+10. An extension currently has to support Python 2.7, Python 3.3 and higher.
 
 
-.. _ext-import-transition:
 
 Extension Import Transition
 ---------------------------
 
-For a while we recommended using namespace packages for Flask extensions.
-This turned out to be problematic in practice because many different
-competing namespace package systems exist and pip would automatically
-switch between different systems and this caused a lot of problems for
-users.
+In early versions of Flask we recommended using namespace packages for Flask
+extensions, of the form ``flaskext.foo``. This turned out to be problematic in
+practice because it meant that multiple ``flaskext`` packages coexist.
+Consequently we have recommended to name extensions ``flask_foo`` over
+``flaskext.foo`` for a long time.
 
-Instead we now recommend naming packages ``flask_foo`` instead of the now
-deprecated ``flaskext.foo``.  Flask 0.8 introduces a redirect import
-system that lets uses import from ``flask.ext.foo`` and it will try
-``flask_foo`` first and if that fails ``flaskext.foo``.
+Flask 0.8 introduced a redirect import system as a compatibility aid for app
+developers: Importing ``flask.ext.foo`` would try ``flask_foo`` and
+``flaskext.foo`` in that order.
 
-Flask extensions should urge users to import from ``flask_foo``
-instead of ``flask.ext.foo`` or ``flaskext_foo`` so that extensions can
-transition to the new package name without affecting users.
+As of Flask 0.11, most Flask extensions have transitioned to the new naming
+schema. The ``flask.ext.foo`` compatibility alias is still in Flask 0.11 but is
+now deprecated -- you should use ``flask_foo``.
 
 
-.. _OAuth extension: http://pythonhosted.org/Flask-OAuth/
+.. _OAuth extension: https://pythonhosted.org/Flask-OAuth/
 .. _mailinglist: http://flask.pocoo.org/mailinglist/
 .. _IRC channel: http://flask.pocoo.org/community/irc/