diff --git a/doc/admin-guide-cloud/source/blockstorage_volume_migration.rst b/doc/admin-guide-cloud/source/blockstorage_volume_migration.rst
index 996cb74e01..62fea08b2c 100644
--- a/doc/admin-guide-cloud/source/blockstorage_volume_migration.rst
+++ b/doc/admin-guide-cloud/source/blockstorage_volume_migration.rst
@@ -29,7 +29,7 @@ These workflows are possible for a migration:
 
       While most back-ends support this function, not all do. See the driver
       documentation in the `OpenStack Configuration Reference
-      <http://docs.openstack.org/kilo/config-reference/content/>`__ for more
+      <http://docs.openstack.org/liberty/config-reference/content/>`__ for more
       details.
 
 #. If the volume is attached to a VM instance, the Block Storage creates a
diff --git a/doc/admin-guide-cloud/source/compute-configuring-migrations.rst b/doc/admin-guide-cloud/source/compute-configuring-migrations.rst
index 02db0cd8b0..c02e5d9389 100644
--- a/doc/admin-guide-cloud/source/compute-configuring-migrations.rst
+++ b/doc/admin-guide-cloud/source/compute-configuring-migrations.rst
@@ -272,7 +272,7 @@ Example Compute installation environment
 #. You can now configure other options for live migration. In most cases, you
    will not need to configure any options. For advanced configuration options,
    see the `OpenStack Configuration Reference Guide <http://docs.openstack.org/
-   kilo/config-reference/content/list-of-compute-config-options.html
+   liberty/config-reference/content/list-of-compute-config-options.html
    #config_table_nova_livemigration>`_.
 
 .. _true-live-migration-kvm-libvirt:
diff --git a/doc/admin-guide-cloud/source/compute-images-instances.rst b/doc/admin-guide-cloud/source/compute-images-instances.rst
index 63b13d9527..1c0b2236c4 100644
--- a/doc/admin-guide-cloud/source/compute-images-instances.rst
+++ b/doc/admin-guide-cloud/source/compute-images-instances.rst
@@ -29,7 +29,7 @@ flavors that you can edit or add to.
 
    -  For more information about image configuration options, see the
       `Image
-      services <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-image-service.html>`__
+      services <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-image-service.html>`__
       section of the OpenStack Configuration Reference.
 
    -  For more information about flavors, see :ref:`compute-flavors` or
@@ -286,7 +286,7 @@ these steps:
    `glance-api` service does not start.
 
    To view a sample configuration file, see
-   `glance-api.conf <http://docs.openstack.org/kilo/config-reference/content/section_glance-api.conf.html>`__.
+   `glance-api.conf <http://docs.openstack.org/liberty/config-reference/content/section_glance-api.conf.html>`__.
 
 #. Optionally, in the :file:`glance-api.conf` file, specify whether roles or
    policies are used in the property protections configuration file::
@@ -296,7 +296,7 @@ these steps:
    The default is ``roles``.
 
    To view a sample configuration file, see
-   `glance-api.conf <http://docs.openstack.org/kilo/config-reference/content/section_glance-api.conf.html>`__.
+   `glance-api.conf <http://docs.openstack.org/liberty/config-reference/content/section_glance-api.conf.html>`__.
 
 Image download: how it works
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -330,7 +330,7 @@ Compute nodes also implement caching of images, meaning that if an image
 has been used before it won't necessarily be downloaded every time.
 Information on the configuration options for caching on compute nodes
 can be found in the `Configuration
-Reference <http://docs.openstack.org/kilo/config-reference/content/>`__.
+Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
 
 Instance building blocks
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -426,7 +426,7 @@ Guide <http://docs.openstack.org/user-guide/index.html>`__.
 Control where instances run
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The `OpenStack Configuration
-Reference <http://docs.openstack.org/kilo/config-reference/content/>`__
+Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
 provides detailed information on controlling where your instances run,
 including ensuring a set of instances run on different compute nodes for
 service resiliency or on the same node for high performance
diff --git a/doc/admin-guide-cloud/source/compute-live-migration-usage.rst b/doc/admin-guide-cloud/source/compute-live-migration-usage.rst
index 33f0d532ac..55c2ee6069 100644
--- a/doc/admin-guide-cloud/source/compute-live-migration-usage.rst
+++ b/doc/admin-guide-cloud/source/compute-live-migration-usage.rst
@@ -16,7 +16,7 @@ Before starting a migration, review the Configure migrations section.
        Although the :command:`nova` command is called :command:`live-migration`,
        under the default Compute configuration options, the instances
        are suspended before migration. For more information, see
-       `Configure migrations <http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_.
+       `Configure migrations <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_.
        in the OpenStack Configuration Reference.
 
 **Migrating instances**
diff --git a/doc/admin-guide-cloud/source/compute-manage-logs.rst b/doc/admin-guide-cloud/source/compute-manage-logs.rst
index a9de519e63..5e7f28bd91 100644
--- a/doc/admin-guide-cloud/source/compute-manage-logs.rst
+++ b/doc/admin-guide-cloud/source/compute-manage-logs.rst
@@ -39,7 +39,7 @@ For more about the logging configuration syntax, including the
 on logging configuration files.
 
 For an example :file:`logging.conf` file with various defined handlers, see
-the `OpenStack Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/>`__.
+the `OpenStack Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
 
 Syslog
 ~~~~~~
@@ -130,8 +130,8 @@ The serial console provides a way to examine kernel output and other
 system messages during troubleshooting if the instance lacks network
 connectivity.
 
-OpenStack Icehouse and earlier supports read-only access using the
-serial console using the ``os-GetSerialOutput`` server action. Most
+Read-only access from server serial console is possible
+using the ``os-GetSerialOutput`` server action. Most
 cloud images enable this feature by default. For more information, see
 :ref:`compute-common-errors-and-fixes`.
 
diff --git a/doc/admin-guide-cloud/source/compute-networking-nova.rst b/doc/admin-guide-cloud/source/compute-networking-nova.rst
index f298301157..34b0f0456d 100644
--- a/doc/admin-guide-cloud/source/compute-networking-nova.rst
+++ b/doc/admin-guide-cloud/source/compute-networking-nova.rst
@@ -195,7 +195,7 @@ configuration file. Specify the configuration file using the
 
 For more information about creating a dnsmasq configuration file, see
 the `OpenStack Configuration
