Date: Thu, 6 Feb 2014 10:14:05 +0000 (UTC) From: Taras Korenko <taras@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43800 - head/en_US.ISO8859-1/books/handbook/kernelconfig Message-ID: <201402061014.s16AE57L061705@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: taras Date: Thu Feb 6 10:14:05 2014 New Revision: 43800 URL: http://svnweb.freebsd.org/changeset/doc/43800 Log: This patch introduces minor rewordings and corrections to "Configuring the FreeBSD Kernel" chapter; those were discussed with pluknet and wblock in ML [1]. To be followed by whitespace fixes. 1. http://lists.freebsd.org/pipermail/freebsd-doc/2014-February/023240.html Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Thu Feb 6 09:38:01 2014 (r43799) +++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml Thu Feb 6 10:14:05 2014 (r43800) @@ -139,10 +139,10 @@ wireless Ethernet driver has the following information in its manual page:</para> - <programlisting>Alternatively, to load the driver as a module at boot time, place the + <screen>Alternatively, to load the driver as a module at boot time, place the following line in &man.loader.conf.5;: - if_ath_load="YES"</programlisting> + if_ath_load="YES"</screen> <para>Adding <literal>if_ath_load="YES"</literal> to <filename>/boot/loader.conf</filename> will load this @@ -188,10 +188,10 @@ following line in &man.loader.conf.5;: example, the following lines indicate that the &man.psm.4; driver found a mouse:</para> - <programlisting>psm0: <PS/2 Mouse> irq 12 on atkbdc0 + <screen>psm0: <PS/2 Mouse> irq 12 on atkbdc0 psm0: [GIANT-LOCKED] psm0: [ITHREAD] -psm0: model Generic PS/2 mouse, device ID 0</programlisting> +psm0: model Generic PS/2 mouse, device ID 0</screen> <para>Since this hardware exists, this driver should not be removed from a custom kernel configuration file.</para> @@ -204,12 +204,12 @@ psm0: model Generic PS/2 mouse, device I &man.pciconf.8;, which provides more verbose output. For example:</para> - <programlisting><command>pciconf -lv</command> - ath0@pci0:3:0:0: class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00 + <screen>&prompt.user; pciconf -lv +ath0@pci0:3:0:0: class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00 vendor = 'Atheros Communications Inc.' device = 'AR5212 Atheros AR5212 802.11abg wireless' class = network - subclass = ethernet</programlisting> + subclass = ethernet</screen> <para>This output shows that the <filename>ath</filename> driver located a wireless Ethernet @@ -226,8 +226,7 @@ psm0: model Generic PS/2 mouse, device I ath_hal(4) - Atheros Hardware Access Layer (HAL)</programlisting> <para>Once the hardware inventory list is created, refer to it - to ensure that installed hardware is not removed as you edit the custom - kernel configuration file.</para> + to ensure that drivers for installed hardware are not removed as the custom kernel configuration is edited.</para> </sect1> <sect1 xml:id="kernelconfig-config"> @@ -250,11 +249,7 @@ ath_hal(4) - Atheros Hardw <para>If <filename>/usr/src/</filename> does not exist or it is empty, source has not been installed. Source can be installed using - <application>svn</application>, which is described in <xref linkend="svn"/>, or by installing the - <literal>src</literal> distribution using &man.sysinstall.8;. This - distribution can be selected by navigating to the - <literal>Configuration</literal> and then to the - <literal>Distributions</literal> menu within &man.sysinstall.8;.</para> + <application>Subversion</application>, which is described in <xref linkend="svn"/>.</para> <para>Once source is installed, review the contents of <filename>/usr/src/sys</filename>. This directory contains a number of subdirectories, including those which represent the following @@ -350,7 +345,7 @@ options IPDIVERT</programlisting <note> <para>To build a file which contains all available options, run the following command as <systemitem class="username">root</systemitem>:</para> - <screen>&prompt.root; <userinput>cd /usr/src/sys/i386/conf && make LINT</userinput></screen> + <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>arch</replaceable>/conf && make LINT</userinput></screen> </note> @@ -521,10 +516,11 @@ options NFS_ROOT # NFS <programlisting>options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI</programlisting> <para>This causes the kernel to pause for 5 seconds before probing - each SCSI device in the system. If the system only has IDE hard - drives, ignore this or lower the number to speed up booting. - However, if &os; has trouble recognizing the SCSI devices, the - number will have to be raised again.</para> + each <acronym>SCSI</acronym> device in the system. If + <acronym>SCSI</acronym> drives are not recognized, increase the + number. If the system does not have any <acronym>SCSI</acronym> + drives, this value can be ignored or decreased to speed up + booting.</para> <programlisting>options KTRACE # ktrace(1) support</programlisting> @@ -577,7 +573,7 @@ options NFS_ROOT # NFS processors.</para> <note> - <para>This device exists only on the i386 architecture and this + <para>This device exists only on the &i386; architecture and this configuration line should not be used on other architectures.</para> </note> @@ -743,8 +739,7 @@ device atkbdc # AT keyboard <para>The &man.vga.4; video card driver.</para> - <programlisting> -device splash # Splash screen and screen saver support</programlisting> + <programlisting>device splash # Splash screen and screen saver support</programlisting> <para>Required by the boot splash screen and screen savers.</para> @@ -926,7 +921,7 @@ device xe # Xircom pcca #device le</programlisting> <para>ISA Ethernet drivers. See - <filename>/usr/src/sys/i386/conf/NOTES</filename> + <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename> for details of which cards are supported by which driver.</para> <programlisting># Wireless NIC cards @@ -1065,7 +1060,7 @@ device fwe # Ethernet <para>For more information and additional devices supported by &os;, see - <filename>/usr/src/sys/i386/conf/NOTES</filename>.</para> + <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>.</para> <sect2> <title>Large Memory Configurations
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402061014.s16AE57L061705>