commit 0e73b68305d4b3587cf7eb14c12a1fae62be99ab
Author: Douglas Silas <dhensley(a)redhat.com>
Date: Fri Jun 25 15:52:36 2010 +0200
(multiple): Fix BZ#598800: Review feedback
en-US/Log_Files.xml | 6 +++---
en-US/Samba.xml | 2 +-
en-US/The_BIND_DNS_Server.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/en-US/Log_Files.xml b/en-US/Log_Files.xml
index 33de966..3ee944e 100644
--- a/en-US/Log_Files.xml
+++ b/en-US/Log_Files.xml
@@ -23,16 +23,16 @@
significance="normal">
<primary>log files</primary>
<secondary>
- <command>syslogd</command>
+ <command>rsyslod daemon</command>
</secondary>
</indexterm>
<indexterm
significance="normal">
<primary>
- <command>syslogd</command>
+ <command>rsyslog</command>
</primary>
</indexterm>
- <para>Some log files are controlled by a daemon called
<command>syslogd</command>. A list of log messages maintained by
<command>syslogd</command> can be found in the
<filename>/etc/syslog.conf</filename> configuration file.</para>
+ <para>Some log files are controlled by a daemon called
<command>rsyslog</command>. A list of log messages maintained by
<command>rsyslog</command> can be found in the
<filename>/etc/rsyslog.conf</filename> configuration file.</para>
<section
id="s1-logfiles-locating">
<title>Locating Log Files</title>
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 4fa157c..bfa2517 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -394,7 +394,7 @@
<itemizedlist>
<listitem>
<para>
- <guilabel>ADS</guilabel> — The Samba server acts as a
domain member in an Active Directory Domain (ADS) realm. For this option, Kerberos must be
installed and configured on the server, and Samba must become a member of the ADS realm
using the <command>net</command> utility, which is part of the
<filename>samba-client</filename> package. Refer to the
<command>net</command> man page for details. This option does not configure
Samba to be an ADS Controller. Specify the realm of the Kerberos server in the
<guilabel>Kerberos Realm</guilabel> field.</para>
+ <guilabel>ADS</guilabel> — The Samba server acts as a
domain member in an Active Directory Domain (ADS) realm. For this option, Kerberos must be
installed and configured on the server, and Samba must become a member of the ADS realm
using the <command>net</command> utility, which is part of the
<filename>samba-common</filename> package. Refer to the
<command>net</command> man page for details. This option does not configure
Samba to be an ADS Controller. Specify the realm of the Kerberos server in the
<guilabel>Kerberos Realm</guilabel> field.</para>
<note>
<title>Note</title>
<para>The <guilabel>Kerberos Realm</guilabel> field
must be supplied in all uppercase letters, such as
<command>EXAMPLE.COM</command>.</para>
diff --git a/en-US/The_BIND_DNS_Server.xml b/en-US/The_BIND_DNS_Server.xml
index cb4c346..2d36df2 100644
--- a/en-US/The_BIND_DNS_Server.xml
+++ b/en-US/The_BIND_DNS_Server.xml
@@ -251,7 +251,7 @@
<replaceable><statement-1></replaceable>
["<replaceable><statement-1-name></replaceable>"]
[<replaceable><statement-1-class></replaceable>] {
<replaceable><option-1></replaceable>;
<replaceable><option-2></replaceable>;
- <replaceable><option-N></replaceable>;
+ <replaceable><option-N></replaceable>;
};
<replaceable><statement-2></replaceable>
["<replaceable><statement-2-name></replaceable>"]
[<replaceable><statement-2-class></replaceable>] {
<replaceable><option-1></replaceable>;
@@ -565,7 +565,7 @@ server is a master server for the zone.</para>
<screen>zone
<replaceable><zone-name></replaceable>
<replaceable><zone-class></replaceable>
<replaceable><zone-options></replaceable>;
-[<replaceable><zone-options></replaceable>; ...]
+[<replaceable><zone-options></replaceable>; ...]
};</screen>
<para>In this statement,
<replaceable><zone-name></replaceable> is the name of the zone,
<replaceable><zone-class></replaceable> is the optional class of
the zone, and <replaceable><zone-options></replaceable> is a
list of options characterizing the zone.</para>
<para>The <replaceable><zone-name></replaceable>
attribute for the zone statement is particularly important. It is the default value
assigned for the <command>$ORIGIN</command> directive used within the
corresponding zone file located in the <filename>/var/named/</filename>
directory. The <command>named</command> daemon appends the name of the zone to
any non-fully qualified domain name listed in the zone file.</para>
@@ -792,7 +792,7 @@ masters { 192.168.0.1; };
</term>
<listitem>
<para>Allows for the use of multiple types of logs, called
<firstterm>channels</firstterm>. By using the
<command>channel</command> option within the
<command>logging</command> statement, a customized type of log can be
constructed — with its own file name (<command>file</command>), size limit
(<command>size</command>), versioning
(<command>version</command>), and level of importance
(<command>severity</command>). Once a customized channel <!-- RHEL5: has
been -->is defined, a <command>category</command> option is used to
categorize the channel and begin logging when <command>named</command> is
restarted.</para>
- <para>By default, <command>named</command> logs standard
messages to the <command>syslog</command> daemon, which places them in
<filename>/var/log/messages</filename>. This occurs because several standard
channels are built into BIND with various severity levels, such as
<command>default_syslog</command> (which handles informational logging
messages) and <command>default_debug</command> (which specifically handles
debugging messages). A default category, called <command>default</command>,
uses the built-in channels to do normal logging without any special
configuration.</para>
+ <para>By default, <command>named</command> logs standard
messages to the <command>rsyslog</command> daemon, which places them in
<filename>/var/log/messages</filename>. This occurs because several standard
channels are built into BIND with various severity levels, such as
<command>default_syslog</command> (which handles informational logging
messages) and <command>default_debug</command> (which specifically handles
debugging messages). A default category, called <command>default</command>,
uses the built-in channels to do normal logging without any special
configuration.</para>
<!-- RHEL5: ddomingo(a)redhat.com: above <para>replaces following:
<para>By default, <command>named</command> logs standard messages
to the <command>syslog</command> daemon, which places them in
<filename>/var/log/messages</filename>. This occurs because several standard
channels are built into BIND with various severity levels, such as one that handles
informational logging messages (<command>default_syslog</command>) and another
that specifically handles debugging messages
(<command>default_debug</command>). A default category, called
<command>default</command>, uses the built-in channels to do normal logging
without any special configuration.</para>
-->
Show replies by date