-Reference <http://docs.openstack.org/kilo/config-reference/content/>`__,
+Reference <http://docs.openstack.org/liberty/config-reference/content/>`__,
 and `the dnsmasq
 documentation <http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq.conf.example>`__.
 
diff --git a/doc/admin-guide-cloud/source/compute-service-groups.rst b/doc/admin-guide-cloud/source/compute-service-groups.rst
index dec0af7de6..0b7a1db8b8 100644
--- a/doc/admin-guide-cloud/source/compute-service-groups.rst
+++ b/doc/admin-guide-cloud/source/compute-service-groups.rst
@@ -80,7 +80,7 @@ node for the ZooKeeper driver:
    address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181"
 
 For Compute Service groups customization options, see the `OpenStack
-Configuration Reference Guide <http://docs.openstack.org/kilo/config-reference/
+Configuration Reference Guide <http://docs.openstack.org/liberty/config-reference/
 content/list-of-compute-config-options.html#config_table_nova_zookeeper>`_.
 
 .. _memcache-servicegroup-driver:
diff --git a/doc/admin-guide-cloud/source/compute_arch.rst b/doc/admin-guide-cloud/source/compute_arch.rst
index f3b7fdbce0..bdf02b8152 100644
--- a/doc/admin-guide-cloud/source/compute_arch.rst
+++ b/doc/admin-guide-cloud/source/compute_arch.rst
@@ -72,7 +72,7 @@ availability zones. Compute supports the following hypervisors:
 -  `Xen <http://www.xen.org/support/documentation.html>`__
 
 For more information about hypervisors, see the
-`Hypervisors <http://docs.openstack.org/kilo/config-reference/content/section_compute-hypervisors.html>`__
+`Hypervisors <http://docs.openstack.org/liberty/config-reference/content/section_compute-hypervisors.html>`__
 section in the OpenStack Configuration Reference.
 
 Tenants, users, and roles
@@ -179,7 +179,7 @@ case, the root file system can be on the persistent volume, and its
 state is maintained, even if the instance is shut down. For more
 information about this type of configuration, see the `OpenStack
 Configuration Reference
-<http://docs.openstack.org/kilo/config-reference/content/>`__.
+<http://docs.openstack.org/liberty/config-reference/content/>`__.
 
 .. note::
 
@@ -196,7 +196,7 @@ In addition to the native compute API, OpenStack provides an
 EC2-compatible API. This API allows EC2 legacy workflows built for EC2
 to work with OpenStack. For more information and configuration options
 about this compatibility API, see the `OpenStack Configuration
-Reference <http://docs.openstack.org/kilo/config-reference/content/>`__.
+Reference <http://docs.openstack.org/liberty/config-reference/content/>`__.
 
 Numerous third-party tools and language-specific SDKs can be used to
 interact with OpenStack clouds, using both native and compatibility
diff --git a/doc/admin-guide-cloud/source/cross_project_cors.rst b/doc/admin-guide-cloud/source/cross_project_cors.rst
index 44dd679d5e..d560baf74c 100644
--- a/doc/admin-guide-cloud/source/cross_project_cors.rst
+++ b/doc/admin-guide-cloud/source/cross_project_cors.rst
@@ -24,7 +24,7 @@ security advisory below for more information.
    not covered by this document. For those, please refer to their respective
    implementations:
 
-   * `CORS in Object Storage <http://docs.openstack.org/kilo/config-reference/content/object-storage-cores.html>`_
+   * `CORS in Object Storage <http://docs.openstack.org/liberty/config-reference/content/object-storage-cores.html>`_
    * `CORS in dashboard <http://docs.openstack.org/security-guide/dashboard/cross-origin-resource-sharing-cors.html>`_
 
 
diff --git a/doc/admin-guide-cloud/source/networking_config-agents.rst b/doc/admin-guide-cloud/source/networking_config-agents.rst
index e378017209..9d4e3d1a0e 100644
--- a/doc/admin-guide-cloud/source/networking_config-agents.rst
+++ b/doc/admin-guide-cloud/source/networking_config-agents.rst
@@ -122,7 +122,7 @@ service, or no longer needed.
 
 This feature applies to all plug-ins that support DHCP scaling. For more
 information, see the `DHCP agent configuration
-options <http://docs.openstack.org/kilo/config-reference/content/networking
+options <http://docs.openstack.org/liberty/config-reference/content/networking
 -options-dhcp.html>`__
 listed in the OpenStack Configuration Reference.
 
@@ -420,7 +420,7 @@ Configure Hyper-V L2 agent
 Before you install the OpenStack Networking Hyper-V L2 agent on a
 Hyper-V compute node, ensure the compute node has been configured
 correctly using these
-`instructions <http://docs.openstack.org/kilo/config-reference/content/
+`instructions <http://docs.openstack.org/liberty/config-reference/content/
 hyper-v-virtualization-platform.html>`__.
 
 **To install the OpenStack Networking Hyper-V agent and configure the node**
@@ -447,7 +447,7 @@ hyper-v-virtualization-platform.html>`__.
 
 #. Create the :file:`C:\etc\neutron-hyperv-agent.conf` file and add the proper
    configuration options and the `Hyper-V related
-   options <http://docs.openstack.org/kilo/config-reference/content/
+   options <http://docs.openstack.org/liberty/config-reference/content/
    networking-plugin-hyperv_agent.html>`__. Here is a sample config file:
 
    .. code-block:: ini
