diff --git a/doc/admin-guide-cloud/bk-admin-guide-cloud.xml b/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
index 5d0827b47d..9517015a68 100644
--- a/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
+++ b/doc/admin-guide-cloud/bk-admin-guide-cloud.xml
@@ -20,9 +20,10 @@
         </author>
         <copyright>
             <year>2013</year>
+            <year>2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>icehouse</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="apache2">
diff --git a/doc/cli-reference/bk-cli-reference.xml b/doc/cli-reference/bk-cli-reference.xml
index c147081959..82c35ffee8 100644
--- a/doc/cli-reference/bk-cli-reference.xml
+++ b/doc/cli-reference/bk-cli-reference.xml
@@ -24,9 +24,9 @@
             <year>2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>trunk</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
-        <pubdate></pubdate>
+        <pubdate/>
         <legalnotice role="cc-by">
             <annotation>
                 <remark>Remaining licensing details are filled in by
@@ -34,9 +34,8 @@
             </annotation>
         </legalnotice>
         <abstract>
-            <para>
-                This guide documents the OpenStack command-line clients.
-            </para>
+            <para>This guide documents the OpenStack command-line
+                clients.</para>
         </abstract>
         <revhistory>
             <!-- ... continue adding more revisions here as you
@@ -48,9 +47,9 @@
                     <itemizedlist>
                         <listitem>
                             <para>Updated documentation for clients,
-                            add trove options, document neutron-debug,
-                            document Image Service property
-                            keys.</para>
+                                add trove options, document
+                                neutron-debug, document Image Service
+                                property keys.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -70,7 +69,8 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Added documentation for the neutron-debug command.</para>
+                            <para>Added documentation for the
+                                neutron-debug command.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
diff --git a/doc/high-availability-guide/ha-guide-docinfo.xml b/doc/high-availability-guide/ha-guide-docinfo.xml
index 8116535078..352d1f4022 100644
--- a/doc/high-availability-guide/ha-guide-docinfo.xml
+++ b/doc/high-availability-guide/ha-guide-docinfo.xml
@@ -14,7 +14,7 @@
         <year>2013</year>
         <holder>OpenStack Contributors</holder>
     </copyright>
-    <releaseinfo>master</releaseinfo>
+    <releaseinfo>current</releaseinfo>
     <productname>OpenStack</productname>
     <pubdate></pubdate>
     <legalnotice role="apache2">
diff --git a/doc/image-guide/bk-imageguide.xml b/doc/image-guide/bk-imageguide.xml
index e39f68aa81..e587a2a286 100644
--- a/doc/image-guide/bk-imageguide.xml
+++ b/doc/image-guide/bk-imageguide.xml
@@ -24,9 +24,9 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>icehouse</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
-        <pubdate></pubdate>
+        <pubdate/>
         <legalnotice role="cc-by">
             <annotation>
                 <remark>Remaining licensing details are filled in by
@@ -45,7 +45,8 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Adds information about image formats, properties.</para>
+                            <para>Adds information about image
+                                formats, properties.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -65,17 +66,19 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Updated title for consistency.</para>
+                            <para>Updated title for
+                                consistency.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
             </revision>
-<revision>
+            <revision>
                 <date>2013-05-28</date>
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Initial release of this guide.</para>
+                            <para>Initial release of this
+                                guide.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
diff --git a/doc/security-guide/bk_openstack-sec-guide.xml b/doc/security-guide/bk_openstack-sec-guide.xml
index 998ec17e7b..ed5a5a6c3f 100644
--- a/doc/security-guide/bk_openstack-sec-guide.xml
+++ b/doc/security-guide/bk_openstack-sec-guide.xml
@@ -18,7 +18,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>icehouse</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
diff --git a/doc/user-guide-admin/bk-admin-user-guide.xml b/doc/user-guide-admin/bk-admin-user-guide.xml
index 99f6397150..3a098593bf 100644
--- a/doc/user-guide-admin/bk-admin-user-guide.xml
+++ b/doc/user-guide-admin/bk-admin-user-guide.xml
@@ -25,7 +25,7 @@
             <year>2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>icehouse</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
@@ -35,12 +35,11 @@
             </annotation>
         </legalnotice>
         <abstract>
-            <para>OpenStack is an open source cloud computing platform
-                for public and private clouds. A series of
-                interrelated projects deliver a cloud infrastructure
-                solution. This guide shows OpenStack admin users how
-                to create and manage resources in an OpenStack cloud
-                with the OpenStack dashboard or OpenStack client
+            <para>OpenStack is an open source cloud computing platform for
+                public and private clouds. A series of interrelated projects
+                deliver a cloud infrastructure solution. This guide shows
+                OpenStack admin users how to create and manage resources in an
+                OpenStack cloud with the OpenStack dashboard or OpenStack client
                 commands.</para>
         </abstract>
         <revhistory>
@@ -49,11 +48,11 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Remove the command reference
-                            appendix. This information is now in <link
-                            xlink:href="http://docs.openstack.org/cli-reference/content/"><citetitle>OpenStack
-                            Command Line Interface
-                            Reference</citetitle></link>.
+                            <para>Remove the command reference appendix. This
+                                information is now in <link
+                                    xlink:href="http://docs.openstack.org/cli-reference/content/"
+                                        ><citetitle>OpenStack Command Line
+                                        Interface Reference</citetitle></link>.
                             </para>
                         </listitem>
                     </itemizedlist>
@@ -74,8 +73,7 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>First edition of this
-                                document.</para>
+                            <para>First edition of this document.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
diff --git a/doc/user-guide/bk-user-guide.xml b/doc/user-guide/bk-user-guide.xml
index 594f3563e7..49c24973f9 100644
--- a/doc/user-guide/bk-user-guide.xml
+++ b/doc/user-guide/bk-user-guide.xml
@@ -25,7 +25,7 @@
             <year>2014</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>icehouse</releaseinfo>
+        <releaseinfo>current</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
@@ -35,13 +35,12 @@
             </annotation>
         </legalnotice>
         <abstract>
-            <para>OpenStack is an open-source cloud computing platform
-                for public and private clouds. A series of
-                interrelated projects deliver a cloud infrastructure
-                solution. This guide shows OpenStack end users how to
-                create and manage resources in an OpenStack cloud with
-                the OpenStack dashboard and OpenStack client
-                commands.</para>
+            <para>OpenStack is an open-source cloud computing platform for
+                public and private clouds. A series of interrelated projects
+                deliver a cloud infrastructure solution. This guide shows
+                OpenStack end users how to create and manage resources in an
+                OpenStack cloud with the OpenStack dashboard and OpenStack
+                client commands.</para>
         </abstract>
         <revhistory>
             <revision>
@@ -53,7 +52,8 @@
                                 information is now in the <link
                                     xlink:href="http://docs.openstack.org/cli-reference/content/"
                                         ><citetitle>OpenStack Command-Line
-                                        Interface Reference</citetitle></link>.</para>
+                                        Interface
+                                Reference</citetitle></link>.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -63,8 +63,7 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>Added the OpenStack Python SDK
-                                chapter.</para>
+                            <para>Added the OpenStack Python SDK chapter.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>
@@ -94,8 +93,7 @@
                 <revdescription>
                     <itemizedlist>
                         <listitem>
-                            <para>First edition of this
-                                document.</para>
+                            <para>First edition of this document.</para>
                         </listitem>
                     </itemizedlist>
                 </revdescription>