From 441d976b77e23add7de740e36585afb66c8147d8 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@rcbowen.com>
Date: Fri, 4 Oct 2013 10:36:14 -0400
Subject: [PATCH] Apache is the foundation. Apache http server is the product.
 Also, start instructions for RH platforms where it's called httpd rather than
 apache2.

Change-Id: Icf1a66541fb2e6740ac36758955c112c644a009d
---
 doc/common/section_about-dashboard.xml           |  6 +++---
 doc/common/section_dashboard-configure-http.xml  |  9 ++++++---
 doc/common/section_dashboard-configure-https.xml | 11 +++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/doc/common/section_about-dashboard.xml b/doc/common/section_about-dashboard.xml
index e7baa9b27e..05f1cdd9f7 100644
--- a/doc/common/section_about-dashboard.xml
+++ b/doc/common/section_about-dashboard.xml
@@ -13,15 +13,15 @@
         </listitem>
         <listitem>
             <para>Install the OpenStack Dashboard framework, including
-                Apache and related modules.</para>
+                Apache http server and related modules.</para>
         </listitem>
         <listitem>
             <para>Configure the dashboard.</para>
-            <para>Then, restart and run the Apache server.</para>
+            <para>Then, restart and run the Apache http server.</para>
         </listitem>
         <listitem>
             <para>Verify your installation by going to the URL of the
-                Apache server you configured.</para>
+                Apache http server you configured.</para>
         </listitem>
     </orderedlist>
         <simplesect>
diff --git a/doc/common/section_dashboard-configure-http.xml b/doc/common/section_dashboard-configure-http.xml
index 17dbb07558..0493616595 100644
--- a/doc/common/section_dashboard-configure-http.xml
+++ b/doc/common/section_dashboard-configure-http.xml
@@ -25,9 +25,12 @@
                     Configuration</link>.</para>
             </step>
             <step>
-                <para>Restart Apache and memcached:</para>
-                <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput>
-<prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
+                <para>Restart Apache http server. For Ubuntu/Debian/SUSE:</para>
+                <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
+                <para>or for Fedora/RHEL/CentOS:</para>
+                <screen><prompt>#</prompt> <userinput>service httpd restart</userinput></screen>
+                <para>Next, restart memcached:</para>
+                <screen><prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
             </step>
         </procedure>
 </section>
diff --git a/doc/common/section_dashboard-configure-https.xml b/doc/common/section_dashboard-configure-https.xml
index 8e59546c8a..d0400ad520 100644
--- a/doc/common/section_dashboard-configure-https.xml
+++ b/doc/common/section_dashboard-configure-https.xml
@@ -76,16 +76,19 @@ Order allow,deny
 Allow from all
 &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</programlisting>
-            <para>In this configuration, Apache listens on the
+            <para>In this configuration, Apache http server listens on the
                 port 443 and redirects all the hits to the HTTPS
                 protocol for all the non-secured requests. The secured
                 section defines the private key, public key, and
                 certificate to use.</para>
         </step>
         <step>
-            <para>Restart Apache and memcached:</para>
-            <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput>
-<prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
+            <para>Restart Apache http server. For Debian/Ubuntu/SUSE:</para>
+            <screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
+            <para>Or for Fedora/RHEL/CentOS:</para>
+            <screen><prompt>#</prompt> <userinput>service httpd restart</userinput></screen>
+            <para>Next, restart memcached:</para>
+            <screen><prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
             <para>If you try to access the dashboard through HTTP,
                 the browser redirects you to the HTTPS page.</para>
         </step>