use Apache instead of apache or Apache2

* replaced Apache2 with Apache
  * replaced apache with Apache

Also changed two paragraphs into a title and adjusted a few sentences
like suggested by Diane Fleming.

Change-Id: I54976f87305902a46e797ebd949aa02a9d0d16d0
This commit is contained in:
Christian Berendt 2014-05-27 13:52:01 +02:00
parent fb21219680
commit 48065d5d2a
3 changed files with 5 additions and 6 deletions

View File

@ -124,7 +124,7 @@ text-decoration: none;
...</programlisting>
</step>
<step>
<para>Restart apache:</para>
<title>Restart Apache:</title>
<para>On Ubuntu:
<screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
</para>

View File

@ -170,14 +170,13 @@ DEBUG:django.db.backends:(0.008) CREATE INDEX `django_session_c25c2c28` ON `djan
No fixtures found.</computeroutput></screen>
</step>
<step>
<para>On Ubuntu: If you want to avoid a warning when you restart
apache2, create a blackhole directory in the
<para>To avoid a warning when you restart Apache on Ubuntu,
create a <filename>blackhole</filename> directory in the
dashboard directory, as follows:</para>
<screen><prompt>#</prompt> <userinput>mkdir -p /var/lib/dash/.blackhole</userinput></screen>
</step>
<step>
<para>Restart Apache to pick up the default site and
symbolic link settings:</para>
<title>Restart and refresh Apache</title>
<para>On Ubuntu:
<screen><prompt>#</prompt> <userinput>/etc/init.d/apache2 restart</userinput></screen>
</para>

View File

@ -230,7 +230,7 @@ write-proxy = off</programlisting>
# Require all granted
&lt;/Directory&gt;
&lt;/VirtualHost&gt;</programlisting>
<para>Compute API SSL endpoint in Apache2, which needs to be paired with
<para>Compute API SSL endpoint in Apache, which you must pair with
a short WSGI script.</para>
<programlisting>&lt;VirtualHost &lt;ip address&gt;:8447&gt;
ServerName &lt;site FQDN&gt;