From 408ebc2f4c9db905fb998c9e87523d30da6909f9 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 22 Oct 2014 18:41:55 +0200
Subject: [PATCH] Unify distribution versions for Install Guide

Add version numbers for RHEL, CentOS, Fedora, openSUSE and SLES to
Install Guide.
Do not use codename for Debian in title and remove LTS from Debian
version.
Use version 7 for Debian.
Add missing text for SLES in intro.

Update Juno and trunk index pages and common appendix for the change.

Change-Id: Ie3938679f9a457aba7f71eda7911905aaa6659ef
---
 doc/common/app_support.xml                    | 14 +++++------
 .../bk-openstack-install-guide.xml            | 25 ++++++++++---------
 www/index.html                                | 10 +++++---
 www/juno/index.html                           | 10 +++++---
 www/trunk/index.html                          | 10 +++++---
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 6c045aa049..cc982bfcc0 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -32,15 +32,15 @@
                     <link
                         xlink:href="http://docs.openstack.org/trunk/install-guide/install/apt-debian/content/">
                         <citetitle>Installation Guide for Debian
-                            7.0</citetitle>
+                            7</citetitle>
                     </link></para>
             </listitem>
             <listitem>
                 <para>
                     <link
                         xlink:href="http://docs.openstack.org/trunk/install-guide/install/zypper/content/">
-                        <citetitle>Installation Guide for openSUSE and
-                            SUSE Linux Enterprise Server</citetitle>
+                        <citetitle>Installation Guide for openSUSE 13.1 and
+                            SUSE Linux Enterprise Server 11 SP3</citetitle>
                     </link></para>
             </listitem>
             <listitem>
@@ -48,16 +48,16 @@
                     <link
                         xlink:href="http://docs.openstack.org/trunk/install-guide/install/yum/content/">
                         <citetitle>Installation Guide for Red Hat
-                            Enterprise Linux, CentOS, and
-                            Fedora</citetitle>
+                            Enterprise Linux 7, CentOS 7, and
+                            Fedora 20</citetitle>
                     </link></para>
             </listitem>
             <listitem>
                 <para>
                     <link
                         xlink:href="http://docs.openstack.org/trunk/install-guide/install/apt/content/">
-                        <citetitle>Installation Guide for Ubuntu 14.04
-                            (LTS)</citetitle>
+                        <citetitle>Installation Guide for Ubuntu
+                        14.04</citetitle>
                     </link></para>
             </listitem>
         </itemizedlist>
diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml
index 0e5cbf0424..d8f8d5aecc 100644
--- a/doc/install-guide/bk-openstack-install-guide.xml
+++ b/doc/install-guide/bk-openstack-install-guide.xml
@@ -7,10 +7,10 @@
   <!--- TODO(jaegerandi) Add back to the above once Juno has branched:
       status="draft" -->
     <title>OpenStack Installation Guide for
-        <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux, CentOS, and Fedora</phrase>
-        <phrase os="ubuntu">Ubuntu 14.04 (LTS)</phrase>
-        <phrase os="debian">Debian 7.0 (Wheezy)</phrase>
-        <phrase os="opensuse">openSUSE and SUSE Linux Enterprise Server</phrase>
+        <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux 7, CentOS 7, and Fedora 20</phrase>
+        <phrase os="ubuntu">Ubuntu 14.04</phrase>
+        <phrase os="debian">Debian 7</phrase>
+        <phrase os="opensuse">openSUSE 13.1 and SUSE Linux Enterprise Server 11 SP3</phrase>
     </title>
     <?rax
       status.bar.text.font.size="40px"
@@ -18,9 +18,9 @@
     <?rax subtitle.font.size="17px" title.font.size="32px"?>
     <titleabbrev>OpenStack Installation Guide for
         <phrase os="rhel;centos;fedora">Red Hat Enterprise Linux, CentOS, and Fedora</phrase>
-        <phrase os="ubuntu">Ubuntu 14.04 (LTS)</phrase>
+        <phrase os="ubuntu">Ubuntu 14.04</phrase>
         <phrase os="opensuse">openSUSE and SUSE Linux Enterprise Server</phrase>
