From b421e44bf4794141e44a412ac0e15c6922d75486 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Wed, 8 May 2013 10:53:35 -0500
Subject: [PATCH] Updated Install Guide titles for consistency

bug: #1177075

Change-Id: Ie4c2ce5941cd11e8ca90e0824843708db65eea2c
author: Diane Fleming
---
 doc/src/docbkx/basic-install/.gitignore       |   2 +
 doc/src/docbkx/basic-install/pom.xml          |   4 +-
 .../basic-install/src/bk-basic-install.xml    |  22 +-
 .../bk_openstackinstallguide.xml              |  27 +-
 doc/src/docbkx/openstack-install/pom.xml      |   2 +-
 www/install/index.html                        | 342 ++++++++++--------
 6 files changed, 223 insertions(+), 176 deletions(-)
 create mode 100644 doc/src/docbkx/basic-install/.gitignore

diff --git a/doc/src/docbkx/basic-install/.gitignore b/doc/src/docbkx/basic-install/.gitignore
new file mode 100644
index 0000000000..4eee58be5a
--- /dev/null
+++ b/doc/src/docbkx/basic-install/.gitignore
@@ -0,0 +1,2 @@
+*.bak
+/target
diff --git a/doc/src/docbkx/basic-install/pom.xml b/doc/src/docbkx/basic-install/pom.xml
index 9cf56004b2..ba4c93bb53 100644
--- a/doc/src/docbkx/basic-install/pom.xml
+++ b/doc/src/docbkx/basic-install/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>openstack-basic-install</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>OpenStack Basic Install Guide</name>
+  <name>OpenStack Installation Guide</name>
   
   <properties>
     <!-- This is set by Jenkins according to the branch. -->
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>com.rackspace.cloud.api</groupId>
         <artifactId>clouddocs-maven-plugin</artifactId>
-        <version>1.7.2</version>
+        <version>1.8.0</version>
         <executions>
           <execution>
             <id>goal1</id>
diff --git a/doc/src/docbkx/basic-install/src/bk-basic-install.xml b/doc/src/docbkx/basic-install/src/bk-basic-install.xml
index 0ab34f33e9..523e72c319 100644
--- a/doc/src/docbkx/basic-install/src/bk-basic-install.xml
+++ b/doc/src/docbkx/basic-install/src/bk-basic-install.xml
@@ -17,11 +17,11 @@
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns:html="http://www.w3.org/1999/xhtml" version="5.0"
     xml:id="openstack-basic-install-grizzly">
-    <title>OpenStack Basic Install Guide - <phrase os="rhel;centos;fedora">Fedora 18</phrase>
-        <phrase os="ubuntu">Ubuntu 12.04</phrase></title>
-    <?rax title.font.size="32px"?>
-    <titleabbrev>Basic Install Guide - <phrase os="rhel;centos;fedora">Fedora 18</phrase>
-        <phrase os="ubuntu">Ubuntu 12.04</phrase></titleabbrev>
+    <title>OpenStack Basic Installation Guide<phrase os="rhel;centos;fedora"> for Fedora 18</phrase>
+        <phrase os="ubuntu"> for Ubuntu 12.04 (LTS) and Debian Wheezy</phrase></title>
+    <?rax subtitle.font.size="18px" title.font.size="24px"?>
+    <titleabbrev>OpenStack Install Guide<phrase os="rhel;centos;fedora"> for Fedora 18</phrase>
+        <phrase os="ubuntu"> for Ubuntu 12.04 (LTS) and Debian Wheezy</phrase></titleabbrev>
     <info>
         <author>
             <personname>
@@ -41,7 +41,7 @@
             <holder>OpenStack Foundation</holder>
         </copyright>
         <releaseinfo>Grizzly, 2013.1</releaseinfo>
-        <productname>OpenStack</productname>
+        <productname>OpenStack Basic Installation Guide</productname>
         <pubdate/>
         <legalnotice role="apache2">
             <annotation>
@@ -56,6 +56,16 @@
                     (<abbrev>API</abbrev>). </para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2013-05-08</date>
+                <revdescription>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Updated the title for consistency.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>  
             <revision>
                 <date>2009-01-01</date>
                 <revdescription>
diff --git a/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml b/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
index b3ce3fdff8..b13159f25b 100644
--- a/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
+++ b/doc/src/docbkx/openstack-install/bk_openstackinstallguide.xml
@@ -5,10 +5,12 @@
     xmlns:svg="http://www.w3.org/2000/svg"
     xmlns:html="http://www.w3.org/1999/xhtml" version="5.0"
     xml:id="openstack-install-manual-grizzly">
