[system-administrators-guide] typos and formatting improvements
stephenw
stephenw at fedoraproject.org
Thu Oct 30 21:18:19 UTC 2014
commit 904d8119dabebe5afd6155e6790c294e298217a3
Author: Stephen Wadeley <swadeley at redhat.com>
Date: Thu Oct 30 22:17:46 2014 +0100
typos and formatting improvements
in en-US/Mail_Servers.xml
en-US/Mail_Servers.xml | 53 +++++++++++++----------------------------------
1 files changed, 15 insertions(+), 38 deletions(-)
---
diff --git a/en-US/Mail_Servers.xml b/en-US/Mail_Servers.xml
index d24427a..614f47b 100644
--- a/en-US/Mail_Servers.xml
+++ b/en-US/Mail_Servers.xml
@@ -129,11 +129,11 @@ ln -s '/usr/lib/systemd/system/dovecot' '/etc/systemd/system/multi-user.target.w
</note>
</listitem>
</orderedlist>
- <para>Unlike <systemitem class="protocol">SMTP</systemitem>, both <systemitem class="protocol">IMAP</systemitem> and <systemitem class="protocol">POP3</systemitem> require connecting clients to authenticate using a username and password. By default, passwords for both protocols are passed over the network unencrypted.</para>
+ <para>Unlike <systemitem class="protocol">SMTP</systemitem>, both <systemitem class="protocol">IMAP</systemitem> and <systemitem class="protocol">POP3</systemitem> require connecting clients to authenticate using a user name and password. By default, passwords for both protocols are passed over the network unencrypted.</para>
<para>To configure <systemitem class="protocol">SSL</systemitem> on <command>dovecot</command>:</para>
<itemizedlist>
<listitem>
- <para>Edit the <filename>/etc/pki/dovecot/dovecot-openssl.conf</filename> configuration file as you prefer. However, in a typical installation, this file does not require modification.</para>
+ <para>Edit the <filename>/etc/pki/dovecot/dovecot-openssl.cnf</filename> configuration file as you prefer. However, in a typical installation, this file does not require modification.</para>
</listitem>
<listitem>
<para>Rename, move or delete the files <filename>/etc/pki/dovecot/certs/dovecot.pem</filename> and <filename>/etc/pki/dovecot/private/dovecot.pem</filename>.</para>
@@ -249,11 +249,7 @@ ln -s '/usr/lib/systemd/system/dovecot' '/etc/systemd/system/multi-user.target.w
<para>To improve security, Postfix uses a modular design, where small processes with limited privileges are launched by a <firstterm>master</firstterm> daemon. The smaller, less privileged processes perform very specific tasks related to the various stages of mail delivery and run in a changed root environment to limit the effects of attacks.</para>
<para>Configuring Postfix to accept network connections from hosts other than the local computer takes only a few minor changes in its configuration file. Yet for those with more complex needs, Postfix provides a variety of configuration options, as well as third party add-ons that make it a very versatile and full-featured MTA.</para>
<para>The configuration files for Postfix are human readable and support upward of 250 directives. Unlike Sendmail, no macro processing is required for changes to take effect and the majority of the most commonly used options are described in the heavily commented files.</para>
- <!-- silas: Postfix is default in RHEL6
- <important>
- <title>Important</title>
- <para>Before using Postfix, the default MTA must be switched from Sendmail.</para>
- </important>-->
+
<section
id="s3-email-mta-postfix-default">
<title>The Default Postfix Installation</title>
@@ -261,7 +257,7 @@ ln -s '/usr/lib/systemd/system/dovecot' '/etc/systemd/system/multi-user.target.w
<primary>Postfix</primary>
<secondary>default installation</secondary>
</indexterm>
- <para>The Postfix executable is <filename>/usr/sbin/postfix</filename>. This daemon launches all related processes needed to handle mail delivery.</para>
+ <para>The Postfix executable is <filename>postfix</filename>. This daemon launches all related processes needed to handle mail delivery.</para>
<para>Postfix stores its configuration files in the <filename>/etc/postfix/</filename> directory. The following is a list of the more commonly used files:</para>
<itemizedlist>
<listitem>
@@ -404,7 +400,7 @@ search_base = dc=<replaceable>example</replaceable>, dc=<replaceable>com</replac
<para>
Before using Sendmail, the default MTA has to be switched from Postfix. For more information how to switch the default MTA refer to <xref linkend="s1-email-mta"/>.
</para>
- <para>The Sendmail executable is <filename>/usr/sbin/sendmail</filename>.</para>
+ <para>The Sendmail executable is <filename>sendmail</filename>.</para>
<para>Sendmail's lengthy and detailed configuration file is <filename>/etc/mail/sendmail.cf</filename>. Avoid editing the <filename>sendmail.cf</filename> file directly. To make configuration changes to Sendmail, edit the <filename>/etc/mail/sendmail.mc</filename> file, back up the original <filename>/etc/mail/sendmail.cf</filename> file, and use the following alternatives to generate a new configuration file:</para>
<itemizedlist>
<listitem>
@@ -444,12 +440,12 @@ search_base = dc=<replaceable>example</replaceable>, dc=<replaceable>com</replac
This will update <filename>virtusertable.db</filename>, <filename>access.db</filename>, <filename>domaintable.db</filename>, <filename>mailertable.db</filename>, <filename>sendmail.cf</filename>, and <filename>submit.cf</filename>.</para>
<para>
To update all the database files listed above and to update a custom database file, use a command in the following format:
-<synopsis><command>make <replaceable>name>.db</replaceable> all</command></synopsis>
+<synopsis><command>make <replaceable>name.db</replaceable> all</command></synopsis>
where <replaceable>name</replaceable> represents the name of the custom database file to be updated.</para>
<para>
To update a single database, use a command in the following format:
-<synopsis><command>make <replaceable>name>.db</replaceable></command></synopsis>
-where <replaceable>name>.db</replaceable> represents the name of the database file to be updated.</para>
+<synopsis><command>make <replaceable>name.db</replaceable></command></synopsis>
+where <replaceable>name.db</replaceable> represents the name of the database file to be updated.</para>
<para>
You may also restart the <systemitem class="service">sendmail</systemitem> service for the changes to take effect by running:</para>
<screen>~]# <command>systemctl restart sendmail</command></screen>
@@ -560,7 +556,7 @@ FEATURE('ldap_routing')dnl</programlisting>
</note>
<para>Next, recreate the <filename>/etc/mail/sendmail.cf</filename> file by running the <command>m4</command> macro processor and again restarting Sendmail. See <xref
linkend="s3-email-mta-sendmail-changes"/> for instructions.</para>
- <para>For more information on <systemitem class="protocol">LDAP</systemitem>, refer to <xref
+ <para>For more information on <systemitem class="protocol">LDAP</systemitem>, see <xref
linkend="s1-OpenLDAP" />.</para>
</section>
</section>
@@ -606,7 +602,7 @@ FEATURE('ldap_routing')dnl</programlisting>
</listitem>
<listitem>
<para>
- <emphasis>user options</emphasis> — Contains information, such as username and password, necessary to authenticate and check for email using a specified email server.</para>
+ <emphasis>user options</emphasis> — Contains information, such as user name and password, necessary to authenticate and check for email using a specified email server.</para>
</listitem>
</itemizedlist>
<para>Global options appear at the top of the <filename>.fetchmailrc</filename> file, followed by one or more server options, each of which designate a different email server that Fetchmail should check. User options follow server options for each user account checking that email server. Like server options, multiple user options may be specified for use with a particular server as well as to check multiple email accounts on the same server.</para>
@@ -841,25 +837,8 @@ poll mail.domain2.com
<indexterm>
<primary><application>Mail Transport Agent Switcher</application></primary>
</indexterm>
- <!--<indexterm
- significance="normal">
- <primary>
- <command>system-switch-mail</command>
- </primary>
- <see>
- <application>Mail Transport Agent Switcher</application>
- </see>
- </indexterm>-->
- <!-- silas: system-switch-mail deprecated
- <indexterm
- significance="normal">
- <primary>
- <command>system-switch-mail-nox</command>
- </primary>
- <see>
- <application>Mail Transport Agent Switcher</application>
- </see>
- </indexterm>-->
+
+ <indexterm>
<primary>Mail User Agent</primary>
</indexterm>
<indexterm>
@@ -887,9 +866,7 @@ poll mail.domain2.com
<figure
float="0"
id="fig-switchmail">
- <title>
- <application>Mail Transport Agent Switcher</application>
- </title>
+ <title><application>Mail Transport Agent Switcher</application></title>
<mediaobject>
<imageobject>
<imagedata
@@ -1308,7 +1285,7 @@ connect = 110
[imaps]
accept = 993
connect = 143</programlisting>
- <para>Once you start <command>stunnel</command> with the created configuration file using the <command>/usr/bin/stunnel /etc/stunnel/mail.conf</command> command, it will be possible to use an <systemitem class="protocol">IMAP</systemitem> or a <systemitem class="protocol">POP</systemitem> email client and connect to the email server using SSL encryption.</para>
+ <para>Once you start <command>stunnel</command> with the created configuration file using the <command>stunnel /etc/stunnel/mail.conf</command> command, it will be possible to use an <systemitem class="protocol">IMAP</systemitem> or a <systemitem class="protocol">POP</systemitem> email client and connect to the email server using SSL encryption.</para>
<para>For more information on <command>stunnel</command>, see the <filename>stunnel(8)</filename> man page or the documents in the <filename class="directory">/usr/share/doc/stunnel/</filename> directory.</para>
</section>
</section>
@@ -1383,7 +1360,7 @@ connect = 143</programlisting>
</listitem>
<listitem>
<para>
- <filename>/usr/share/doc/spamassassin/</filename> — Contains a large amount of information pertaining to SpamAssassin.</para>
+ <filename class="directory">/usr/share/doc/spamassassin/</filename> — Contains a large amount of information pertaining to SpamAssassin.</para>
</listitem>
</itemizedlist>
</listitem>
More information about the docs-commits
mailing list