diff --git a/doc/admin-guide-cloud/source/networking_introduction.rst b/doc/admin-guide-cloud/source/networking_introduction.rst
index 35b53138cb..5f427bbb06 100644
--- a/doc/admin-guide-cloud/source/networking_introduction.rst
+++ b/doc/admin-guide-cloud/source/networking_introduction.rst
@@ -297,12 +297,6 @@ an IP address between two instances to enable fast data plane failover.
      $ neutron port-update PORT_UUID --allowed-address-pairs type=dict
      list=true mac_address=MAC_ADDRESS,ip_address=IP_CIDR
 
-.. Note::
-
-    In releases earlier than Juno, OpenStack Networking prevents setting
-    an allowed address pair on a port that matches the MAC address and
-    one of the fixed IP addresses of the port.
-
 .. |FWaaS architecture| image:: ../../common/figures/fwaas.png
 
 
diff --git a/doc/admin-guide-cloud/source/objectstorage-admin.rst b/doc/admin-guide-cloud/source/objectstorage-admin.rst
index 4969ee8562..34a6636a29 100644
--- a/doc/admin-guide-cloud/source/objectstorage-admin.rst
+++ b/doc/admin-guide-cloud/source/objectstorage-admin.rst
@@ -8,5 +8,5 @@ information is maintained in developer documentation at
 `docs.openstack.org/developer/swift/ <http://docs.openstack.org/developer/swift/>`__.
 
 See the `OpenStack Configuration
-Reference <http://docs.openstack.org/kilo/config-reference/content/>`__
+Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
 for a list of configuration options for Object Storage.
diff --git a/doc/admin-guide-cloud/source/orchestration-auth-model.rst b/doc/admin-guide-cloud/source/orchestration-auth-model.rst
index 1ada24f5d7..958a530011 100644
--- a/doc/admin-guide-cloud/source/orchestration-auth-model.rst
+++ b/doc/admin-guide-cloud/source/orchestration-auth-model.rst
@@ -53,9 +53,6 @@ The following steps are executed for password authorization:
 Keystone trusts authorization
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-OpenStack Identity trusts is a new authorization method available
-since the Icehouse release.
-
 A trust is an OpenStack Identity extension that provides a method
 to enable delegation, and optionally impersonation via OpenStack
 Identity. The key terminology is *trustor* (the user delegating) and
diff --git a/doc/admin-guide-cloud/source/telemetry-alarms.rst b/doc/admin-guide-cloud/source/telemetry-alarms.rst
index 9d4f485e26..e22e719183 100644
--- a/doc/admin-guide-cloud/source/telemetry-alarms.rst
+++ b/doc/admin-guide-cloud/source/telemetry-alarms.rst
@@ -116,7 +116,7 @@ information about this approach, see the section called
 To use this workload partitioning solution set the
 ``evaluation_service`` option to ``default``. For more
 information, see the alarm section in the
-`OpenStack Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-telemetry.html>`_.
+`OpenStack Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-telemetry.html>`_.
 
 Using alarms
 ~~~~~~~~~~~~
diff --git a/doc/admin-guide-cloud/source/telemetry-data-collection.rst b/doc/admin-guide-cloud/source/telemetry-data-collection.rst
index e3df41e701..bed4379b8c 100644
--- a/doc/admin-guide-cloud/source/telemetry-data-collection.rst
+++ b/doc/admin-guide-cloud/source/telemetry-data-collection.rst
@@ -1013,12 +1013,6 @@ supported to start multiple worker threads per collector process. The
 <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-telemetry.html>`__
 of the :file:`ceilometer.conf` configuration file.
 
-.. note::
-
-    Prior to the Juno release, it is not recommended to use multiple
-    workers per collector process when using PostgreSQL as the database
-    back end.
-
 Database dispatcher
 -------------------
 When the database dispatcher is configured as data store, you have the
diff --git a/doc/admin-guide-cloud/source/ts_no_emulator_x86_64.rst b/doc/admin-guide-cloud/source/ts_no_emulator_x86_64.rst
index 9e9d776710..a3c75e08b2 100644
--- a/doc/admin-guide-cloud/source/ts_no_emulator_x86_64.rst
+++ b/doc/admin-guide-cloud/source/ts_no_emulator_x86_64.rst
@@ -15,6 +15,6 @@ On the KVM host, run ``cat /proc/cpuinfo``. Make sure the ``vmx`` or
 ``svm`` flags are set.
 
 Follow the instructions in the `enabling KVM
-section <http://docs.openstack.org/kilo/config-reference/content/kvm.html#section_kvm_enable>`__
+section <http://docs.openstack.org/liberty/config-reference/content/kvm.html#section_kvm_enable>`__
 of the Configuration Reference to enable hardware virtualization support
 in your BIOS.
diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index b883809775..00b5523706 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -26,14 +26,14 @@ associated components:
 
 -  `Installation Guide for openSUSE 13.2 and SUSE Linux Enterprise
    Server 12
-   <http://docs.openstack.org/kilo/install-guide/install/zypper/content/>`__
+   <http://docs.openstack.org/liberty/install-guide-obs/>`__
 
 -  `Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and
    Fedora
-   21 <http://docs.openstack.org/kilo/install-guide/install/yum/content/>`__
+   21 <http://docs.openstack.org/liberty/install-guide-rdo/>`__
 
 -  `Installation Guide for Ubuntu
-   14.04 <http://docs.openstack.org/kilo/install-guide/install/apt/content/>`__
+   14.04 <http://docs.openstack.org/liberty/install-guide-ubuntu/>`__
 
 The following books explain how to configure and run an OpenStack cloud:
 