-        <phrase os="debian">Debian 7.0 (Wheezy)</phrase>
+        <phrase os="debian">Debian 7</phrase>
     </titleabbrev>
     <info>
         <author>
@@ -58,21 +58,22 @@
                 as connected entities. <phrase
                     os="debian">This guide walks through an
                     installation by using packages available through
-                    Debian 7.0 (code name: Wheezy).</phrase>
+                    Debian 7 (code name: Wheezy).</phrase>
                 <phrase os="ubuntu">This guide walks through an
                     installation by using packages available through
-                    Ubuntu 14.04 (LTS).</phrase>
+                    Ubuntu 14.04.</phrase>
                 <phrase os="rhel;centos;fedora">This guide shows you
                     how to install OpenStack by using packages
                     available through Fedora 20 as well as on Red Hat
-                    Enterprise Linux and its derivatives through the
+                    Enterprise Linux 7 and its derivatives through the
                     EPEL repository.</phrase>
-                <phrase os="opensuse">This guide shows you how to
+                <phrase os="opensuse;sles">This guide shows you how to
                     install OpenStack by using packages on openSUSE
+                    13.1 and SUSE Linux Enterprise Server 11 SP3
                     through the Open Build Service Cloud
                     repository.</phrase> Explanations of configuration
-                options and sample configuration files are
-                included.</para>
+                    options and sample configuration files are
+                    included.</para>
         </abstract>
         <revhistory>
             <revision>
diff --git a/www/index.html b/www/index.html
index fe80e9f447..c25ae187bf 100644
--- a/www/index.html
+++ b/www/index.html
@@ -34,22 +34,24 @@
   <dl>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/apt-debian/content/">
-     Installation Guide for Debian 7.0
+     Installation Guide for Debian 7
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/zypper/content/">
-     Installation Guide for openSUSE and SUSE Linux Enterprise Server
+     Installation Guide for openSUSE 13.1 and SUSE Linux Enterprise
+     Server 11 SP3
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/yum/content/">
-     Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora
+     Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and
+     Fedora 20
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/apt/content/">
-     Installation Guide for Ubuntu 14.04 (LTS)
+     Installation Guide for Ubuntu 14.04
     </a>
    </dd>
   </dl>
diff --git a/www/juno/index.html b/www/juno/index.html
index 18368dafe9..1aefd09011 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -33,22 +33,24 @@
   <dl>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/apt-debian/content/">
-     Installation Guide for Debian 7.0
+     Installation Guide for Debian 7
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/zypper/content/">
-     Installation Guide for openSUSE and SUSE Linux Enterprise Server
+     Installation Guide for openSUSE 13.1 and SUSE Linux Enterprise
+     Server 11 SP3
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/yum/content/">
-     Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora
+     Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and
+     Fedora 20
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/juno/install-guide/install/apt/content/">
-     Installation Guide for Ubuntu 14.04 (LTS)
+     Installation Guide for Ubuntu 14.04
     </a>
    </dd>
   </dl>
diff --git a/www/trunk/index.html b/www/trunk/index.html
index ec08662d45..442dfc6e51 100644
--- a/www/trunk/index.html
+++ b/www/trunk/index.html
@@ -33,22 +33,24 @@
   <dl>
    <dd>
     <a href="http://docs.openstack.org/trunk/install-guide/install/apt-debian/content/">
-     Installation Guide for Debian 7.0
+     Installation Guide for Debian 7
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/trunk/install-guide/install/zypper/content/">
-     Installation Guide for openSUSE and SUSE Linux Enterprise Server
+     Installation Guide for openSUSE 13.1 and SUSE Linux Enterprise
+     Server 11 SP3
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/trunk/install-guide/install/yum/content/">
-     Installation Guide for Red Hat Enterprise Linux, CentOS, and Fedora
+     Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and
+     Fedora 20
     </a>
    </dd>
    <dd>
     <a href="http://docs.openstack.org/trunk/install-guide/install/apt/content/">
-     Installation Guide for Ubuntu 14.04 (LTS)
+     Installation Guide for Ubuntu 14.04
     </a>
    </dd>
   </dl>