summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbarnson%sisna.com <>2008-04-04 13:46:13 +0200
committermbarnson%sisna.com <>2008-04-04 13:46:13 +0200
commit1b6350a6442415f7670b232ed11acc132f348c57 (patch)
treedf9ea30baf757cdde26b2a4217cb4aff63655444
parentadc546d5f36c665ea0acc9d69827178da5bc2600 (diff)
downloadbugzilla-1b6350a6442415f7670b232ed11acc132f348c57.tar.gz
bugzilla-1b6350a6442415f7670b232ed11acc132f348c57.tar.xz
Fix for Apache configuration directives from bug 174255 and
de-stupidifying of emacs destruction of <programlisting> tags.
-rw-r--r--docs/en/xml/installation.xml36
1 files changed, 23 insertions, 13 deletions
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index 76b3eb87a..0af9c4bf6 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -525,18 +525,25 @@
</note>
</para>
- <para>You'll want to make sure that your web server will run any file
- with the .cgi extension as a CGI and not just display it. If you're
+ <para>You'll want to make sure that your web server will <emphasis>run</emphasis>
+ any file
+ with the .cgi extension as a CGI program and not simply display the source
+ code. If you're
using Apache that means uncommenting the following line in the httpd.conf
file:
- <programlisting>AddHandler cgi-script .cgi</programlisting>
+ <programlisting>
+AddHandler cgi-script .cgi
+ </programlisting>
</para>
<para>With Apache you'll also want to make sure that within the
- httpd.conf file the line:
- <programlisting>Options ExecCGI AllowOverride Limit</programlisting>
+ httpd.conf file these lines:
+ <programlisting><![CDATA[
+Options +ExecCGI
+AllowOverride Limit
+]]></programlisting>
- is in the stanza that covers the directories into which you intend to
+ are in the stanza that covers the directories into which you intend to
put the bugzilla .html and .cgi files.
<note>
@@ -544,7 +551,7 @@
.htaccess file generated by checksetup.pl</para>
<para>Users of older versions of Apache may find the above lines
- in the srm.conf and access.conf files, respecitvely.</para>
+ in the srm.conf and access.conf files, respectively.</para>
</note>
</para>
@@ -603,9 +610,9 @@
</para>
<para>
- <programlisting>perl -pi -e
- 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm
- processmail syncshadowdb</programlisting>
+ <programlisting>
+perl -pi -e 's@#\!/usr/bonsaitools/bin/perl@#\!/usr/bin/perl@' *cgi *pl Bug.pm processmail syncshadowdb
+ </programlisting>
Change <filename>/usr/bin/perl</filename> to match the location
of Perl on your machine.
@@ -1028,7 +1035,9 @@
<para>Depending on your system, crontab may have several manpages.
The following command should lead you to the most useful page for
this purpose:
- <programlisting>man 5 crontab</programlisting>
+ <programlisting>
+man 5 crontab
+ </programlisting>
</para>
</tip>
</section>
@@ -1137,7 +1146,8 @@
you understand what the script is doing before executing it.</para>
<para>
- <programlisting>bash# perl -pi -e "s/Content-Type\: text\/html/Content-Type\: text\/html\; charset=ISO-8859-1/i" *.cgi *.pl
+ <programlisting>
+bash# perl -pi -e "s/Content-Type\: text\/html/Content-Type\: text\/html\; charset=ISO-8859-1/i" *.cgi *.pl
</programlisting>
</para>
@@ -1205,7 +1215,7 @@
<para>
<programlisting><![CDATA[
- <Directory /usr/local/bugzilla/>
+<Directory /usr/local/bugzilla/>
Options +FollowSymLinks +Indexes +Includes +ExecCGI
AllowOverride All
</Directory>