@@ -44,7 +44,7 @@ The following books explain how to configure and run an OpenStack cloud:
    Guide <http://docs.openstack.org/admin-guide-cloud/>`__
 
 -  `Configuration
-   Reference <http://docs.openstack.org/juno/config-reference/content/>`__
+   Reference <http://docs.openstack.org/liberty/config-reference/content/>`__
 
 -  `Operations Guide <http://docs.openstack.org/ops/>`__
 
@@ -140,7 +140,7 @@ Some tips:
 
 -  Be sure to include the software and package versions that you are
    using, especially if you are using a development branch, such as,
-   ``"Juno release" vs git commit bc79c3ecc55929bac585d04a03475b72e06a3208``.
+   ``"Kilo release" vs git commit bc79c3ecc55929bac585d04a03475b72e06a3208``.
 
 -  Any deployment-specific information is helpful, such as whether you
    are using Ubuntu 14.04 or are performing a multi-node installation.
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 86adfb0759..bcea7954a9 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -30,7 +30,7 @@
             <listitem>
                 <para>
                     <link
-                        xlink:href="http://docs.openstack.org/kilo/install-guide/install/zypper/content/">
+                        xlink:href="http://docs.openstack.org/liberty/install-guide-obs/">
                         <citetitle>Installation Guide for openSUSE 13.2 and
                             SUSE Linux Enterprise Server 12</citetitle>
                     </link></para>
@@ -38,16 +38,16 @@
             <listitem>
                 <para>
                     <link
-                        xlink:href="http://docs.openstack.org/kilo/install-guide/install/yum/content/">
+                        xlink:href="http://docs.openstack.org/liberty/install-guide-rdo/">
                         <citetitle>Installation Guide for Red Hat
                             Enterprise Linux 7, CentOS 7, and
-                            Fedora 21</citetitle>
+                            Fedora 22</citetitle>
                     </link></para>
             </listitem>
             <listitem>
                 <para>
                     <link
-                        xlink:href="http://docs.openstack.org/kilo/install-guide/install/apt/content/">
+                        xlink:href="http://docs.openstack.org/liberty/install-guide-ubuntu/">
                         <citetitle>Installation Guide for Ubuntu
                         14.04 (LTS)</citetitle>
                     </link></para>
@@ -71,7 +71,7 @@
             </listitem>
             <listitem>
                 <para><link
-                        xlink:href="http://docs.openstack.org/kilo/config-reference/content/"
+                        xlink:href="http://docs.openstack.org/liberty/config-reference/content/"
                             ><citetitle>Configuration
                             Reference</citetitle></link></para>
             </listitem>
@@ -226,7 +226,7 @@
                 <para>Be sure to include the software and package
                     versions that you are using, especially if you are
                     using a development branch, such as,
-                        <literal>"Juno release" vs git commit
+                        <literal>"Liberty release" vs git commit
                         bc79c3ecc55929bac585d04a03475b72e06a3208</literal>.</para>
             </listitem>
             <listitem>
diff --git a/doc/config-reference/ch_objectstorageconfigure.xml b/doc/config-reference/ch_objectstorageconfigure.xml
index e12d96fc8c..e62fe1f938 100644
--- a/doc/config-reference/ch_objectstorageconfigure.xml
+++ b/doc/config-reference/ch_objectstorageconfigure.xml
@@ -40,7 +40,7 @@
             href="../common/tables/swift-object-server-filter-xprofile.xml"/>
         <section xml:id="object-server-conf">
             <title>Sample object server configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
     <section xml:id="object-expirer-configuration">
@@ -65,7 +65,7 @@
             href="../common/tables/swift-object-expirer-pipeline-main.xml"/>
         <section xml:id="object-expirer-conf">
             <title>Sample object expirer configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
     <section xml:id="container-server-configuration">
@@ -97,7 +97,7 @@
             href="../common/tables/swift-container-server-filter-xprofile.xml"/>
         <section xml:id="container-server-conf">
             <title>Sample container server configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/liberty"/></programlisting>
         </section>
 
     </section>
@@ -115,7 +115,7 @@
             href="../common/tables/swift-container-sync-realms-realm2.xml"/>
         <section xml:id="container-sync-realms-conf">
             <title>Sample container sync realms configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
     <section xml:id="container-reconciler-configuration">
@@ -140,7 +140,7 @@
             href="../common/tables/swift-container-reconciler-pipeline-main.xml"/>
         <section xml:id="container-reconciler-conf">
             <title>Sample container sync reconciler configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
 
@@ -170,7 +170,7 @@
             href="../common/tables/swift-account-server-filter-xprofile.xml"/>
         <section xml:id="account-server-conf">
             <title>Sample account server configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
     <section xml:id="proxy-server-configuration">
@@ -213,7 +213,7 @@
             href="../common/tables/swift-proxy-server-filter-xprofile.xml"/>
         <section xml:id="proxy-server-conf">
             <title>Sample proxy server configuration file</title>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/liberty"/></programlisting>
         </section>
     </section>
     <section xml:id="swift-memcache-configuration">
diff --git a/doc/config-reference/compute/section_compute-sample-configuration-files.xml b/doc/config-reference/compute/section_compute-sample-configuration-files.xml
index 339a14af4e..7860f72a50 100644
--- a/doc/config-reference/compute/section_compute-sample-configuration-files.xml
+++ b/doc/config-reference/compute/section_compute-sample-configuration-files.xml
@@ -10,14 +10,14 @@
         <para>The Compute service stores its API configuration settings in the
             <filename>api-paste.ini</filename> file.</para>
         <programlisting language="ini">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/api-paste.ini?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_nova-policy.json">
         <title>policy.json</title>
         <para>The <filename>policy.json</filename> file defines additional access controls that apply to the Compute service.</para>
         <programlisting language="json">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/policy.json?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_nova-rootwrap.conf">
@@ -30,7 +30,7 @@
              option in the <option>[workaround]</option> section
              of the <filename>nova.conf</filename> configuration file.</para>
         <programlisting language="ini">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/nova/plain/etc/nova/rootwrap.conf?h=stable/liberty"/>
         </programlisting>
     </section>
 </section>
