Merge "Release candidate for docs for Havana"

doc/admin-guide-cloud/bk-admin-guide-cloud.xml

@@ -22,7 +22,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="apache2">
@@ -43,6 +43,16 @@
         </abstract>
         <revhistory>
             <!-- ... continue adding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-09-05</date>
                 <revdescription>

doc/config-reference/bk-config-ref.xml

@@ -21,7 +21,7 @@
             <holder>OpenStack Foundation</holder>
         </copyright>
         <productname>OpenStack</productname>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <pubdate/>
         <legalnotice role="apache2">
             <annotation>
@@ -39,6 +39,16 @@
         </abstract>
         <revhistory>
             <!-- ... continue addding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-08-16</date>
                 <revdescription>

doc/image-guide/bk-imageguide.xml

@@ -24,7 +24,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate></pubdate>
         <legalnotice role="cc-by">
@@ -40,6 +40,16 @@
         </abstract>
         <revhistory>
             <!-- ... continue addding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-06-04</date>
                 <revdescription>

doc/install-guide/bk_openstackinstallguide.xml

@@ -33,7 +33,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack Installation Guide</productname>
         <pubdate/>
         <legalnotice role="apache2">
@@ -64,6 +64,16 @@
                 files are included.</para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-10-16</date>
                 <revdescription>

doc/install-guide/ch_terminology.xml

@@ -22,10 +22,10 @@
                 </thead>
                 <tbody>
                     <tr>
-                        <td>Havana</td>
+                        <td><link xlink:href="https://wiki.openstack.org/wiki/ReleaseNotes/Havana">Havana</link></td>
                         <td>October 2013</td>
-                        <td>2013.3</td>
+                        <td>2013.2</td>
-                        <td>unknown</td>
+                        <td>1.10.0</td>
                     </tr>
                     <tr>
                         <td><link xlink:href="http://wiki.openstack.org/ReleaseNotes/Grizzly"

doc/install-guide/section_compute-verifying-install.xml

@@ -24,7 +24,7 @@ nova-consoleauth myhost    nova    enabled    :-)   2012-04-02 14:06:10</compute
         the <command>nova-manage</command> command, as root:</para>
             <screen><prompt>#</prompt> <userinput>nova-manage version</userinput></screen>
 
-        <para>The version number 2013.1 corresponds with the Grizzly
+        <para>The version number 2013.2 corresponds with the Havana
         release of Compute.</para>
-    <literallayout class="monospaced">2013.1 </literallayout>
+    <literallayout class="monospaced">2013.2</literallayout>
     </section>

doc/security-guide/bk_openstack-sec-guide.xml

@@ -18,7 +18,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
@@ -33,6 +33,16 @@
         </abstract>
         <revhistory>
             <!-- ... continue addding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-07-02</date>
                 <revdescription>

doc/user-guide-admin/bk-admin-user-guide.xml

@@ -25,7 +25,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
@@ -44,6 +44,16 @@
                 commands.</para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-08-31</date>
                 <revdescription>

doc/user-guide/bk-user-guide.xml

@@ -25,7 +25,7 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>master</releaseinfo>
+        <releaseinfo>havana</releaseinfo>
         <productname>OpenStack</productname>
         <pubdate/>
         <legalnotice role="cc-by">
@@ -44,6 +44,16 @@
                 commands.</para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2013-10-17</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Havana release.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-08-19</date>
                 <revdescription>

www/folsom/index.html

