Merge "fix up release notes, file deprecations under right title"

releasenotes/notes/Assignment_V9_driver-c22be069f7baccb0.yaml

@@ -9,6 +9,8 @@ upgrade:
   - The V8 Assignment driver interface is deprecated, but still supported in
     this release, so any custom drivers based on the V8 interface should still
     work.
-other:
-  - Support for the V8 Assignment driver interface is planned to be removed in
+deprecations:
+  - >
+    [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
+    Support for the V8 Assignment driver interface is planned to be removed in
     the 'O' release of OpenStack.

releasenotes/notes/Role_V9_driver-971c3aae14d9963d.yaml

@@ -5,6 +5,8 @@ upgrade:
   - The V8 Role driver interface is deprecated, but still supported in
     this release, so any custom drivers based on the V8 interface should still
     work.
-other:
-  - Support for the V8 Role driver interface is planned to be removed in
+deprecations:
+  - >
+    [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
+    Support for the V8 Role driver interface is planned to be removed in
     the 'O' release of OpenStack.

releasenotes/notes/deprecate-endpoint-policy-cfg-option-d018acab72a398a0.yaml

@@ -1,4 +1,6 @@
 ---
-other:
-  - Deprecate the ``enabled`` option from ``[endpoint_policy]``, it will be
+deprecations:
+  - >
+    [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
+    Deprecate the ``enabled`` option from ``[endpoint_policy]``, it will be
     removed in the 'O' release, and the extension will always be enabled.

releasenotes/notes/deprecate-ldap-role-ad28dce16863bbb1.yaml

@@ -1,6 +1,7 @@
 ---
-other:
+deprecations:
   - >
     [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
-    Deprecated the LDAP backend for the role driver. The keystone team suggests using the SQL backend instead.
-    The LDAP backend will be removed in the 'O' release.
+    Deprecated the LDAP backend for the *role* driver. The keystone team
+    suggests using the SQL backend instead. The LDAP role backend will be
+    removed in the 'O' release.

releasenotes/notes/deprecated-as-of-mitaka-8534e43fa40c1d09.yaml

@@ -1,5 +1,5 @@
 ---
-other:
+deprecations:
   - >
     [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
     As of the Mitaka release, the PKI and PKIz token formats have been

releasenotes/notes/extensions-to-core-a0d270d216d47276.yaml

@@ -1,12 +1,5 @@
 ---
-other:
-  - >
-    [`blueprint move-extensions <https://blueprints.launchpad.net/keystone/+spec/move-extensions>`_]
-    If any extension migrations are run, for example: ``keystone-manage db_sync
-    --extension endpoint_policy`` an error will be returned. This is working as
-    designed. To run these migrations simply run: ``keystone-manage db_sync``.
-    The complete list of affected extensions are: ``oauth1``, ``federation``,
-    ``endpoint_filter``, ``endpoint_policy``, and ``revoke``.
+upgrade:
   - >
     The ``keystone-paste.ini`` file must be updated to remove extension
     filters, and their use in ``[pipeline:api_v3]``.
@@ -15,3 +8,11 @@ other:
     and ``[filter:revoke_extension]``. See the sample `keystone-paste.ini
     <https://git.openstack.org/cgit/openstack/keystone/tree/etc/keystone-paste.ini>`_
     file for guidance.
+other:
+  - >
+    [`blueprint move-extensions <https://blueprints.launchpad.net/keystone/+spec/move-extensions>`_]
+    If any extension migrations are run, for example: ``keystone-manage db_sync
+    --extension endpoint_policy`` an error will be returned. This is working as
+    designed. To run these migrations simply run: ``keystone-manage db_sync``.
+    The complete list of affected extensions are: ``oauth1``, ``federation``,
+    ``endpoint_filter``, ``endpoint_policy``, and ``revoke``.

releasenotes/notes/httpd-keystone-d51b7335559b09c8.yaml

@@ -1,5 +1,7 @@
 ---
-other:
-  - The file ``httpd/keystone.py`` has been deprecated in favor of
+deprecations:
+  - >
+    [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
+    The file ``httpd/keystone.py`` has been deprecated in favor of
     ``keystone-wsgi-admin`` and ``keystone-wsgi-public`` and may be
     removed in the 'O' release.

releasenotes/notes/oslo.cache-a9ce47bfa8809efa.yaml

@@ -7,8 +7,9 @@ upgrade:
     sample configuration file for examples. See `oslo.cache
     <http://docs.openstack.org/developer/oslo.cache>`_ for additional
     documentation.
-other:
+deprecations:
   - >
+    [`blueprint deprecated-as-of-mitaka <https://blueprints.launchpad.net/keystone/+spec/deprecated-as-of-mitaka>`_]
     ``keystone.common.cache.backends.memcache_pool``,
     ``keystone.common.cache.backends.mongo``, and
     ``keystone.common.cache.backends.noop`` are deprecated in favor of

releasenotes/notes/x509-auth-df0a229780b8e3ff.yaml

@@ -1,3 +1,4 @@
+---
 features:
   - >
    [`blueprint x509-ssl-client-cert-authn <https://blueprints.launchpad.net/keystone/+spec/x509-ssl-client-cert-authn>`_]