diff --git a/doc/config-reference/identity/section_keystone-sample-conf-files.xml b/doc/config-reference/identity/section_keystone-sample-conf-files.xml
index b481315b4e..86502a36d9 100644
--- a/doc/config-reference/identity/section_keystone-sample-conf-files.xml
+++ b/doc/config-reference/identity/section_keystone-sample-conf-files.xml
@@ -11,7 +11,7 @@
         <title>keystone.conf</title>
         <para>Use the <filename>keystone.conf</filename> file to
             configure most Identity service options:</para>
-        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample?h=stable/kilo"/>
+        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample?h=stable/liberty"/>
                 </programlisting>
     </section>
     <section xml:id="section_keystone-paste.ini">
@@ -19,7 +19,7 @@
         <para>Use the <filename>keystone-paste.ini</filename> file to
             configure the Web Service Gateway Interface (WSGI)
             middleware pipeline for the Identity service.</para>
-        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini?h=stable/kilo"/>
+        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini?h=stable/liberty"/>
              </programlisting>
     </section>
     <section xml:id="section_keystone-logging.conf">
@@ -31,7 +31,7 @@
         <para>For details, see the (<link
                 xlink:href="http://docs.python.org/2/howto/logging.html#configuring-logging"
                 >Python logging module documentation</link>).</para>
-        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample?h=stable/kilo"/>
+        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample?h=stable/liberty"/>
              </programlisting>
     </section>
     <section xml:id="section_keystone-policy.json">
@@ -39,6 +39,6 @@
         <para>Use the <filename>policy.json</filename> file to define
             additional access controls that apply to the Identity
             service.</para>
-        <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json?h=stable/kilo"/></programlisting>
+        <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/keystone/plain/etc/policy.json?h=stable/liberty"/></programlisting>
     </section>
 </section>
diff --git a/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
index 76e933de9f..ad2c8b8a0c 100644
--- a/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
+++ b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml
@@ -12,7 +12,7 @@
             <para>The configuration file for the Image service API is found in the
                 <filename>glance-api.conf</filename> file.</para>
             <para>This file must be modified after installation.</para>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api.conf?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-registry.conf">
             <title>glance-registry.conf</title>
@@ -20,14 +20,14 @@
                 stores the metadata about images, is found in the
                 <filename>glance-registry.conf</filename> file.</para>
             <para>This file must be modified after installation.</para>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry.conf?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-api-paste.conf">
             <title>glance-api-paste.ini</title>
             <para>Configuration for the Image service's API middleware pipeline is found in the
                 <filename>glance-api-paste.ini</filename> file.</para>
             <para>You should not need to modify this file.</para>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-api-paste.ini?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-manage.conf">
           <title>glance-manage.conf</title>
@@ -38,24 +38,24 @@
               <filename>glance-registry.conf</filename> and <filename>glance-api.conf</filename>.
               Similarly, options in <filename>glance-api.conf</filename> will
               override options set in <filename>glance-registry.conf</filename>.</para></note>
-          <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-manage.conf"/></programlisting>
+          <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-manage.conf?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-registry-paste.conf">
             <title>glance-registry-paste.ini</title>
             <para>The Image service's middleware pipeline for its registry is found in the
                     <filename>glance-registry-paste.ini</filename> file.</para>
-            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/kilo"/></programlisting>
+            <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-registry-paste.ini?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-scrubber.conf">
                 <title>glance-scrubber.conf</title>
                 <para><command>glance-scrubber</command> is a utility for the Image service that cleans up images that have been deleted; its configuration is stored in the
                 <filename>glance-scrubber.conf</filename> file.</para>
-                <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/kilo"/></programlisting>
+                <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/glance-scrubber.conf?h=stable/liberty"/></programlisting>
         </section>
         <section xml:id="section_glance-policy.json">
             <title>policy.json</title>
             <para>The <filename>/etc/glance/policy.json</filename> file defines additional access controls
                 that apply to the Image service.</para>
-            <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/kilo"/></programlisting>
+            <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=stable/liberty"/></programlisting>
         </section>
 </section>
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index 8203b1a921..0981dbe909 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -15,6 +15,7 @@
                   L2-in-L3 tunneling or OpenFlow. These sections
                   detail the configuration options for the various
                   plug-ins.</para>
+                <!-- TODO: Update this section for Liberty -->
                 <note><para>The following plugins have been removed in
                     Kilo:</para>
                   <itemizedlist>
diff --git a/doc/config-reference/networking/section_networking-sample-configuration-files.xml b/doc/config-reference/networking/section_networking-sample-configuration-files.xml
index bd757147c7..cfb4440b49 100644
--- a/doc/config-reference/networking/section_networking-sample-configuration-files.xml
+++ b/doc/config-reference/networking/section_networking-sample-configuration-files.xml
@@ -10,14 +10,14 @@
         <para>Use the <filename>neutron.conf</filename> file to configure the
             majority of the OpenStack Networking options.</para>
         <programlisting language="ini">
-            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/kilo"/>
+            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/neutron.conf?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_neutron-api-paste.ini">
         <title>api-paste.ini</title>
         <para>Use the <filename>api-paste.ini</filename> to configure the OpenStack Networking API.</para>
         <programlisting language="ini">
-            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/kilo"/>
+            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/api-paste.ini?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_neutron-policy.json">
@@ -25,7 +25,7 @@
         <para>Use the <filename>policy.json</filename> file to define additional access controls
             that apply to the OpenStack Networking service.</para>
         <programlisting language="json">
-            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/kilo"/>
+            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_neutron-rootwrap.conf">
@@ -34,7 +34,7 @@
             <command>rootwrap</command> script when the OpenStack Networking service must escalate its
             privileges to those of the root user.</para>
         <programlisting language="ini">
