svn commit: r44583 - head/en_US.ISO8859-1/books/handbook/network-servers
Dru Lavigne
dru at FreeBSD.org
Wed Apr 16 18:10:03 UTC 2014
Author: dru
Date: Wed Apr 16 18:10:02 2014
New Revision: 44583
URL: http://svnweb.freebsd.org/changeset/doc/44583
Log:
white space fix only. Translators can ignore.
Sponsored by: iXsystems
Modified:
head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Wed Apr 16 17:32:06 2014 (r44582)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml Wed Apr 16 18:10:02 2014 (r44583)
@@ -4267,17 +4267,17 @@ $include Kexample.com.+005+nnnnn.ZSK.key
<secondary>setting up</secondary></indexterm>
<indexterm><primary>Apache</primary></indexterm>
- <para>The open source <application>Apache HTTP Server
- </application> is the most widely used web server. &os; does
- not install this web server by default, but it can be installed
- from the <package>www/apache24</package> package or port.</para>
+ <para>The open source
+ <application>Apache HTTP Server</application> is the most widely
+ used web server. &os; does not install this web server by
+ default, but it can be installed from the
+ <package>www/apache24</package> package or port.</para>
<para>This section summarizes how to configure and start version
2.<replaceable>x</replaceable> of the <application>Apache HTTP
- Server</application> on &os;.
- For more detailed information about
- <application>Apache</application> 2.X and its configuration
- directives, refer to <link
+ Server</application> on &os;. For more detailed information
+ about <application>Apache</application> 2.X and its
+ configuration directives, refer to <link
xlink:href="http://httpd.apache.org/">httpd.apache.org</link>.</para>
<sect2>
@@ -4289,10 +4289,10 @@ $include Kexample.com.+005+nnnnn.ZSK.key
<para>In &os;, the main <application>Apache HTTP
Server</application> configuration file is installed as
<filename>/usr/local/etc/apache2<replaceable>x</replaceable>/httpd.conf</filename>,
- where <replaceable>x</replaceable> represents the version number.
- This <acronym>ASCII</acronym> text file begins comment lines with a
- <literal>#</literal>. The most frequently modified directives
- are:</para>
+ where <replaceable>x</replaceable> represents the version
+ number. This <acronym>ASCII</acronym> text file begins
+ comment lines with a <literal>#</literal>. The most
+ frequently modified directives are:</para>
<variablelist>
<varlistentry>
@@ -4303,8 +4303,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
<application>Apache</application> installation.
Binaries are stored in the <filename>bin</filename> and
<filename>sbin</filename> subdirectories of the server
- root and configuration files are stored in the
- <filename
+ root and configuration files are stored in the <filename
class="directory">etc/apache2<replaceable>x</replaceable></filename>
subdirectory.</para>
</listitem>
@@ -4314,21 +4313,22 @@ $include Kexample.com.+005+nnnnn.ZSK.key
<term><literal>ServerAdmin you at example.com</literal></term>
<listitem>
- <para>Change this to the email address to receive problems with the
- server. This address also appears on some
+ <para>Change this to the email address to receive problems
+ with the server. This address also appears on some
server-generated pages, such as error documents.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>ServerName www.example.com:80</literal></term>
+ <term><literal>ServerName
+ www.example.com:80</literal></term>
<listitem>
<para>Allows an administrator to set a hostname which is
sent back to clients for the server. For example,
<systemitem>www</systemitem> can be used instead of the
actual hostname. If the system does not have a
- registered<acronym>DNS</acronym> name, enter its
+ registered <acronym>DNS</acronym> name, enter its
<acronym>IP</acronym> address instead. If the server
will listen on an alternate report, change
<literal>80</literal> to the alternate port
@@ -4341,22 +4341,22 @@ $include Kexample.com.+005+nnnnn.ZSK.key
"/usr/local/www/apache2<replaceable>x</replaceable>/data"</literal></term>
<listitem>
- <para>The directory
- where documents will be served from. By default, all
- requests are taken from this directory, but symbolic
- links and aliases may be used to point to other
- locations.</para>
+ <para>The directory where documents will be served from.
+ By default, all requests are taken from this directory,
+ but symbolic links and aliases may be used to point to
+ other locations.</para>
</listitem>
</varlistentry>
</variablelist>
- <para>It is always a good idea to make a backup copy of the default
- <application>Apache</application> configuration file before
- making changes. When the configuration of
- <application>Apache</application> is complete, save the
- file and verify the configuration using <command>apachectl</command>.
- Running <command>apachectl configtest</command> should return
- <literal>Syntax OK</literal>.</para>
+ <para>It is always a good idea to make a backup copy of the
+ default <application>Apache</application> configuration file
+ before making changes. When the configuration of
+ <application>Apache</application> is complete, save the file
+ and verify the configuration using
+ <command>apachectl</command>. Running <command>apachectl
+ configtest</command> should return <literal>Syntax
+ OK</literal>.</para>
<indexterm><primary>Apache</primary>
<secondary>starting or stopping</secondary></indexterm>
@@ -4386,24 +4386,22 @@ $include Kexample.com.+005+nnnnn.ZSK.key
in a web browser, replacing
<replaceable>localhost</replaceable> with the fully-qualified
domain name of the machine running <command>httpd</command>.
- The default web page that is
- displayed is
+ The default web page that is displayed is
<filename>/usr/local/www/apache<replaceable>24</replaceable>/data/index.html</filename>.</para>
<para>The <application>Apache</application> configuration can be
tested for errors after making subsequent configuration
- changes while <command>httpd</command> is running using
- the following
- command:</para>
+ changes while <command>httpd</command> is running using the
+ following command:</para>
<screen>&prompt.root; <userinput>service apache<replaceable>24</replaceable> configtest</userinput></screen>
<note>
<para>It is important to note that
<literal>configtest</literal> is not an &man.rc.8; standard,
- and should not be expected to work for all
- startup scripts.</para>
- </note>
+ and should not be expected to work for all startup
+ scripts.</para>
+ </note>
</sect2>
<sect2>
@@ -4412,19 +4410,19 @@ $include Kexample.com.+005+nnnnn.ZSK.key
<para>Virtual hosting allows multiple websites to run on one
<application>Apache</application> server. The virtual hosts
can be <firstterm>IP-based</firstterm> or
- <firstterm>name-based</firstterm>. <acronym>IP</acronym>-based
- virtual hosting uses a different <acronym>IP</acronym> address
- for each website. Name-based virtual hosting uses the clients
- HTTP/1.1 headers to figure out the hostname, which allows the
- websites to share the same <acronym>IP</acronym>
- address.</para>
+ <firstterm>name-based</firstterm>.
+ <acronym>IP</acronym>-based virtual hosting uses a different
+ <acronym>IP</acronym> address for each website. Name-based
+ virtual hosting uses the clients HTTP/1.1 headers to figure
+ out the hostname, which allows the websites to share the same
+ <acronym>IP</acronym> address.</para>
<para>To setup <application>Apache</application> to use
name-based virtual hosting, add a
<literal>VirtualHost</literal> block for each website. For
example, for the webserver named <systemitem
- class="fqdomainname">www.domain.tld</systemitem> with
- a virtual domain of <systemitem
+ class="fqdomainname">www.domain.tld</systemitem> with a
+ virtual domain of <systemitem
class="fqdomainname">www.someotherdomain.tld</systemitem>,
add the following entries to
<filename>httpd.conf</filename>:</para>
@@ -4456,9 +4454,8 @@ DocumentRoot <replaceable>/www/someother
<indexterm><primary>Apache</primary>
<secondary>modules</secondary></indexterm>
- <para><application>Apache</application> uses
- modules to augment the functionality provided by the basic
- server. Refer to <uri
+ <para><application>Apache</application> uses modules to augment
+ the functionality provided by the basic server. Refer to <uri
xlink:href="http://httpd.apache.org/docs/current/mod/">http://httpd.apache.org/docs/current/mod/</uri>
for a complete listing of and the configuration details for
the available modules.</para>
@@ -4467,11 +4464,11 @@ DocumentRoot <replaceable>/www/someother
<package>www/apache24</package> port. Type <command>make
config</command> within
<filename>/usr/ports/www/apache24</filename> to see which
- modules are available and which are enabled by
- default. If the module is not compiled with the port, the
- &os; Ports Collection provides an easy way to install
- many modules. This section describes three of the most
- commonly used modules.</para>
+ modules are available and which are enabled by default. If
+ the module is not compiled with the port, the &os; Ports
+ Collection provides an easy way to install many modules. This
+ section describes three of the most commonly used
+ modules.</para>
<sect3>
<title><filename>mod_ssl</filename></title>
@@ -4484,9 +4481,10 @@ DocumentRoot <replaceable>/www/someother
<indexterm><primary>cryptography</primary></indexterm>
<para>The <filename>mod_ssl</filename> module uses the
- <application>OpenSSL</application> library to provide strong cryptography via the
- Secure Sockets Layer (<acronym>SSLv3</acronym>) and Transport Layer
- Security (<acronym>TLSv1</acronym>) protocols. This module provides
+ <application>OpenSSL</application> library to provide strong
+ cryptography via the Secure Sockets Layer
+ (<acronym>SSLv3</acronym>) and Transport Layer Security
+ (<acronym>TLSv1</acronym>) protocols. This module provides
everything necessary to request a signed certificate from a
trusted certificate signing authority to run a secure web
server on &os;.</para>
@@ -4506,16 +4504,16 @@ DocumentRoot <replaceable>/www/someother
</indexterm>
<para>The
- <filename>mod_perl</filename> module makes it possible
- to write <application>Apache</application> modules
- in <application>Perl</application>. In addition, the persistent interpreter embedded
- in the server avoids the overhead of starting an external
- interpreter and the penalty of <application>Perl</application> start-up time.</para>
-
- <para>The <filename>mod_perl</filename> can be installed using the
- <package>www/mod_perl2</package> package or
- port. Documentation for using this module can be found at
- <uri
+ <filename>mod_perl</filename> module makes it possible to
+ write <application>Apache</application> modules in
+ <application>Perl</application>. In addition, the
+ persistent interpreter embedded in the server avoids the
+ overhead of starting an external interpreter and the penalty
+ of <application>Perl</application> start-up time.</para>
+
+ <para>The <filename>mod_perl</filename> can be installed using
+ the <package>www/mod_perl2</package> package or port.
+ Documentation for using this module can be found at <uri
xlink:href="http://perl.apache.org/docs/2.0/index.html">http://perl.apache.org/docs/2.0/index.html</uri>.</para>
</sect3>
@@ -4540,23 +4538,24 @@ DocumentRoot <replaceable>/www/someother
</indexterm>
<para><firstterm>PHP: Hypertext Preprocessor</firstterm>
- (<acronym>PHP</acronym>) is a
- general-purpose scripting language that is especially suited
- for web development. Capable of being embedded into
- <acronym>HTML</acronym>, its syntax draws upon
- <application>C</application>, &java;, and
- <application>Perl</application> with the intention of allowing web developers to write
- dynamically generated webpages quickly.</para>
+ (<acronym>PHP</acronym>) is a general-purpose scripting
+ language that is especially suited for web development.
+ Capable of being embedded into <acronym>HTML</acronym>, its
+ syntax draws upon <application>C</application>, &java;, and
+ <application>Perl</application> with the intention of
+ allowing web developers to write dynamically generated
+ webpages quickly.</para>
<para>To gain support for <acronym>PHP</acronym>5 for the
- <application>Apache</application> web server,
- install the <package>www/mod_php5</package> package or
- port. This will install and configure the modules required
- to support dynamic <acronym>PHP</acronym> applications.
- The installation will automatically add this line to
+ <application>Apache</application> web server, install the
+ <package>www/mod_php5</package> package or port. This will
+ install and configure the modules required to support
+ dynamic <acronym>PHP</acronym> applications. The
+ installation will automatically add this line to
<filename>/usr/local/etc/apache2<replaceable>4</replaceable>/httpd.conf</filename>:</para>
<programlisting>LoadModule php5_module libexec/apache24/libphp5.so</programlisting>
+
<!--
I don't think this is still needed
AddModule mod_php5.c
@@ -4567,23 +4566,24 @@ AddModule mod_php5.c
AddType application/x-httpd-php .php
AddType application/x-httpd-php-source .phps
</IfModule></programlisting>
+
-->
- <para>Then, perform a graceful
- restart to load the <acronym>PHP</acronym>
- module:</para>
+
+ <para>Then, perform a graceful restart to load the
+ <acronym>PHP</acronym> module:</para>
<screen>&prompt.root; <userinput>apachectl graceful</userinput></screen>
<para>The <acronym>PHP</acronym> support provided by
- <package>www/mod_php5</package>
- is limited. Additional
+ <package>www/mod_php5</package> is limited. Additional
support can be installed using the
- <package>lang/php5-extensions</package>
- port which provides a menu driven interface to the available
+ <package>lang/php5-extensions</package> port which provides
+ a menu driven interface to the available
<acronym>PHP</acronym> extensions.</para>
- <para>Alternatively, individual extensions can be installed using
- the appropriate port. For instance, to add <acronym>PHP</acronym> support for the
+ <para>Alternatively, individual extensions can be installed
+ using the appropriate port. For instance, to add
+ <acronym>PHP</acronym> support for the
<application>MySQL</application> database server, install
<filename>databases/php5-mysql</filename>.</para>
@@ -4615,34 +4615,37 @@ AddModule mod_php5.c
<indexterm><primary>Python</primary></indexterm>
<indexterm><primary>Django</primary></indexterm>
- <para><application>Django</application> is a BSD-licensed framework designed to allow
- developers to write high performance, elegant web
- applications quickly. It provides an object-relational
- mapper so that data types are developed as <application>Python</application> objects.
- A rich dynamic database-access <acronym>API</acronym> is provided for those
- objects without the developer ever having to write <acronym>SQL</acronym>. It
- also provides an extensible template system so that the
- logic of the application is separated from the <acronym>HTML</acronym>
+ <para><application>Django</application> is a BSD-licensed
+ framework designed to allow developers to write high
+ performance, elegant web applications quickly. It provides
+ an object-relational mapper so that data types are developed
+ as <application>Python</application> objects. A rich
+ dynamic database-access <acronym>API</acronym> is provided
+ for those objects without the developer ever having to write
+ <acronym>SQL</acronym>. It also provides an extensible
+ template system so that the logic of the application is
+ separated from the <acronym>HTML</acronym>
presentation.</para>
- <para>Django depends on <filename>mod_python</filename>,
- and an <acronym>SQL</acronym> database
- engine. In &os;, the <package>www/py-django</package> port
- automatically installs <filename>mod_python</filename> and
- supports the <application>PostgreSQL</application>,
+ <para>Django depends on <filename>mod_python</filename>, and
+ an <acronym>SQL</acronym> database engine. In &os;, the
+ <package>www/py-django</package> port automatically installs
+ <filename>mod_python</filename> and supports the
+ <application>PostgreSQL</application>,
<application>MySQL</application>, or
- <application>SQLite</application> databases, with the default
- being <application>SQLite</application>. To change the
- datbase engine, type <command>make config</command> within
- <filename>/usr/ports/www/py-django</filename>, then install
- the port.</para>
-
- <para>Once <application>Django</application> is installed,
- the application will need a project directory along
- with the <application>Apache</application> configuration in order to
+ <application>SQLite</application> databases, with the
+ default being <application>SQLite</application>. To change
+ the datbase engine, type <command>make config</command>
+ within <filename>/usr/ports/www/py-django</filename>, then
+ install the port.</para>
+
+ <para>Once <application>Django</application> is installed, the
+ application will need a project directory along with the
+ <application>Apache</application> configuration in order to
use the embedded <application>Python</application>
- interpreter. This interpreter is used to
- call the application for specific <acronym>URL</acronym>s on the site.</para>
+ interpreter. This interpreter is used to call the
+ application for specific <acronym>URL</acronym>s on the
+ site.</para>
<para>To configure <application>Apache</application> to pass
requests for certain <acronym>URL</acronym>s to the web
@@ -4670,12 +4673,12 @@ AddModule mod_php5.c
<indexterm><primary>Ruby on Rails</primary></indexterm>
- <para><application>Ruby on Rails</application> is another open source web framework that
- provides a full development stack. It is optimized to make
- web developers more productive and capable of writing
- powerful applications quickly. On &os;, tt can be installed
- using the <package>www/rubygem-rails</package> package or
- port.</para>
+ <para><application>Ruby on Rails</application> is another open
+ source web framework that provides a full development stack.
+ It is optimized to make web developers more productive and
+ capable of writing powerful applications quickly. On &os;,
+ tt can be installed using the
+ <package>www/rubygem-rails</package> package or port.</para>
<para>Refer to <uri
xlink:href="http://rubyonrails.org/documentation">http://rubyonrails.org/documentation</uri>
More information about the svn-doc-all
mailing list