[deployment-guide: 131/185] Corrected several typing errors.
Jaromir Hradilek
jhradile at fedoraproject.org
Sun May 15 21:22:13 UTC 2011
commit 378f0b9f4fa8801ca6aaad54db5df63e718586a7
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Fri Mar 18 16:14:28 2011 +0100
Corrected several typing errors.
en-US/BIND.xml | 2 +-
en-US/Configuring_Authentication.xml | 2 +-
en-US/DHCP_Servers.xml | 2 +-
en-US/Mail_Servers.xml | 6 +++---
en-US/Manually_Upgrading_the_Kernel.xml | 2 +-
en-US/NetworkManager.xml | 4 ++--
en-US/PackageKit.xml | 4 ++--
en-US/Preface.xml | 8 ++++----
en-US/RPM-Checking_Package_Signatures-Fedora.xml | 2 +-
en-US/RPM-Checking_Package_Signatures-RH.xml | 2 +-
en-US/SSSD.xml | 8 ++++----
en-US/Samba.xml | 8 ++++----
en-US/The_Apache_HTTP_Server.xml | 18 +++++++++---------
en-US/The_kdump_Crash_Recovery_Service.xml | 2 +-
en-US/The_proc_File_System.xml | 2 +-
en-US/The_sysconfig_Directory.xml | 4 ++--
en-US/Viewing_and_Managing_Log_Files.xml | 12 ++++++------
en-US/Yum.xml | 6 ++----
18 files changed, 46 insertions(+), 48 deletions(-)
---
diff --git a/en-US/BIND.xml b/en-US/BIND.xml
index dca773e..e7a4830 100644
--- a/en-US/BIND.xml
+++ b/en-US/BIND.xml
@@ -1542,7 +1542,7 @@ zone reload up-to-date</screen>
</para>
<screen>~]# <command>rndc reconfig</command></screen>
<note>
- <title>Note: Modyfying Zones with Dynamic DNS</title>
+ <title>Note: Modifying Zones with Dynamic DNS</title>
<para>
If you intend to manually modify a zone that uses Dynamic DNS (DDNS), make sure you run the <command>freeze</command> command first:
</para>
diff --git a/en-US/Configuring_Authentication.xml b/en-US/Configuring_Authentication.xml
index 29f0848..4690cf2 100644
--- a/en-US/Configuring_Authentication.xml
+++ b/en-US/Configuring_Authentication.xml
@@ -238,7 +238,7 @@
</listitem>
<listitem>
<para>
- <guilabel>Template Shell</guilabel> — When filling out the user information for a Windows NT user, the <command>winbindd</command> daemon uses the value chosen here to to specify the login shell for that user.</para>
+ <guilabel>Template Shell</guilabel> — When filling out the user information for a Windows NT user, the <command>winbindd</command> daemon uses the value chosen here to specify the login shell for that user.</para>
</listitem>
<listitem>
<para>
diff --git a/en-US/DHCP_Servers.xml b/en-US/DHCP_Servers.xml
index 87723dd..d93a72a 100644
--- a/en-US/DHCP_Servers.xml
+++ b/en-US/DHCP_Servers.xml
@@ -72,7 +72,7 @@
<primary>DHCP</primary>
<secondary>options</secondary>
</indexterm>
- <para>The parameters that start with the keyword option are reffered to as <firstterm>options</firstterm>. These options control DHCP options; whereas, parameters configure values that are not optional or control how the DHCP server behaves.</para>
+ <para>The parameters that start with the keyword option are referred to as <firstterm>options</firstterm>. These options control DHCP options; whereas, parameters configure values that are not optional or control how the DHCP server behaves.</para>
<indexterm
significance="normal">
<primary>DHCP</primary>
diff --git a/en-US/Mail_Servers.xml b/en-US/Mail_Servers.xml
index 175c623..d3271be 100644
--- a/en-US/Mail_Servers.xml
+++ b/en-US/Mail_Servers.xml
@@ -253,7 +253,7 @@
<command>~]# alternatives --config mta</command>
</screen>
<para>
- You can also use the following command to to enable/disable the desired service:
+ You can also use the following command to enable/disable the desired service:
</para>
<screen>~]# <command>chkconfig <replaceable><service></replaceable> <replaceable><on/off></replaceable></command>
</screen>
@@ -271,7 +271,7 @@
</indexterm>
<para>Originally developed at IBM by security expert and programmer Wietse Venema, Postfix is a Sendmail-compatible MTA that is designed to be secure, fast, and easy to configure.</para>
<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 change rooted 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>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>
@@ -1578,7 +1578,7 @@ connect = 143
</listitem>
<listitem>
<para>
- <citetitle>Sendmail</citetitle> by Bryan Costales with Eric Allman et al; O'Reilly & Associates — A good Sendmail reference written with the assistance of the original creator of Delivermail and Sendmail.</para>
+ <citetitle>Sendmail</citetitle> by Bryan Costales with Eric Allman et al.; O'Reilly & Associates — A good Sendmail reference written with the assistance of the original creator of Delivermail and Sendmail.</para>
</listitem>
<listitem>
<para>
diff --git a/en-US/Manually_Upgrading_the_Kernel.xml b/en-US/Manually_Upgrading_the_Kernel.xml
index 1907795..05e246c 100644
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@ -446,7 +446,7 @@ drwxr-xr-x 2 root root 0 May 3 22:34 etc/modprobe.d
<secondary>verifying</secondary>
<tertiary>IBM eServer System i</tertiary>
</indexterm>
- <para>On IBM eSeries System i machines, the initial RAM disk and kernel files are combined into a single file, which is created with the <command>addRamDisk</command> command. This step is performed automatically if the kernel and its associated packages are installed or upgraded from the RPM packages distributed by &OSORG;; thus, it does not need to be executed manually. To verify that it was created, use the command <command>ls -l /boot/</command> to make sure the <filename>/boot/vmlinitrd-<replaceable><kernel_version></replaceable>
+ <para>On IBM eServer System i machines, the initial RAM disk and kernel files are combined into a single file, which is created with the <command>addRamDisk</command> command. This step is performed automatically if the kernel and its associated packages are installed or upgraded from the RPM packages distributed by &OSORG;; thus, it does not need to be executed manually. To verify that it was created, use the command <command>ls -l /boot/</command> to make sure the <filename>/boot/vmlinitrd-<replaceable><kernel_version></replaceable>
</filename> file already exists (the <filename><replaceable><kernel_version></replaceable>
</filename> should match the version of the kernel just installed).</para>
</section>
diff --git a/en-US/NetworkManager.xml b/en-US/NetworkManager.xml
index 6a6e695..fd36450 100644
--- a/en-US/NetworkManager.xml
+++ b/en-US/NetworkManager.xml
@@ -461,7 +461,7 @@ NetworkManager (pid 1527) is running...
<guilabel>MAC address</guilabel>
</term>
<listitem>
- <para>Like an ethernet Network Interface Card (NIC), a wireless adapter has a unique MAC address (Media Access Control; also known as a <firstterm>hardware address</firstterm>) that identifies it to the system. Running the <command>ip addr</command> command will show the MAC address associated with each interface. For example, in the following <command>ip addr</command> output, the MAC address for the <computeroutput>wlan0</computeroutput> interface (which is <computeroutput>00:1c:bf:02:f8:70</computeroutput>) immediately follows the <computeroutput>link/ether</computeroutput> keyword:</para>
+ <para>Like an Ethernet Network Interface Card (NIC), a wireless adapter has a unique MAC address (Media Access Control; also known as a <firstterm>hardware address</firstterm>) that identifies it to the system. Running the <command>ip addr</command> command will show the MAC address associated with each interface. For example, in the following <command>ip addr</command> output, the MAC address for the <computeroutput>wlan0</computeroutput> interface (which is <computeroutput>00:1c:bf:02:f8:70</computeroutput>) immediately follows the <computeroutput>link/ether</computeroutput> keyword:</para>
<screen>~]# <command>ip addr</command>
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue state UNKNOWN
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
@@ -957,7 +957,7 @@ NetworkManager (pid 1527) is running...
id="sec-Configuring_802.1x_Security">
<title>Configuring 802.1x Security</title>
<para>802.1x security is the name of the IEEE standard for port-based Network Access Control (PNAC). Simply put, 802.1x security is a way of defining a <firstterm>logical network</firstterm> out of a physical one. All clients who want to join the logical network must authenticate with the server (a router, for example) using the correct 802.1x authentication method.</para>
- <para>802.1x security is most often associated with securing wireless networks (WLANs), but can also be used to prevent intruders with physical access to the network (LAN) from gaining entry. In the past, DHCP servers were configured not to lease IP addresses to unauthorized users, but but for various reasons this practice is both impractical and insecure, and thus is no longer recommended. Instead, 802.1x security is used to ensure a logically-secure network through port-based authentication.</para>
+ <para>802.1x security is most often associated with securing wireless networks (WLANs), but can also be used to prevent intruders with physical access to the network (LAN) from gaining entry. In the past, DHCP servers were configured not to lease IP addresses to unauthorized users, but for various reasons this practice is both impractical and insecure, and thus is no longer recommended. Instead, 802.1x security is used to ensure a logically-secure network through port-based authentication.</para>
<para>802.1x provides a framework for WLAN and LAN access control and serves as an envelope for carrying one of the Extensible Authentication Protocol (EAP) types. An EAP type is a protocol that defines how WLAN security is achieved on the network.</para>
<para>You can configure 802.1x security for a wired or wireless connection type by opening the <guilabel>Network Connections</guilabel> window (refer to <xref
linkend="sec-Configuring_New_and_Editing_Existing_Connections"/>) and following the applicable procedure:</para>
diff --git a/en-US/PackageKit.xml b/en-US/PackageKit.xml
index fe9ba7c..512da49 100644
--- a/en-US/PackageKit.xml
+++ b/en-US/PackageKit.xml
@@ -505,7 +505,7 @@
format="PNG" />
</imageobject>
<textobject>
- <para>using PackageKit to install czech language support with PackageKit's add/remove software window</para>
+ <para>using PackageKit to install Czech language support with PackageKit's add/remove software window</para>
</textobject>
</mediaobject>
</figure>
@@ -666,7 +666,7 @@
communicates via the <application>DBus</application> system message bus with another back end, which utilizes <application>Yum</application>'s Python API to perform queries and make changes to the system. On Linux systems other than Red Hat and Fedora, <command>packagekitd</command> can communicate with other back ends that are able to utilize the native package manager for that system. This modular architecture provides the abstraction necessary for the graphical interfaces to work with many different package managers to perform essentially the same types of package management tasks. Learning how to use the <application>PackageKit</application> front ends means that you can use the same familiar graphical interface across many different Linux distributions, even when they utilize a native package manager other than <application>Yum</application>.</para>
<para>In addition, <application>PackageKit</application>'s separation of concerns provides reliability in that a crash of one of the GUI windows—or even the user's X Window session—will not affect any package management tasks being supervised by the <command>packagekitd</command> daemon, which runs outside of the user session.</para>
<para>All of the front end graphical applications discussed in this chapter are provided by the <filename>gnome-packagekit</filename> package instead of by <application>PackageKit</application> and its dependencies. Users working in a KDE environment may prefer to install the <filename>kpackagekit</filename> package, which provides a KDE interface for <application>PackageKit</application>.</para>
- <para>Finally, <application>PackageKit</application> also comes with a console-based frontend called <command>pkcon</command>.</para>
+ <para>Finally, <application>PackageKit</application> also comes with a console-based front end called <command>pkcon</command>.</para>
</section>
<section
id="ch-Graphical_Package_Management-sec-Additional_Resources">
diff --git a/en-US/Preface.xml b/en-US/Preface.xml
index 9aaf79b..b37fd40 100644
--- a/en-US/Preface.xml
+++ b/en-US/Preface.xml
@@ -55,7 +55,7 @@
This part covers basic system administration tasks such as keyboard configuration, date and time configuration, and managing users and groups.
</para>
<para>
- <xref linkend="ch-Keyboard_Configuration" /> covers basic keyboard setup. Read this chapter if you need to to change the keyboard layout, add the <application>Keyboard Indicator</application> applet to the panel, or enforce a periodic typing brake.
+ <xref linkend="ch-Keyboard_Configuration" /> covers basic keyboard setup. Read this chapter if you need to change the keyboard layout, add the <application>Keyboard Indicator</application> applet to the panel, or enforce a periodic typing brake.
</para>
<para>
<xref linkend="ch-Date_and_Time_Configuration" /> covers the configuration of the system date and time. Read this chapter if you need to change the date and time setup, or configure the system to synchronize the clock with a remote Network Time Protocol (NTP) server.
@@ -172,7 +172,7 @@
<xref linkend="ch-Manually_Upgrading_the_Kernel" /> provides important information how to manually update a kernel package using the <command>rpm</command> command instead of <command>yum</command>. Read this chapter if you cannot update a kernel package with the <application>Yum</application> package manager.
</para>
<para>
- <xref linkend="ch-Working_with_Kernel_Modules" /> explains how to display, query, load, and unload kernel modules and their dependencies, and how to set module parameters. Additionally, it covers specific kernel module capabilities such as using multiple Ethernet cards and using channel bonding. Read this chapter if you need to work wiht kernel modules.
+ <xref linkend="ch-Working_with_Kernel_Modules" /> explains how to display, query, load, and unload kernel modules and their dependencies, and how to set module parameters. Additionally, it covers specific kernel module capabilities such as using multiple Ethernet cards and using channel bonding. Read this chapter if you need to work with kernel modules.
</para>
<para>
<xref linkend="ch-kdump" /> explains how to configure, test, and use the <systemitem class="service">kdump</systemitem> service in &MAJOROS;, and provides a brief overview of how to analyze the resulting core dump using the <application>crash</application> debugging utility. Read this chapter to learn how to enable <systemitem class="service">kdump</systemitem> on your system.
@@ -219,8 +219,8 @@
<xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</xi:fallback>
</xi:include>
- <section id="pref-Acknowledgements">
- <title>Acknowledgements</title>
+ <section id="pref-Acknowledgments">
+ <title>Acknowledgments</title>
<para>
Certain portions of this text first appeared in the <citetitle>Deployment Guide</citetitle>, copyright © 2007 Red Hat, Inc., available at <ulink url="http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5/html/Deployment_Guide/index.html" />.
</para>
diff --git a/en-US/RPM-Checking_Package_Signatures-Fedora.xml b/en-US/RPM-Checking_Package_Signatures-Fedora.xml
index 75b760c..78e0382 100644
--- a/en-US/RPM-Checking_Package_Signatures-Fedora.xml
+++ b/en-US/RPM-Checking_Package_Signatures-Fedora.xml
@@ -55,7 +55,7 @@
<section
id="s2-keys-checking">
<title>Verifying Signature of Packages</title>
- <para>To check the GnuPG signature of an RPM file after importing the builder's GnuPG key, use the following command (replace <replaceable><rpm_file></replaceable> with the filename of the RPM package):</para>
+ <para>To check the GnuPG signature of an RPM file after importing the builder's GnuPG key, use the following command (replace <replaceable><rpm_file></replaceable> with the file name of the RPM package):</para>
<screen>
<command>rpm -K <replaceable><rpm_file></replaceable>
</command>
diff --git a/en-US/RPM-Checking_Package_Signatures-RH.xml b/en-US/RPM-Checking_Package_Signatures-RH.xml
index deb058b..cde4d61 100644
--- a/en-US/RPM-Checking_Package_Signatures-RH.xml
+++ b/en-US/RPM-Checking_Package_Signatures-RH.xml
@@ -56,7 +56,7 @@
<section
id="s2-keys-checking">
<title>Verifying Signature of Packages</title>
- <para>To check the GnuPG signature of an RPM file after importing the builder's GnuPG key, use the following command (replace <replaceable><rpm-file></replaceable> with the filename of the RPM package):</para>
+ <para>To check the GnuPG signature of an RPM file after importing the builder's GnuPG key, use the following command (replace <replaceable><rpm-file></replaceable> with the file name of the RPM package):</para>
<screen>
<command>rpm -K <replaceable><rpm-file></replaceable>
</command>
diff --git a/en-US/SSSD.xml b/en-US/SSSD.xml
index 4076428..d9e26de 100644
--- a/en-US/SSSD.xml
+++ b/en-US/SSSD.xml
@@ -741,7 +741,7 @@ krb5_realm = EXAMPLE.COM</screen>
</option>
</para>
<para>Specifies the timeout in seconds for this particular domain.</para>
- <para>This is used to ensure that the backend process is alive and capable of answering requests. The default value for this parameter is <literal>10</literal> seconds. Raising this timeout might prove useful for slower back ends, such as distant LDAP servers.</para>
+ <para>This is used to ensure that the back end process is alive and capable of answering requests. The default value for this parameter is <literal>10</literal> seconds. Raising this timeout might prove useful for slower back ends, such as distant LDAP servers.</para>
<note>
<para>If you set <option>timeout = 0</option>, SSSD reverts to the default value; you cannot force a timeout value of zero, because this would force the <systemitem class="daemon">sssd</systemitem> daemon into a loop.</para>
</note>
@@ -1052,7 +1052,7 @@ uid=500(f12server) gid=500(f12server) groups=500(f12server),510(f12tester)
<itemizedlist>
<listitem>
<para>
- <option>ldap_search_timeout (integer)</option> — Specifies the timeout (in seconds) that <acronym>LDAP</acronym> searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered). If not specified:
+ <option>ldap_search_timeout (integer)</option> — Specifies the timeout (in seconds) that <acronym>LDAP</acronym> searches are allowed to run before they are canceled and cached results are returned (and offline mode is entered). If not specified:
</para>
<para>
Defaults to five when <option>enumerate</option> = <literal>False</literal>
@@ -1220,7 +1220,7 @@ ldap_group_object_class = group</screen>
If the UPN is not available in the identity back end, SSSD will construct a UPN using the format <systemitem class="username">username at krb5_realm</systemitem>.
</para>
<para>
- SSSD assumes that the Kerberos KDC is also a Kerberos kadmin server. However, it is very common for production environments to have multiple, read-only replicas of the KDC, but only a single kadmin server (because password changes and similar procedures are comparitively rare). To manage this type of configuration, you can use the <option>krb5_kpasswd</option> option to specify where your password changing service is running, or if it is running on a non-default port. If the <option>krb5_kpasswd</option> option is not defined, SSSD tries to use the Kerberos KDC in order to change the password. Refer to the <citetitle>sssd-krb5(5)</citetitle> manual page for more information about this and all Kerberos configuration options.
+ SSSD assumes that the Kerberos KDC is also a Kerberos kadmin server. However, it is very common for production environments to have multiple, read-only replicas of the KDC, but only a single kadmin server (because password changes and similar procedures are comparatively rare). To manage this type of configuration, you can use the <option>krb5_kpasswd</option> option to specify where your password changing service is running, or if it is running on a non-default port. If the <option>krb5_kpasswd</option> option is not defined, SSSD tries to use the Kerberos KDC in order to change the password. Refer to the <citetitle>sssd-krb5(5)</citetitle> manual page for more information about this and all Kerberos configuration options.
</para>
<formalpara id="form-SSSD_User_Guide-Setting_Up_Kerberos_Authentication-How_to_Set_up_Kerberos_Authentication">
@@ -1257,7 +1257,7 @@ krb5_auth_timeout = 15
<section id="sect-setting-up-sasl-gssapi-authentication">
<title>Setting up SASL/GSSAPI Authentication</title>
<para>
- <firstterm>GSSAPI</firstterm> (Generic Security Services Application Programming Interface) is a supported <firstterm>SASL</firstterm> (Simple Authentication and Security Layer) authentication method. Kerberos is currently the only commonly used GSSAPI implementation. An LDAP client and an LDAP server use SASL to take advantage of GSSAPI as the authentication method (an alternative to plain text passwords, etc.). The GSSAPI plugin for SASL is then invoked on the client and server side to use Kerberos to communicate.
+ <firstterm>GSSAPI</firstterm> (Generic Security Services Application Programming Interface) is a supported <firstterm>SASL</firstterm> (Simple Authentication and Security Layer) authentication method. Kerberos is currently the only commonly used GSSAPI implementation. An LDAP client and an LDAP server use SASL to take advantage of GSSAPI as the authentication method (an alternative to plain text passwords, etc.). The GSSAPI plug-in for SASL is then invoked on the client and server side to use Kerberos to communicate.
</para>
<para>
Using GSSAPI protected communication for LDAP is an advanced configuration not supported by the Authentication Configuration tool; the following steps show how to manually configure it.
diff --git a/en-US/Samba.xml b/en-US/Samba.xml
index 0e42b2f..6c9ea4d 100644
--- a/en-US/Samba.xml
+++ b/en-US/Samba.xml
@@ -305,9 +305,9 @@
For more information about mounting a samba share, refer to <command>man mount.cifs</command>.
</para>
<warning>
- <title>CIFS servers that require plaintext passwords</title>
+ <title>CIFS servers that require plain text passwords</title>
<para>
- Some CIFS servers require plaintext passwords for authentication. Support for plaintext password authentication can be enabled using the following command:
+ Some CIFS servers require plain text passwords for authentication. Support for plain text password authentication can be enabled using the following command:
</para>
<screen>~]# echo 0x37 > /proc/fs/cifs/SecurityFlags</screen>
<para>
@@ -1069,7 +1069,7 @@ Provide the password here.
<note>
<title>Note</title>
<para>
- If you need more than one domain controller or have more than 250 users, do <emphasis>not</emphasis> use a <command>tdbsam</command> authentication backend. LDAP is recommended in these cases.
+ If you need more than one domain controller or have more than 250 users, do <emphasis>not</emphasis> use a <command>tdbsam</command> authentication back end. LDAP is recommended in these cases.
</para>
</note>
</section>
@@ -1426,7 +1426,7 @@ security = share
</term>
<listitem>
<para>The <command>ldapsam</command> back end provides an optimal distributed account installation method for Samba. LDAP is optimal because of its ability to replicate its database to any number of servers such as the <application>Red Hat Directory Server</application> or an <application>OpenLDAP Server</application>. LDAP databases are light-weight and scalable, and as such are preferred by large enterprises. Installation and configuration of directory servers is beyond the scope of this chapter. For more information on the <application>Red Hat Directory Server</application>, refer to the <citetitle>Red Hat Directory Server 8.2 Deployment Guide</citetitle><!-- TBD6: link to the Red Hat Directory Server 8.2 DG -->. For more information on LDAP, refer to <xref linkend="s1-OpenLDAP" />.</para>
- <para>If you are upgrading from a previous version of Samba to 3.0, note that the OpenLdap schema file (<filename>/usr/share/doc/samba-<replaceable><version></replaceable>/LDAP/samba.schema</filename>) and the Red Hat Directory Server schema file (<filename>/usr/share/doc/samba-<replaceable><version></replaceable>/LDAP/samba-schema-FDS.ldif</filename>) have changed. These files contain the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> back end needs in order to function properly.</para>
+ <para>If you are upgrading from a previous version of Samba to 3.0, note that the OpenLDAP schema file (<filename>/usr/share/doc/samba-<replaceable><version></replaceable>/LDAP/samba.schema</filename>) and the Red Hat Directory Server schema file (<filename>/usr/share/doc/samba-<replaceable><version></replaceable>/LDAP/samba-schema-FDS.ldif</filename>) have changed. These files contain the <firstterm>attribute syntax definitions</firstterm> and <firstterm>objectclass definitions</firstterm> that the <command>ldapsam</command> back end needs in order to function properly.</para>
<para>As such, if you are using the <command>ldapsam</command> back end for your Samba server, you will need to configure <command>slapd</command> to include one of these schema file. Refer to <xref
linkend="s3-ldap-configuration-schema"/> for directions on how to do this.</para>
<note>
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 7b61329..f92f661 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -414,7 +414,7 @@ Syntax OK</screen>
…
</IfModule></screen>
<para>
- The <replaceable>module</replaceable> can be identified either by its name, or by the filename. If the optional exclamation mark (that is, <literal>!</literal>) is present, the enclosed directives are used only when the module is <emphasis>not</emphasis> loaded.
+ The <replaceable>module</replaceable> can be identified either by its name, or by the file name. If the optional exclamation mark (that is, <literal>!</literal>) is present, the enclosed directives are used only when the module is <emphasis>not</emphasis> loaded.
</para>
<example id="example-apache-httpdconf-ifmodule">
<title>Using the <option><IfModule></option> directive</title>
@@ -641,7 +641,7 @@ Syntax OK</screen>
</para>
<screen>AddDescription "<replaceable>description</replaceable>" <replaceable>filename</replaceable>…</screen>
<para>
- The <replaceable>description</replaceable> should be a short text enclosed in double quotes (that is, <literal>"</literal>). The <replaceable>filename</replaceable> can be a full filename, a file extension, or a wildcard expression.
+ The <replaceable>description</replaceable> should be a short text enclosed in double quotes (that is, <literal>"</literal>). The <replaceable>filename</replaceable> can be a full file name, a file extension, or a wildcard expression.
</para>
<example id="example-apache-httpdconf-adddescription">
<title>Using the <option>AddDescription</option> directive</title>
@@ -667,7 +667,7 @@ Syntax OK</screen>
The <replaceable>encoding</replaceable> has to be a valid MIME encoding such as <literal>x-compress</literal>, <literal>x-gzip</literal>, etc. The <replaceable>extension</replaceable> is a case sensitive file extension, and is conventionally written with a leading dot (for example, <literal>.gz</literal>).
</para>
<para>
- This directive is typically used to instruct web browsers to uncompress certain file types as they are downloaded.
+ This directive is typically used to instruct web browsers to decompress certain file types as they are downloaded.
</para>
<example id="example-apache-httpdconf-addencoding">
<title>Using the <option>AddEncoding</option> directive</title>
@@ -716,7 +716,7 @@ Syntax OK</screen>
</para>
<screen>AddIcon <replaceable>path</replaceable> <replaceable>pattern</replaceable>…</screen>
<para>
- The <replaceable>path</replaceable> refers to an existing icon file, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/icons/folder.png</literal>). The <replaceable>pattern</replaceable> can be a filename, a file extension, a wildcard expression, or a special form as described in the following table:
+ The <replaceable>path</replaceable> refers to an existing icon file, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/icons/folder.png</literal>). The <replaceable>pattern</replaceable> can be a file name, a file extension, a wildcard expression, or a special form as described in the following table:
</para>
<table id="table-apache-httpdconf-addicon">
<title>Available <option>AddIcon</option> options</title>
@@ -1301,7 +1301,7 @@ Syntax OK</screen>
</term>
<listitem>
<para>
- The <option>CustomLog</option> directive allows you to specify the log filename and the log file format. It takes the following form:
+ The <option>CustomLog</option> directive allows you to specify the log file name and the log file format. It takes the following form:
</para>
<screen>CustomLog <replaceable>path</replaceable> <replaceable>format</replaceable></screen>
<indexterm>
@@ -1705,11 +1705,11 @@ ErrorDocument 404 /404-not_found.html</screen>
</term>
<listitem>
<para>
- The <option>IndexIgnore</option> directive allows you to specify a list of filenames to be omitted from the server-generated directory listings. It takes the following form:
+ The <option>IndexIgnore</option> directive allows you to specify a list of file names to be omitted from the server-generated directory listings. It takes the following form:
</para>
<screen>IndexIgnore <replaceable>filename</replaceable>…</screen>
<para>
- The <replaceable>filename</replaceable> option can be either a full filename, or a wildcard expression.
+ The <replaceable>filename</replaceable> option can be either a full file name, or a wildcard expression.
</para>
<example id="example-apache-httpdconf-indexignore">
<title>Using the <option>IndexIgnore</option> directive</title>
@@ -1843,7 +1843,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<option>NameWidth</option>=<replaceable>value</replaceable>
</entry>
<entry>
- Specifies the width of the filename column. The <replaceable>value</replaceable> can be either a number of characters, or an asterisk (that is, <literal>*</literal>) to adjust the width automatically.
+ Specifies the width of the file name column. The <replaceable>value</replaceable> can be either a number of characters, or an asterisk (that is, <literal>*</literal>) to adjust the width automatically.
</entry>
</row>
<row>
@@ -3672,7 +3672,7 @@ ErrorDocument 404 /404-not_found.html</screen>
To create a name-based virtual host, find the virtual host container provided in <filename>/etc/httpd/conf/httpd.conf</filename> as an example, remove the hash sign (that is, <literal>#</literal>) from the beginning of each line, and customize the options according to your requirements as shown in <xref linkend="example-apache-virtualhosts-config" />.
</para>
<example id="example-apache-virtualhosts-config">
- <title>Sampe virtual host configuration</title>
+ <title>Sample virtual host configuration</title>
<screen>NameVirtualHost penguin.example.com:80
<VirtualHost penguin.example.com:80>
diff --git a/en-US/The_kdump_Crash_Recovery_Service.xml b/en-US/The_kdump_Crash_Recovery_Service.xml
index 3ab186d..de0b2f2 100644
--- a/en-US/The_kdump_Crash_Recovery_Service.xml
+++ b/en-US/The_kdump_Crash_Recovery_Service.xml
@@ -223,7 +223,7 @@
Remote directories accessed using the <systemitem class="protocol">NFS</systemitem> or <systemitem class="protocol">SSH</systemitem> protocol over <systemitem class="protocol">IPv4</systemitem>.
</entry>
<entry>
- Remote directories on the <systemitem class="filesystem">rootfs</systemitem> filesystem accessed using the <systemitem class="protocol">NFS</systemitem> protocol.
+ Remote directories on the <systemitem class="filesystem">rootfs</systemitem> file system accessed using the <systemitem class="protocol">NFS</systemitem> protocol.
</entry>
</row>
<row>
diff --git a/en-US/The_proc_File_System.xml b/en-US/The_proc_File_System.xml
index 351662b..851d5f9 100644
--- a/en-US/The_proc_File_System.xml
+++ b/en-US/The_proc_File_System.xml
@@ -4986,7 +4986,7 @@ unknown /dev/vc/%d 4 1-63 console
</screen>
<para>
It is also possible to prioritize which processes get killed by adjusting the <filename>oom_killer</filename> score. In <filename
- class="directory">/proc/<replaceable>PID</replaceable>/</filename> there are two tools labelled <filename>oom_adj</filename> and <filename>oom_score</filename>. Valid scores for <filename>oom_adj</filename> are in the range -16 to +15. To see the current <filename>oom_killer</filename> score, view the <filename>oom_score</filename> for the process. <filename>oom_killer</filename> will kill processes with the highest scores first.
+ class="directory">/proc/<replaceable>PID</replaceable>/</filename> there are two tools labeled <filename>oom_adj</filename> and <filename>oom_score</filename>. Valid scores for <filename>oom_adj</filename> are in the range -16 to +15. To see the current <filename>oom_killer</filename> score, view the <filename>oom_score</filename> for the process. <filename>oom_killer</filename> will kill processes with the highest scores first.
</para>
<para>
This example adjusts the oom_score of a process with a <replaceable>PID</replaceable> of 12465 to make it less likely that <filename>oom_killer</filename> will kill it.
diff --git a/en-US/The_sysconfig_Directory.xml b/en-US/The_sysconfig_Directory.xml
index 6830a3c..c72c593 100644
--- a/en-US/The_sysconfig_Directory.xml
+++ b/en-US/The_sysconfig_Directory.xml
@@ -1142,7 +1142,7 @@
<listitem>
<para>
The name of a keytable file. The files that can be used as keytables start in the <filename
- class="directory">/lib/kbd/keymaps/i386/</filename> directory, and branch into different keyboard layouts from there, all labeled <filename><replaceable>value</replaceable>.kmap.gz</filename>. The first filename that matches the <option>KEYTABLE</option> setting is used. For example:
+ class="directory">/lib/kbd/keymaps/i386/</filename> directory, and branch into different keyboard layouts from there, all labeled <filename><replaceable>value</replaceable>.kmap.gz</filename>. The first file name that matches the <option>KEYTABLE</option> setting is used. For example:
</para>
<screen>KEYTABLE="us"</screen>
</listitem>
@@ -1358,7 +1358,7 @@
</term>
<listitem>
<para>
- The keytab filename. For example:
+ The keytab file name. For example:
</para>
<screen>KEYTAB_FILE="/etc/named.keytab"</screen>
</listitem>
diff --git a/en-US/Viewing_and_Managing_Log_Files.xml b/en-US/Viewing_and_Managing_Log_Files.xml
index 52bc370..971301c 100644
--- a/en-US/Viewing_and_Managing_Log_Files.xml
+++ b/en-US/Viewing_and_Managing_Log_Files.xml
@@ -490,7 +490,7 @@ $outchannel log_rotation,/var/log/test_log.log, 104857600, /home/joe/log_rotatio
<term>Executing a program</term>
<listitem>
<para>
- <application>rsyslog</application> lets you execute a program for selected syslog messages and uses the <systemitem>system()</systemitem> call to execute the program in shell. To specify a program to be executed, prefix it with a caret character (<literal>^</literal>). Consequently, specify a template that formats the received message and passes it to the specified executable as a one line parameter (for more information on templates, refer to <xref linkend="s3-templates"/>). In the following example, any syslog message with any priority is selected, formated with the <parameter>template</parameter> template and passed as a parameter to the <application>test-program</application> program, which is then executed with the provided parameter:
+ <application>rsyslog</application> lets you execute a program for selected syslog messages and uses the <systemitem>system()</systemitem> call to execute the program in shell. To specify a program to be executed, prefix it with a caret character (<literal>^</literal>). Consequently, specify a template that formats the received message and passes it to the specified executable as a one line parameter (for more information on templates, refer to <xref linkend="s3-templates"/>). In the following example, any syslog message with any priority is selected, formatted with the <parameter>template</parameter> template and passed as a parameter to the <application>test-program</application> program, which is then executed with the provided parameter:
</para>
<screen>*.* ^test-program;template</screen>
<warning>
@@ -514,7 +514,7 @@ $outchannel log_rotation,/var/log/test_log.log, 104857600, /home/joe/log_rotatio
<itemizedlist>
<listitem>
<para>
- The <replaceable><PLUGIN></replaceable> calls the specified plugin that handles the database writing (for example, the <systemitem>ommysql</systemitem> plugin).
+ The <replaceable><PLUGIN></replaceable> calls the specified plug-in that handles the database writing (for example, the <systemitem>ommysql</systemitem> plug-in).
</para>
</listitem>
<listitem>
@@ -601,7 +601,7 @@ kern.=crit joe
<section id="s3-templates">
<title>Templates</title>
<para>
- Any output that is generated by <application>rsyslog</application> can be modified and formated according to your needs through the use of templates. To create a template use the following syntax:
+ Any output that is generated by <application>rsyslog</application> can be modified and formatted according to your needs through the use of templates. To create a template use the following syntax:
</para>
<screen>$template <replaceable><TEMPLATE_NAME></replaceable>,"<replaceable>text %<PROPERTY>% more text</replaceable>", <optional><replaceable><OPTION></replaceable></optional></screen>
<para>
@@ -639,9 +639,9 @@ kern.=crit joe
</listitem>
</itemizedlist>
<section id="s4-generating-dynamic-fnames">
- <title>Generating dynamic filenames</title>
+ <title>Generating dynamic file names</title>
<para>
- Templates can be used to generate dynamic filenames. By specifying a property as a part of the file path, a new file will be created for each unique property. For example, use the <parameter>timegenerated</parameter> property to generate a unique file name for each syslog message:
+ Templates can be used to generate dynamic file names. By specifying a property as a part of the file path, a new file will be created for each unique property. For example, use the <parameter>timegenerated</parameter> property to generate a unique file name for each syslog message:
</para>
<screen>$template DynamicFile,"/var/log/test_logs/%timegenerated%-test.log"</screen>
<para>
@@ -1098,7 +1098,7 @@ compress
<title>Adding a Log File</title>
<para>To add a log file you wish to view in the list, select <menuchoice><guimenu>File</guimenu>
<guimenuitem>Open</guimenuitem>
- </menuchoice>. This will display the <guilabel>Open Log</guilabel> window where you can select the directory and filename of the log file you wish to view.<xref linkend="fig-redhat-logviewer-add"/> illustrates the <guimenu>Open Log</guimenu> window.</para>
+ </menuchoice>. This will display the <guilabel>Open Log</guilabel> window where you can select the directory and file name of the log file you wish to view.<xref linkend="fig-redhat-logviewer-add"/> illustrates the <guimenu>Open Log</guimenu> window.</para>
<figure id="fig-redhat-logviewer-add">
<title>Log File Viewer - Adding a Log File</title>
<mediaobject>
diff --git a/en-US/Yum.xml b/en-US/Yum.xml
index fb01e4e..265a1b1 100644
--- a/en-US/Yum.xml
+++ b/en-US/Yum.xml
@@ -798,8 +798,7 @@ installonly_limit=3
<important
id="important-Disabling_plugins_is_not_advised-main_options">
<title>Disabling plugins is not advised</title>
- <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem
- class="systemname">Red Hat Network</systemitem>, and the security plugin allows system administrators to easily update the system with (sometimes critical) security updates. Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
+ <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem class="systemname">RHN Classic</systemitem>, and <application>product-id</application> and <application>subscription-manager</application> plugins enable connecting to certificate-based <systemitem class="systemname">Content Delivery Network</systemitem> (<acronym>CDN</acronym>). Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
</important>
<para>
<constant>1</constant> — Enable all <application>Yum</application> plugins globally. With <literal>plugins=1</literal>, you can still disable a specific <application>Yum</application> plugin by setting <literal>enabled=0</literal> in that plugin's configuration file. Refer to <xref
@@ -1015,8 +1014,7 @@ Loaded plugins: product-id, refresh-packagekit, rhnplugin, subscription-manager
<important
id="important-Disabling_plugins_is_not_advised-plugins">
<title>Disabling plugins is not advised</title>
- <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem
- class="systemname">Red Hat Network</systemitem>, and the security plugin allows system administrators to easily update the system with (sometimes critical) security updates. Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
+ <para>Disabling all plugins is not advised because certain plugins provide important <command>Yum</command> services. In particular, <application>rhnplugin</application> enables connecting to <systemitem class="systemname">RHN Classic</systemitem>, and <application>product-id</application> and <application>subscription-manager</application> plugins enable connecting to certificate-based <systemitem class="systemname">Content Delivery Network</systemitem> (<acronym>CDN</acronym>). Disabling plugins globally is provided as a convenience option, and is generally only recommended when diagnosing a potential problem with <command>Yum</command>.</para>
</important>
<para>Every installed plugin has its own configuration file in the <filename>/etc/yum/pluginconf.d/</filename> directory. You can set plugin-specific options in these files. For example, here is the <application>security</application> plugin's <filename>security.conf</filename> configuration file:</para>
<example
More information about the docs-commits
mailing list