-            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/kilo"/>
+            <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/rootwrap.conf?h=stable/liberty"/>
         </programlisting>
     </section>
     <section xml:id="section_plugin-agent-conf">
@@ -45,19 +45,19 @@
         <section xml:id="section_neutron-dhcp_agent.ini">
             <title>dhcp_agent.ini</title>
             <programlisting language="ini">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/dhcp_agent.ini?h=stable/liberty"/>
             </programlisting>
         </section>
         <section xml:id="section_neutron-l3_agent.ini.conf">
             <title>l3_agent.ini</title>
             <programlisting language="ini">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/l3_agent.ini?h=stable/liberty"/>
             </programlisting>
         </section>
         <section xml:id="section_neutron-metadata_agent.ini">
             <title>metadata_agent.ini</title>
             <programlisting language="ini">
-                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/kilo"/>
+                <xi:include parse="text" href="https://git.openstack.org/cgit/openstack/neutron/plain/etc/metadata_agent.ini?h=stable/liberty"/>
             </programlisting>
         </section>
     </section>
diff --git a/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml b/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
index 5176777cff..a77805b259 100644
--- a/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
+++ b/doc/config-reference/telemetry/section_telemetry-sample-configuration-files.xml
@@ -24,7 +24,7 @@
         <para>This file provides a standard set of events and corresponding traits
           that may be of interest. This file can be modified to add and drop traits
           that operators may find useful.</para>
-        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/kilo"/></programlisting>
+        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/event_definitions.yaml?h=stable/liberty"/></programlisting>
     </section>
     <section xml:id="section_pipeline.yaml">
         <title>pipeline.yaml</title>
@@ -34,7 +34,7 @@
             file.</para>
         <para>This file can be modified to adjust polling intervals and the
           samples generated by the Telemetry module</para>
-        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/kilo"/></programlisting>
+        <programlisting language="ini"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/pipeline.yaml?h=stable/liberty"/></programlisting>
     </section>
     <section xml:id="section_event_pipeline.yaml">
         <title>event_pipeline.yaml</title>
@@ -49,7 +49,7 @@
         <title>policy.json</title>
         <para>The <filename>policy.json</filename> file defines additional
             access controls that apply to the Telemetry service.</para>
-        <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/kilo"/></programlisting>
+        <programlisting language="json"><xi:include parse="text" href="https://git.openstack.org/cgit/openstack/ceilometer/plain/etc/ceilometer/policy.json?h=stable/liberty"/></programlisting>
     </section>
     <!-- TODO(gpocentek): include sources.json -->
 </section>
diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst
index 1d9899d73a..081383161d 100644
--- a/doc/contributor-guide/source/content-specs.rst
+++ b/doc/contributor-guide/source/content-specs.rst
@@ -151,11 +151,11 @@ This guide has a review in place to get a license indicator in output:
 
 
 .. Links
-.. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/kilo/install-guide/install/zypper/content/
-.. _`Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora`: http://docs.openstack.org/kilo/install-guide/install/yum/content/
-.. _`Installation Guide for Ubuntu 12.04 and 14.04 (LTS) Server`: http://docs.openstack.org/kilo/install-guide/install/apt/content/
+.. _`Installation Guide for openSUSE and SUSE Linux Enterprise Server`: http://docs.openstack.org/liberty/install-guide-obs/
+.. _`Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora`: http://docs.openstack.org/liberty/install-guide-rdo/
+.. _`Installation Guide for Ubuntu 12.04 and 14.04 (LTS) Server`: http://docs.openstack.org/liberty/install-guide-ubuntu/
 
-.. _`OpenStack Configuration Reference`: http://docs.openstack.org/kilo/config-reference/content/
+.. _`OpenStack Configuration Reference`: http://docs.openstack.org/liberty/config-reference/content/
 
 .. _`release information`: https://wiki.openstack.org/wiki/Releases
 
diff --git a/doc/contributor-guide/source/docs_builds.rst b/doc/contributor-guide/source/docs_builds.rst
index a38d1fa91f..8914715469 100644
--- a/doc/contributor-guide/source/docs_builds.rst
+++ b/doc/contributor-guide/source/docs_builds.rst
@@ -46,15 +46,15 @@ like the example above of stable/kilo.
 
    * - Installation Guide for openSUSE and SUSE Linux Enterprise Server
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
-     - http://docs.openstack.org/kilo/install-guide/install/zypper/content
+     - http://docs.openstack.org/liberty/install-guide-obs
 
    * - Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
-     - http://docs.openstack.org/kilo/install-guide/install/yum/content
+     - http://docs.openstack.org/kilo/install-guide-rdo
 
    * - Installation Guide for Ubuntu 14.04 (LTS)
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/install-guide
-     - http://docs.openstack.org/kilo/install-guide/install/apt/content
+     - http://docs.openstack.org/kilo/install-guide-ubuntu
 
 Guides for deployers and administrators
 ---------------------------------------
@@ -72,7 +72,7 @@ Guides for deployers and administrators
 
    * - Configuration Reference
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference
-     - http://docs.openstack.org/kilo/config-reference/content
+     - http://docs.openstack.org/liberty/config-reference/content
 
    * - Cloud Administrator Guide
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide-cloud
@@ -201,8 +201,8 @@ file contain the Jenkins build jobs that build to the docs.openstack.org
 and developer.openstack.org sites, copying built files via FTP.
 
 The release specific books are build for the currently supported branches
-(juno, kilo), development happens on the master branch. The continuously
-released books are only build on the master branch.
+(juno, kilo, liberty), development happens on the master branch. The
+continuously released books are only build on the master branch.
 
 Maven plug-in
 ~~~~~~~~~~~~~
