Merge "Fix reno for RC1"

releasenotes/notes/api-database-now-required-6245f39d36885d1c.yaml

@@ -1,8 +1,4 @@
 ---
-prelude: >
-    Nova now requires a separate API database and manual
-    intervention is required during an upgrade to Mitaka.
-
 upgrade:
   - During an upgrade to Mitaka, operators must create and initialize
     a database for the API service. Configure this in

releasenotes/notes/deprecate_pluggable_managers-ca0224bcd779454c.yaml

@@ -1,7 +1,7 @@
 ---
 deprecations:
-
-  - Nove used to support the concept that ``service managers`` were
+  - |
+    Nova used to support the concept that ``service managers`` were
     replaceable components. There are many config options where you can
     replace a manager by specifying a new class. This concept is
     deprecated in Mitaka as are the following config options.

releasenotes/notes/disable_ec2_api_by_default-0ec0946433fc7119.yaml

@@ -1,6 +1,2 @@
 ---
-upgrade:
-  - As of Kilo the in tree EC2 API is marked as deprecated.
-    The in tree EC2 API is now disabled by default. You have
-    to add ``ec2`` to the ``enabled_apis`` configuration parameter
-    if you stil want to use it.
+prelude: >

releasenotes/notes/reserved-hugepages-per-nodes-f36225d5fca807e4.yaml

@@ -0,0 +1,2 @@
+---
+prelude: >

releasenotes/notes/zookeeper-servicegroup-driver-removed-c3bcaa6f9fe976ed.yaml

@@ -1,5 +1,5 @@
 ---
-upgrade:
+deprecations:
   - |
     The Zookeeper Service Group driver has been removed.