@@ -1,270 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-	<head>
-		<meta name="generator"
-			content="HTML Tidy for Linux/x86 (vers 11 February 2007), see www.w3.org" />
-		<meta http-equiv="Content-Type"
-			content="text/html; charset=us-ascii" />
-		<meta name="google-site-verification"
-			content="Ip5yk0nd8yQHEo8I7SjzVfAiadlHvTvqQHLGwn1GFyU" />
-
-		<title>OpenStack Docs: Folsom</title>
-		<!-- Google Fonts -->
-		<link
-			href="http://fonts.googleapis.com/css?family=PT+Sans&amp;subset=latin"
-			rel="stylesheet" type="text/css" />
-		<!-- Framework CSS -->
-		<link rel="stylesheet"
-			href="http://openstack.org/themes/openstack/css/blueprint/screen.css"
-			type="text/css" media="screen, projection" />
-		<link rel="stylesheet"
-			href="http://openstack.org/themes/openstack/css/blueprint/print.css"
-			type="text/css" media="print" />
-		<!--[if lt IE 8]><link rel="stylesheet" href="http://openstack.org/themes/openstack/css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-		<!-- OpenStack Specific CSS -->
-		<link rel="stylesheet"
-			href="http://openstack.org/themes/openstack/css/main.css"
-			type="text/css" media="screen, projection, print" />
-		<link rel="stylesheet" type="text/css"
-			href="http://docs.openstack.org/common/css/docblitz.css" />
-		<!--<script type="text/javascript">
-			
-			var _gaq = _gaq || [];
-			_gaq.push(['_setAccount', 'UA-17511903-1']);
-			_gaq.push(['_setDomainName', '.openstack.org']);
-			_gaq.push(['_trackPageview']);
-			
-			(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			})();
-			
-			</script>-->
-	</head>
-
-	<body class="docshome" id="docshome">
-
-		<div class="container">
-			<div id="header">
-				<div class="span-5">
-					<h1 id="logo"><a href="http://www.openstack.org/"
-							>OpenStack</a></h1>
-				</div>
-				<div class="span-19 last">
-					<div id="navigation">
-						<ul id="Menu1">
-
-							<li><a href="http://www.openstack.org/"
-								title="Go to the Home page"
-								class="link">Home</a></li>
-
-							<li><a
-								href="http://www.openstack.org/software/"
-								title="Go to the Software page"
-								class="link">Software</a></li>
-
-							<li><a
-								href="http://www.openstack.org/user-stories/"
-								title="Go to the User Stories page"
-								class="link">User Stories</a></li>
-
-							<li><a
-								href="http://www.openstack.org/community/"
-								title="Go to the Community page"
-								class="link">Community</a></li>
-
-							<li><a
-								href="http://www.openstack.org/profile/"
-								title="Go to the Profile page"
-								class="link">Profile</a></li>
-
-							<li><a
-								href="http://www.openstack.org/blog/"
-								title="Go to the OpenStack Blog"
-								>Blog</a></li>
-
-							<li><a href="http://wiki.openstack.org/"
-								title="Go to the OpenStack Wiki"
-								>Wiki</a></li>
-
-							<li><a href="http://docs.openstack.org/"
-								title="Go to OpenStack Documentation"
-								class="current"
-								>Documentation</a></li>
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<!-- Page Content -->
-
-		<div class="container">
-			<div class="span-12">
-				<h3 class="subhead"><a
-						href="http://docs.openstack.org/folsom">Folsom
-						Documentation</a>
-				</h3>
-			</div>
-			<h3>Note: OpenStack <a
-					href="https://wiki.openstack.org/wiki/StableBranch"
-					>no longer maintains</a> the Folsom release.
-				Please consider using a later release.</h3>
-			<p>&nbsp;</p>
-			<div class="searchArea span-10 last">
-				<div id="cse" style="width: 100%;"> Loading </div>
-				<script src="http://www.google.com/jsapi" type="text/javascript">
-		</script>
-				<script type="text/javascript">
-//<![CDATA[
-                    google.load('search', '1', {
-                        language: 'en'
-                    });
-                    var _gaq = _gaq ||[];
-                    _gaq.push([ "_setAccount", "UA-17511903-6"]);
-                    function _trackQuery(control, searcher, query) {
-                        var gaQueryParamName = "q";
-                        var loc = document.location;
-                        var url =[
-                        loc.pathname,
-                        loc.search,
-                        loc.search ? '&': '?',
-                        gaQueryParamName == '' ? 'q': encodeURIComponent(gaQueryParamName),
-                        '=',
-                        encodeURIComponent(query)].join('');
-                        _gaq.push([ "_trackPageview", url]);
-                    }
-                    google.setOnLoadCallback(function () {
-                        var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
-                        customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
-                        customSearchControl.setSearchStartingCallback(null, _trackQuery);
-                        customSearchControl.draw('cse');
-                    },
-                    true);//]]>
-		</script>
-			</div>
-		</div>
-		<div class="container">
-			<div class="span-12">
-				<h2>Installing OpenStack </h2>
-				<p>Installation and deployment guides for test or
-					production systems. </p>
-				<table>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/basic-install/content/"
-								> OpenStack Basic Installation Guide
-								for Ubuntu 12.04 (LTS) </a><br />Uses
-							the Ubuntu Cloud Archive to install
-							Compute, Image, Identity, and
-							Networking</td>
-					</tr>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-compute/install/apt/content/"
-								> OpenStack Install and Deploy Guide
-								for Ubuntu 12.04 (LTS)
-							</a><br />Compute, Image, Object Storage
-							and Identity services plus Dashboard </td>
-					</tr>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-compute/install/yum/content/"
-								> OpenStack Install and Deploy Guide
-								for Red Hat Enterprise Linux, CentOS
-								6.x, or Fedora 17 </a><br />Compute,
-							Image, Object Storage and Identity
-							services plus Dashboard </td>
-					</tr>
-				</table>
-				<h2>Running OpenStack</h2>
-				<p>Operational and administration documentation for
-					OpenStack cloud service providers. </p>
-				<table>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-compute/admin/content/"
-								>OpenStack Compute Administration
-								Guide</a></td>
-					</tr>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-object-storage/admin/content/"
-								> OpenStack Object Storage
-								Administration Guide</a></td>
-					</tr>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-network/admin/content/"
-								> OpenStack Network Administration
-								Guide</a></td>
-					</tr>
-					<tr>
-						<td><a
-								href="http://docs.openstack.org/folsom/openstack-ops/content/"
-								> OpenStack Operations Guide</a></td>
-					</tr>
-				</table>
-			</div>
-			<div class="span-12 last">
-				<h2><a href="/cli/quick-start/content/index.html"
-						>Command Line Interfaces (CLI)</a>
-				</h2>
-				<p>The CLI documentation for nova, swift, glance,
-					quantum, and keystone. </p>
-				<h2><a href="/api/">API</a>
-				</h2>
-				<p>Documentation on the RESTful APIs provided by
-					OpenStack services. </p>
-				<h2><a href="/developer/">Developing OpenStack</a>
-				</h2>
-				<p>Python developer documentation, continuous
-					integration documentation, and language bindings
-					documentation for OpenStack projects. </p>
-				<h2><a href="/glossary/content/glossary.html"
-						>Glossary</a>
-				</h2>
-				<p>A list of terms and their definitions.</p>
-			</div>
-		</div>
-		<div class="container">
-			<div id="footer">
-				<hr />
-				<p>Documentation treated like code, powered by the
-					community - interested? Here's <a
-						href="http://wiki.openstack.org/Documentation/HowTo"
-						>how to contribute</a>. </p>
-				<p>The OpenStack project is provided under the Apache
-					2.0 license. Openstack.org is powered by <a
-						href="http://www.rackspacecloud.com/"
-						>Rackspace Cloud Computing</a>.</p>
-			</div>
-		</div>
-		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
-
-		<script src="http://docs.openstack.org/common/jquery/jquery.hoverIntent.minified.js" type="text/javascript" charset="utf-8">
-</script>
-		<script type="text/javascript" charset="utf-8">
-//<![CDATA[
-            $(document).ready(function () {
-                function addMenu() {
-                    $(".dropDown").addClass("menuHover");
-                }
-                function removeMenu() {
-                    $(".dropDown").removeClass("menuHover");
-                }
-                var menuConfig = {
-                    interval: 500,
-                    sensitivity: 4,
-                    over: addMenu,
-                    timeout: 500,
-                    out: removeMenu
-                };
-                $(".dropDownTrigger").hoverIntent(menuConfig);
-            });//]]>
-</script>
-	</body>
-</html>