diff --git a/doc/networking-guide/source/adv_config_ipv6.rst b/doc/networking-guide/source/adv_config_ipv6.rst
index 1b781dae14..668b1ba051 100644
--- a/doc/networking-guide/source/adv_config_ipv6.rst
+++ b/doc/networking-guide/source/adv_config_ipv6.rst
@@ -12,7 +12,7 @@ The basics
 ~~~~~~~~~~
 
 OpenStack Networking has supported IPv6 tenant subnets in certain
-configurations since Juno, but the Kilo release adds a number of new
+configurations since Juno, but later releases added a number of new
 features, functionality and bug fixes to make it more robust. The
 focus of this page will be:
 
@@ -457,8 +457,8 @@ external (to the OpenStack Networking service) DHCPv6 server to manage your
 tenant network prefixes.
 
 .. note::
-   Prefix delegation will be in the upcoming Liberty release, it is
-   not available in the current OpenStack Kilo release. HA and DVR routers
+   Prefix delegation became available in the Liberty release, it is
+   not available in the Kilo release. HA and DVR routers
    are not currently supported by this feature.
 
 Configuring OpenStack Networking for prefix delegation
diff --git a/doc/networking-guide/source/config.rst b/doc/networking-guide/source/config.rst
index 2899ee12df..fd6be8644c 100644
--- a/doc/networking-guide/source/config.rst
+++ b/doc/networking-guide/source/config.rst
@@ -4,7 +4,7 @@ Configuration
 
 This content currently under development. For general configuration, see
 the `Configuration Reference
-<http://docs.openstack.org/kilo/config-reference/content/>`_.
+<http://docs.openstack.org/liberty/config-reference/content/>`_.
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/networking-guide/source/intro_basic_networking.rst b/doc/networking-guide/source/intro_basic_networking.rst
index 94df99594f..607f778e1b 100644
--- a/doc/networking-guide/source/intro_basic_networking.rst
+++ b/doc/networking-guide/source/intro_basic_networking.rst
@@ -397,8 +397,8 @@ services. See `Appendix B. Firewalls and default ports`_ of the
 various services involved in an OpenStack deployment.
 
 .. _registry of port numbers: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml
-.. _Appendix B. Firewalls and default ports: http://docs.openstack.org/kilo/config-reference/content/firewalls-default-ports.html
-.. _OpenStack Configuration Reference: http://docs.openstack.org/kilo/config-reference/content/index.html
+.. _Appendix B. Firewalls and default ports: http://docs.openstack.org/liberty/config-reference/content/firewalls-default-ports.html
+.. _OpenStack Configuration Reference: http://docs.openstack.org/liberty/config-reference/content/index.html
 
 
 The most common application programming interface (API) for writing TCP-based
diff --git a/doc/networking-guide/source/scenario_dvr_ovs.rst b/doc/networking-guide/source/scenario_dvr_ovs.rst
index 72d2b55e81..d871cf9314 100644
--- a/doc/networking-guide/source/scenario_dvr_ovs.rst
+++ b/doc/networking-guide/source/scenario_dvr_ovs.rst
@@ -21,8 +21,8 @@ routing and SNAT services between project and external networks.
 
 .. note::
    In the Juno (initial) release, DVR supports VXLAN and GRE project networks.
-   In the Kilo release, DVR adds support for VLAN project networks. All
-   releases support flat and VLAN external networks.
+   In the Kilo release, support was added for DVR with VLAN project networks.
+   All releases support flat and VLAN external networks.
 
 Prerequisites
 ~~~~~~~~~~~~~
diff --git a/doc/networking-guide/source/scenario_l3ha_lb.rst b/doc/networking-guide/source/scenario_l3ha_lb.rst
index 7644f281f2..0ca50e66b4 100644
--- a/doc/networking-guide/source/scenario_l3ha_lb.rst
+++ b/doc/networking-guide/source/scenario_l3ha_lb.rst
@@ -19,7 +19,7 @@ constraints and to improve scaling. Also, this implementation does not address
 situations where one or more layer-3 agents fail and the underlying virtual
 networks continue to operate normally. Consider deploying
 :doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
-of the Kilo release, you cannot combine the DVR and L3HA mechanisms.
+of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
 
 .. note::
    The failover process only retains the state of network connections for
@@ -30,7 +30,7 @@ project (tenant) network. However, this configuration also supports VLAN
 external and project networks.
 
 .. note::
-   In the Juno (initial) and Kilo releases, L3HA with Linux bridge supports
+   In the releases prior to Liberty, L3HA with Linux bridge supports
    VLAN and VXLAN project networks. However, due to a bug, VXLAN project
    networks must use multicast instead of the layer-2 population mechanism.
 
diff --git a/doc/networking-guide/source/scenario_l3ha_ovs.rst b/doc/networking-guide/source/scenario_l3ha_ovs.rst
index bde6a26041..7dfebc4419 100644
--- a/doc/networking-guide/source/scenario_l3ha_ovs.rst
+++ b/doc/networking-guide/source/scenario_l3ha_ovs.rst
@@ -19,7 +19,7 @@ constraints and to improve scaling. Also, this implementation does not address
 situations where one or more layer-3 agents fail and the underlying virtual
 networks continue to operate normally. Consider deploying
 :doc:`scenario_dvr_ovs` to increase performance in addition to redundancy. As
-of the Kilo release, you cannot combine the DVR and L3HA mechanisms.
+of the Liberty release, you cannot combine the DVR and L3HA mechanisms.
 
 .. note::
    The failover process only retains the state of network connections for
@@ -30,7 +30,7 @@ project (tenant) network. However, this configuration also supports VLAN
 external networks, VLAN project networks, and GRE project networks.
 
 .. note::
-   Due to a bug in the Juno (initial) and Kilo releases, VXLAN and GRE project
+   Due to a bug in releases prior to Liberty, VXLAN and GRE project
    networks must use multicast instead of the layer-2 population mechanism.
 
 .. todo:
diff --git a/doc/user-guide-admin/source/cli_cinder_quotas.rst b/doc/user-guide-admin/source/cli_cinder_quotas.rst
index 9c85ec993d..a8045eb3c8 100644
--- a/doc/user-guide-admin/source/cli_cinder_quotas.rst
+++ b/doc/user-guide-admin/source/cli_cinder_quotas.rst
@@ -78,7 +78,7 @@ service quotas.
    update the property in the :guilabel:`cinder.quota`
    section of the :file:`/etc/cinder/cinder.conf` file.
    For more information, see the `Block Storage
-   Configuration Reference <http://docs.openstack.org/kilo/config-reference/content/ch_configuring-openstack-block-storage.html>`_.
+   Configuration Reference <http://docs.openstack.org/liberty/config-reference/content/ch_configuring-openstack-block-storage.html>`_.
 
 #. To update Block Storage service quotas, place
    the tenant ID in a variable::
diff --git a/doc/user-guide-admin/source/dashboard_manage_host_aggregates.rst b/doc/user-guide-admin/source/dashboard_manage_host_aggregates.rst
index 8938d7d9dd..06dc16491c 100644
--- a/doc/user-guide-admin/source/dashboard_manage_host_aggregates.rst
+++ b/doc/user-guide-admin/source/dashboard_manage_host_aggregates.rst
@@ -11,7 +11,7 @@ multiple aggregates.
 
 The scheduler uses this information to make scheduling decisions. For
 information, see
-`Scheduling <http://docs.openstack.org/kilo/config-reference/content/section_compute-scheduler.html>`__.
+`Scheduling <http://docs.openstack.org/liberty/config-reference/content/section_compute-scheduler.html>`__.
 
 To create a host aggregate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/user-guide/source/cli_change_the_size_of_your_server.rst b/doc/user-guide/source/cli_change_the_size_of_your_server.rst
index e8b9b40bf6..67d6f1ad28 100644
--- a/doc/user-guide/source/cli_change_the_size_of_your_server.rst
+++ b/doc/user-guide/source/cli_change_the_size_of_your_server.rst
@@ -74,7 +74,7 @@ Change the size of a server by changing its flavor.
       period (in seconds) a guest operation system is allowed
       to complete the shutdown. The default timeout is 60 seconds.
       See `Description of Compute configuration options
-      <http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_
+      <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
       for details.
 
       The timeout value can be overridden on a per image basis
diff --git a/doc/user-guide/source/cli_config_drive.rst b/doc/user-guide/source/cli_config_drive.rst
index 124ea6bea7..29cb4b6bfe 100644
--- a/doc/user-guide/source/cli_config_drive.rst
+++ b/doc/user-guide/source/cli_config_drive.rst
@@ -276,7 +276,7 @@ If you choose VFAT, the configuration drive is 64 MB.
 
 .. note::
 
-   In current version (Kilo) of OpenStack Compute, live migration with
+   In current version (Liberty) of OpenStack Compute, live migration with
    ``config_drive`` on local disk is forbidden due to the bug in libvirt
    of copying a read-only disk. However, if we use VFAT as the format of
    ``config_drive``, the function of live migration works well.
diff --git a/doc/user-guide/source/cli_reboot_an_instance.rst b/doc/user-guide/source/cli_reboot_an_instance.rst
index 640e751b3c..84f4e6c257 100644
--- a/doc/user-guide/source/cli_reboot_an_instance.rst
+++ b/doc/user-guide/source/cli_reboot_an_instance.rst
@@ -48,7 +48,7 @@ command::
    a guest operation system is allowed to complete the shutdown.
    The default timeout is 60 seconds. See `Description of
    Compute configuration options
-   <http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_
+   <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
    for details.
 
    The timeout value can be overridden on a per image basis
diff --git a/doc/user-guide/source/cli_stop_and_start_an_instance.rst b/doc/user-guide/source/cli_stop_and_start_an_instance.rst
index 6ba693f928..e45a00c165 100644
--- a/doc/user-guide/source/cli_stop_and_start_an_instance.rst
+++ b/doc/user-guide/source/cli_stop_and_start_an_instance.rst
@@ -60,7 +60,7 @@ You can run the following shelving tasks:
    period (in seconds) a guest operation system is allowed
    to complete the shutdown. The default timeout is 60 seconds.
    See `Description of Compute configuration options
-   <http://docs.openstack.org/kilo/config-reference/content/list-of-compute-config-options.html>`_
+   <http://docs.openstack.org/liberty/config-reference/content/list-of-compute-config-options.html>`_
    for details.
 
    The timeout value can be overridden on a per image basis
diff --git a/doc/user-guide/source/cli_swift_static_website.rst b/doc/user-guide/source/cli_swift_static_website.rst
index 17ab293ab2..631d78133e 100644
--- a/doc/user-guide/source/cli_swift_static_website.rst
+++ b/doc/user-guide/source/cli_swift_static_website.rst
@@ -20,9 +20,9 @@ The Static Web filter must be added to the pipeline in your
 middleware. You must also add a Static Web middleware configuration
 section.
 
-See the Cloud Administrator Guide for an example of the `static web configuration syntax <http://docs.openstack.org/kilo/config-reference/content/object-storage-static-web.html>`_.
+See the Cloud Administrator Guide for an example of the `static web configuration syntax <http://docs.openstack.org/liberty/config-reference/content/object-storage-static-web.html>`_.
 
-See the Cloud Administrator Guide for a complete example of the `/etc/swift/proxy-server.conf file <http://docs.openstack.org/kilo/config-reference/content/proxy-server-conf.html>`_ (including static web).
+See the Cloud Administrator Guide for a complete example of the `/etc/swift/proxy-server.conf file <http://docs.openstack.org/liberty/config-reference/content/proxy-server-conf.html>`_ (including static web).
 
 Your publicly readable containers are checked for two headers,
 ``X-Container-Meta-Web-Index`` and ``X-Container-Meta-Web-Error``. The