-    <?rax subtitle.font.size="20px"?>
-    <title>OpenStack Install and Deploy Guide - <phrase
-            os="rhel;centos;fedora">Red Hat</phrase>
-        <phrase os="ubuntu">Ubuntu</phrase></title>
+    <title>OpenStack Installation Guide<phrase
+        os="rhel;centos;fedora"> for Red Hat Enterprise Linux, CentOS, and Fedora</phrase>
+        <phrase os="ubuntu"> for Ubuntu 12.04 (LTS)</phrase></title>
+    <?rax subtitle.font.size="17px" title.font.size="32px"?>
+    <titleabbrev>OpenStack Installation Guide<phrase os="rhel;centos;fedora"> for Red Hat Enterprise Linux, CentOS, and Fedora</phrase>
+        <phrase os="ubuntu"> for Ubuntu 12.04 (LTS)</phrase></titleabbrev>
     <info>
         <author>
             <personname>
@@ -24,9 +26,9 @@
             <year>2013</year>
             <holder>OpenStack Foundation</holder>
         </copyright>
-        <releaseinfo>Grizzly, 2013.1 (Object Storage
-            1.8.0)</releaseinfo>
-        <productname>OpenStack</productname>
+        <releaseinfo>Grizzly, 2013.1 with Object Storage
+            1.8.0</releaseinfo>
+        <productname>OpenStack Installation Guide</productname>
         <pubdate/>
         <legalnotice role="apache2">
             <annotation>
@@ -53,6 +55,17 @@
                 as well as sample configuration files. </para>
         </abstract>
         <revhistory>
+            <revision>
+                <date>2013-05-08</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>Updated the book title for
+                                consistency.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
             <revision>
                 <date>2013-05-02</date>
                 <revdescription>
diff --git a/doc/src/docbkx/openstack-install/pom.xml b/doc/src/docbkx/openstack-install/pom.xml
index 713e9dff7f..828b8568fa 100644
--- a/doc/src/docbkx/openstack-install/pom.xml
+++ b/doc/src/docbkx/openstack-install/pom.xml
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>com.rackspace.cloud.api</groupId>
                 <artifactId>clouddocs-maven-plugin</artifactId>
-                <version>1.7.2</version>
+                <version>1.8.0</version>
                 
                 <executions>
                     <execution>
diff --git a/www/install/index.html b/www/install/index.html
index 91c19dcc7b..4cb3bc9086 100644
--- a/www/install/index.html
+++ b/www/install/index.html
@@ -1,29 +1,32 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
+<!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: current</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" />
+		<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: current</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" />
+		<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 || [];
@@ -39,160 +42,179 @@
 			
 			</script>-->
 	</head>
-	
 	<body class="docshome" id="docshome">
-		
 		<div class="container">
-		<div id="header">
-			<div class="span-5">
-				<h1 id="logo"><a href="/">OpenStack</a></h1>
-			</div>
-			<div class="span-19 last blueLine">
-				
-				<div id="navigation" class="span-19">
-					<ul id="Menu1">
-						   		  
-  		<li><a href="http://www.openstack.org/" title="Go to the Home page">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 id="header">
+				<div class="span-5">
+					<h1 id="logo"><a href="/">OpenStack</a></h1>
 				</div>
-				
-			</div>
-	  	</div>
-	</div>
-		
-		<!-- Page Content -->
-
-	<div class="container">
-	<div class="span-12">
-			<h3 class="subhead"><a href="http://docs.openstack.org/">Documentation</a> > Install </h3>
-	</div>
-	<div class="searchArea span-10 last">
-					<div id="cse" style="width: 100%;">
-						Loading
+				<div class="span-19 last blueLine">
+					<div id="navigation" class="span-19">
+						<ul id="Menu1">
+							<li><a href="http://www.openstack.org/"
+								title="Go to the Home page"
+								>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>
-		
-		<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>
+			</div>
+		</div>
+		<!-- Page Content -->
 		<div class="container">
