Date: Wed, 31 Oct 2012 02:41:03 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39872 - head/en_US.ISO8859-1/books/handbook/config Message-ID: <201210310241.q9V2f3rx030600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Wed Oct 31 02:41:03 2012 New Revision: 39872 URL: http://svn.freebsd.org/changeset/doc/39872 Log: Remove redundant words, fix title capitalization. Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/config/chapter.xml Wed Oct 31 02:19:12 2012 (r39871) +++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml Wed Oct 31 02:41:03 2012 (r39872) @@ -256,8 +256,8 @@ implies this; it is configuration information for the <filename>rc*</filename> files.</para> - <para>An administrator should make entries in the - <filename>rc.conf</filename> file to override the default + <para>An administrator should make entries in + <filename>rc.conf</filename> to override the default settings from <filename>/etc/defaults/rc.conf</filename>. The defaults file should not be copied verbatim to <filename class="directory">/etc</filename> - it contains @@ -269,8 +269,8 @@ applications to separate site-wide configuration from system-specific configuration in order to keep administration overhead down. The recommended approach is to place - system-specific configuration into the - <filename>/etc/rc.conf.local</filename> file. For + system-specific configuration into + <filename>/etc/rc.conf.local</filename>. For example:</para> <itemizedlist> @@ -292,14 +292,14 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program </listitem> </itemizedlist> - <para>The <filename>rc.conf</filename> file can then be + <para><filename>rc.conf</filename>can then be distributed to every system using <command>rsync</command> or a - similar program, while the <filename>rc.conf.local</filename> - file remains unique.</para> + similar program, while <filename>rc.conf.local</filename> + remains unique.</para> <para>Upgrading the system using &man.sysinstall.8; or - <command>make world</command> will not overwrite the - <filename>rc.conf</filename> file, so system configuration + <command>make world</command> will not overwrite + <filename>rc.conf</filename>, so system configuration information will not be lost.</para> <tip> @@ -349,8 +349,8 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program -rw-r--r-- 1 root wheel 7980 May 20 1998 srm.conf -rw-r--r-- 1 root wheel 7933 May 20 1998 srm.conf.default</literallayout> - <para>The file sizes show that only the - <filename>srm.conf</filename> file has been changed. A later + <para>The file sizes show that only + <filename>srm.conf</filename> has been changed. A later update of the <application>Apache</application> port would not overwrite this changed file.</para> </sect1> @@ -439,8 +439,7 @@ run_rc_command "$1"</programlisting> command line arguments, inclusion of the default functions provided in <filename>/etc/rc.subr</filename>, compatibility with the &man.rcorder.8; utility and provides for easier - configuration via the <filename>rc.conf</filename> - file.</para> + configuration via <filename>rc.conf</filename>.</para> </sect2> <sect2> @@ -450,7 +449,7 @@ run_rc_command "$1"</programlisting> daemons, <acronym>IMAP</acronym>, etc. could be started using &man.inetd.8;. This involves installing the service utility from the Ports Collection with a configuration line added to - the <filename>/etc/inetd.conf</filename> file, or by + <filename>/etc/inetd.conf</filename>, or by uncommenting one of the current configuration lines. Working with <application>inetd</application> and its configuration is described in depth in the @@ -521,8 +520,8 @@ run_rc_command "$1"</programlisting> <username>root</username>.</para> </note> - <para>Let us take a look at the <filename>/etc/crontab</filename> - file (the system crontab):</para> + <para>Let us take a look at <filename>/etc/crontab</filename> + (the system crontab):</para> <programlisting># /etc/crontab - root's crontab for &os; # @@ -593,11 +592,11 @@ HOME=/var/log These <literal>*</literal> characters mean <quote>first-last</quote>, and can be interpreted as <emphasis>every</emphasis> time. So, judging by this line, - it is apparent that the <command>atrun</command> command is + it is apparent that <command>atrun</command> is to be invoked by <username>root</username> every five minutes regardless of what day or month it is. For more - information on the <command>atrun</command> command, see the - &man.atrun.8; manual page.</para> + information on <command>atrun</command>, see + &man.atrun.8;.</para> <para>Commands can have any number of flags passed to them; however, commands which extend to multiple lines need to be @@ -610,7 +609,7 @@ HOME=/var/log <filename>crontab</filename> file, although there is one thing different about this one. Field number six, where we specified the username, only exists in the system - <filename>/etc/crontab</filename> file. This field should be + <filename>/etc/crontab</filename>. This field should be omitted for individual user <filename>crontab</filename> files.</para> @@ -728,7 +727,7 @@ $sshd_enable=YES</screen> <note> <para>The second line (<literal># sshd</literal>) is the output - from the <command>sshd</command> command, not a + from <command>sshd</command>, not a <username>root</username> console.</para> </note> @@ -1275,7 +1274,7 @@ round-trip min/avg/max/stddev = 0.700/0. <para>You could also use the machine name instead of <hostid role="ipaddr">192.168.1.2</hostid> if you have set - up the <filename>/etc/hosts</filename> file.</para> + up <filename>/etc/hosts</filename>.</para> </sect3> <sect3> @@ -1427,7 +1426,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n </authorgroup> </sect1info> - <title>Configuring the system logger + <title>Configuring the System Logger, <application>syslogd</application></title> <indexterm><primary>system logging</primary></indexterm> @@ -1607,7 +1606,7 @@ cron.* </sect2> <sect2> - <title>Log management and rotation with + <title>Log Management and Rotation with <application>newsyslog</application></title> <indexterm><primary>newsyslog</primary></indexterm> @@ -1983,10 +1982,10 @@ kern.maxfiles: 2088 -> 5000</screen> numbers, or booleans (a boolean being <literal>1</literal> for yes or a <literal>0</literal> for no).</para> - <para>If you want to set automatically some variables each time - the machine boots, add them to the - <filename>/etc/sysctl.conf</filename> file. For more - information see the &man.sysctl.conf.5; manual page and the + <para>If you want to automatically set some variables each time + the machine boots, add them to + <filename>/etc/sysctl.conf</filename>. For more + information see the &man.sysctl.conf.5; manual page and <xref linkend="configtuning-sysctlconf"/>.</para> <sect2 id="sysctl-readonly"> @@ -2018,8 +2017,8 @@ device_probe_and_attach: cbb0 attach ret only. To overcome these situations a user can put &man.sysctl.8; <quote>OIDs</quote> in their local <filename>/boot/loader.conf</filename>. Default settings are - located in the <filename>/boot/defaults/loader.conf</filename> - file.</para> + located in + <filename>/boot/defaults/loader.conf</filename>.</para> <para>Fixing the problem mentioned above would require a user to set <option>hw.pci.allow_unsupported_io_range=1</option> in @@ -2425,8 +2424,8 @@ device_probe_and_attach: cbb0 attach ret defaults by <varname>kern.maxusers</varname> may be individually overridden at boot-time or run-time in <filename>/boot/loader.conf</filename> (see the - &man.loader.conf.5; manual page or the - <filename>/boot/defaults/loader.conf</filename> file for + &man.loader.conf.5; manual page or + <filename>/boot/defaults/loader.conf</filename> for some hints) or as described elsewhere in this document.</para> @@ -2894,7 +2893,7 @@ kern.maxvnodes: 100000</screen> without doing a kernel rebuild. This has the advantage of making testing easier. Another reason is that starting <acronym>ACPI</acronym> after a system has been brought up - often doesn't work well. If you are experiencing problems, + often does not work well. If you are experiencing problems, you can disable <acronym>ACPI</acronym> altogether. This driver should not and can not be unloaded because the system bus uses it for various hardware interactions. @@ -3107,8 +3106,8 @@ kern.maxvnodes: 100000</screen> <para>In some cases, resuming from a suspend operation will cause the mouse to fail. A known work around is to add - <literal>hint.psm.0.flags="0x3000"</literal> to the - <filename>/boot/loader.conf</filename> file. If this does + <literal>hint.psm.0.flags="0x3000"</literal> to + <filename>/boot/loader.conf</filename>. If this does not work then please consider sending a bug report as described above.</para> </sect3>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210310241.q9V2f3rx030600>