From b914327317d2547b73efaf488a49c31e2e660806 Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Thu, 31 May 2018 16:20:31 +0900
Subject: [PATCH] Reorder deprecated APIs (app)

---
 CHANGES              |  6 +++---
 doc/extdev/index.rst | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8c06a1122..3f5de8050 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,11 +40,8 @@ Deprecated
 ----------
 
 * :confval:`source_parsers` is deprecated
-* ``Application.import_object()`` is deprecated
 * Drop function based directive support.  For now, Sphinx only supports class
   based directives.
-* ``Sphinx.add_source_parser()`` has changed;  the *suffix* argument has
-  been deprecated
 * ``sphinx.util.docutils.directive_helper()`` is deprecated
 * ``sphinx.cmdline`` is deprecated
 * ``sphinx.locale.l_()`` is deprecated
@@ -52,6 +49,9 @@ Deprecated
 * ``app.override_domain()`` is deprecated
 * ``app.add_stylesheet()`` is deprecated
 * ``app.add_javascript()`` is deprecated
+* ``app.import_object()`` is deprecated
+* ``app.add_source_parser()`` has changed;  the *suffix* argument has been
+  deprecated
 * ``sphinx.versioning.prepare()`` is deprecated
 * ``Config.__init__()`` has changed;  the *dirname*, *filename* and *tags*
   argument has been deprecated
diff --git a/doc/extdev/index.rst b/doc/extdev/index.rst
index 0f3e6f5f0..194be710b 100644
--- a/doc/extdev/index.rst
+++ b/doc/extdev/index.rst
@@ -247,11 +247,23 @@ The following is a list of deprecated interface.
      - 3.0
      - ``sphinx.versioning.UIDTransform``
 
-   * - ``sphinx.application.Sphinx.override_domain()``
+   * - ``Sphinx.override_domain()``
      - 1.8
      - 3.0
      - :meth:`~sphinx.application.Sphinx.add_domain()`
 
+   * - ``Sphinx.import_object()``
+     - 1.8
+     - 3.0
+     - ``sphinx.util.import_object()``
+
+   * - ``suffix`` argument of
+       :meth:`~sphinx.application.Sphinx.add_source_parser()`
+     - 1.8
+     - 3.0
+     - :meth:`~sphinx.application.Sphinx.add_source_suffix()`
+
+
    * - ``BuildEnvironment.load()``
      - 1.8
      - 3.0
@@ -322,17 +334,6 @@ The following is a list of deprecated interface.
      - 3.0
      - :meth:`~sphinx.application.Sphinx.add_source_parser()`
 
-   * - ``Sphinx.import_object()``
-     - 1.8
-     - 3.0
-     - ``sphinx.util.import_object()``
-
-   * - ``suffix`` argument of
-       :meth:`~sphinx.application.Sphinx.add_source_parser()`
-     - 1.8
-     - 3.0
-     - :meth:`~sphinx.application.Sphinx.add_source_suffix()`
-
    * - ``sphinx.util.docutils.directive_helper()``
      - 1.8
      - 3.0