www/grizzly/index.html

@@ -139,10 +139,10 @@
 							<ul>
 								<li class="link"><a href="/trunk/"
 								title="Go to the &quot;Current release&quot; page"
-								>Current (master branch)</a></li>
+								>In progress (master branch)</a></li>
-								<li class="link"><a href="/folsom/"
+								<li class="link"><a href="/havana/"
-								title="Go to the &quot;Folsom release&quot; page"
+								title="Go to the &quot;Havana release&quot; page"
-								>Folsom</a></li>
+								>Havana (current release)</a></li>
 								<li class="link"><a href="/grizzly/"
 								title="Go to the &quot;Grizzly&quot; page"
 								>Grizzly</a></li>

www/index.html

@@ -139,14 +139,14 @@
 						<div>
 							<ul>
 								<li class="link"><a href="/trunk/"
-								title="Go to the &quot;Current release&quot; page"
+								title="Go to the &quot;in progress docs&quot; page"
-								>Current (master branch)</a></li>
+								>In progress (master branch)</a></li>
+								<li class="link"><a href="/havana/"
+								title="Go to the &quot;Havana release&quot; page"
+								>Havana (current release)</a></li>
 								<li class="link"><a href="/grizzly/"
 								title="Go to the &quot;Grizzly&quot; page"
 								>Grizzly</a></li>