-		<div class="span-12">
-		    <h2><a href="http://docs.openstack.org/grizzly/basic-install/apt/content">Basic Installation Guide for Ubuntu 12.04 or Debian Wheezy (grizzly)
-		    </a>
-			</h2>
-			<p>Contains a basic installation set up with production considerations for all OpenStack components with a controller node and compute node. </p>
-			<h2><a href="http://docs.openstack.org/grizzly/basic-install/yum/content">Basic Installation Guide for Fedora 18 (grizzly)
-			</a>
-			</h2>
-			<p>Contains a basic installation set up with production considerations for all OpenStack components with a controller node and compute node. </p>
-			<h2><a href="http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/">Install and Deploy Guide for Ubuntu 12.04 (grizzly)
-			</a>
-			</h2>	
-			<p>Compute, Image, Volumes, Object Storage and Identity services installation with the OpenStack Dashboard using packages available through the Ubuntu Cloud Archive.
-			</p>
-			<h2><a href="http://docs.openstack.org/grizzly/openstack-compute/install/yum/content/">Install and Deploy Guide for Red Hat Enterprise Linux, CentOS, or Fedora (grizzly)</a>
-			</h2>
-			<p>Walks through an installation using packages available on RHEL and derivatives through a Fedora repository. 
-				
-			</p>
-			<h2><a href="http://docs.openstack.org/grizzly/openstack-network/admin/content/ch_install.html">OpenStack Networking (Quantum) Installation</a>
-			</h2>
-			<p>Installation instructions for OpenStack Networking from Ubuntu or Fedora packages. 
-			</p>
-			
-		</div>
-		<div class="span-12 last">	
-
+			<div class="span-12">
+				<h3 class="subhead"><a
+						href="http://docs.openstack.org/"
+						>Documentation</a> > Install and Configure
+				</h3>
+			</div>
+			<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-18">
+				<p>Install and configure OpenStack Grizzly services on
+					various Linux distributions. </p>
+				<p>&nbsp;</p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/basic-install/apt/content"
+						>OpenStack Basic Installation Guide for Ubuntu 12.04
+						(LTS) and Debian Wheezy</a>
+				</h2>
+				<p>Install and configure OpenStack Grizzly services
+					with Ubuntu 12.04 (LTS) or Debian Wheezy. Includes
+					the Identity, Image, Compute, Block Storage, and
+					Networking services. Set up a controller, network,
+					and compute node.</p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/basic-install/yum/content"
+						>OpenStack Basic Installation Guide for Fedora
+						18</a>
+				</h2>
+				<p>Install and configure OpenStack Grizzly services
+					with Fedora 18. Includes the Identity, Image,
+					Compute, Block Storage, and Networking services.
+					Set up a controller, network, and compute node. </p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-compute/install/yum/content/"
+						>OpenStack Installation Guide for Red
+						Hat Enterprise Linux, CentOS, and Fedora</a>
+				</h2>
+				<p>Install and configure OpenStack Grizzly services
+					with Red Hat Enterprise Linux (RHEL), 
+					CentOS, or Fedora 17. Includes the Identity, Image, Compute,
+					and Object Storage services. Register virtual
+					machine (VM) images and run VM instances. View
+					configuration file examples.</p>
+				<h2><a
+						href="http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/"
+						>OpenStack Installation Guide for
+						Ubuntu 12.04 (LTS)</a>
+				</h2>
+				<p>Install and configure OpenStack Grizzly services
+					with Ubuntu 12.04 (LTS). Includes the Identity,
+					Image, Compute, and Object Storage services.
+					Register virtual machine (VM) images and run VM
+					instances. View configuration file examples.</p>
+			</div>
+			<div class="span-12 last"> </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>
+				<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 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">
+
+
+		<script type="text/javascript" charset="utf-8">
 //<![CDATA[
-    $(document).ready(function() {
-      
-      function addMenu(){
-        $(".dropDown").addClass("menuHover");
-        }
+            $(document).ready(function () {
+ 
+                function addMenu() {
+                    $(".dropDown").addClass("menuHover");
+                }
 
-      function removeMenu(){
-        $(".dropDown").removeClass("menuHover");
-        }
+                function removeMenu() {
+                $(".dropDown").removeClass("menuHover");
+                }
 
-    var menuConfig = {
-         interval: 500,
-         sensitivity: 4,
-         over: addMenu,
-         timeout: 500,
-         out: removeMenu
-    };
+                var menuConfig = {
+                    interval: 500,
+                    sensitivity: 4,
+                    over: addMenu,
+                    timeout: 500,
+                    out: removeMenu
+                };
 
-    $(".dropDownTrigger").hoverIntent(menuConfig);    
-    
-    
-      
-    });
-    
-
-
-    //]]>
+                $(".dropDownTrigger").hoverIntent(menuConfig);
+            });//]]>
 </script>
-			
-	</body>
+</body>
 </html>