diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml index 74c0ab1744..56335cb686 100644 --- a/doc/install-guide/bk-openstack-install-guide.xml +++ b/doc/install-guide/bk-openstack-install-guide.xml @@ -3,7 +3,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="openstack-install-manual-icehouse"> + xml:id="openstack-install-manual-juno"> OpenStack Installation Guide for <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux, CentOS, and Fedora</phrase> <phrase os="ubuntu">Ubuntu 12.04/14.04 (LTS)</phrase> @@ -30,9 +30,10 @@ <copyright> <year>2012</year> <year>2013</year> + <year>2014</year> <holder>OpenStack Foundation</holder> </copyright> - <releaseinfo>icehouse</releaseinfo> + <releaseinfo>juno</releaseinfo> <productname>OpenStack Installation Guide</productname> <pubdate/> <legalnotice role="apache2"> @@ -69,6 +70,17 @@ included.</para> </abstract> <revhistory> + <revision> + <date>2014-06-03</date> + <revdescription> + <itemizedlist spacing="compact"> + <listitem> + <para>Start documentation for Juno. + </para> + </listitem> + </itemizedlist> + </revdescription> + </revision> <revision> <date>2014-04-16</date> <revdescription> diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml index 1b23770db5..cdf90531f2 100644 --- a/doc/install-guide/ch_basics.xml +++ b/doc/install-guide/ch_basics.xml @@ -3,6 +3,17 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch_basics"> <?dbhtml-stop-chunking?> <title>Basic environment configuration + + + + The trunk version of this guide focuses on the future Juno + release and may not work for the current Icehouse release. If + you want to install Icehouse, please use the Icehouse version + of this guide instead. + + + This chapter explains how to configure each node in the example architectures including the