-								<li class="link"><a href="/havana/"
-								title="Go to the &quot;Havana release&quot; page"
-								>Havana</a></li>
 								<li class="link"><a
 								href="/incubation/"
 								title="Go to the &quot;Incubation&quot; page"
@@ -166,37 +166,33 @@
 				<h4 class="special">Install OpenStack</h4>
 
 				<dl>
-					<dd><a
+					<dd><a 				       href="http://docs.openstack.org/havana/install-guide/install/yum/content/"
-					       href="http://docs.openstack.org/trunk/install-guide/install/yum/content/"
 					       >Installation Guide for Red Hat
 					        Enterprise Linux, CentOS, and
 						Fedora</a></dd>
-					<dd><a
+					<dd><a			       href="http://docs.openstack.org/havana/install-guide/install/apt/content/"
-					       href="http://docs.openstack.org/trunk/install-guide/install/apt/content/"
 					       >Installation Guide for Ubuntu
 					       12.04 (LTS) Server</a></dd>
 					<dd><a
-					       href="http://docs.openstack.org/trunk/install-guide/install/zypper/content/"
+href="http://docs.openstack.org/havana/install-guide/install/zypper/content/"
 					       >Installation Guide for
 					       openSUSE and SUSE Linux
 					       Enterprise Server</a></dd>
 				</dl>
 				<h4 class="special">Configure and run an OpenStack cloud</h4>
 				<dl>
+				<dd><a
+					       href="http://docs.openstack.org/havana/config-reference/content/">
+					       Configuration Reference</a>
+					</dd>
 				<dd><a
 					       href="http://docs.openstack.org/admin-guide-cloud/content/">
 					       Cloud Administrator Guide</a>
 					</dd>
-					<dd><a
+					<dd><a							href="http://docs.openstack.org/high-availability-guide/content/index.html"
-					       href="http://docs.openstack.org/trunk/config-reference/content/">
+							>High Availability Guide</a></dd>
-					       Configuration Reference</a>
-					</dd>
 					<dd><a href="http://docs.openstack.org/ops/"
 							>Operations Guide</a></dd>
-					<dd><a
-					       href="http://docs.openstack.org/high-availability-guide/content/"
-					       >High Availability
-						Guide</a></dd>
 					<dd><a
 					       href="http://docs.openstack.org/security-guide/content/"
 					       >Security Guide</a></dd>