Date: Thu, 29 Aug 2013 20:01:38 +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: r42605 - head/en_US.ISO8859-1/books/handbook/basics Message-ID: <201308292001.r7TK1c5K060287@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Thu Aug 29 20:01:37 2013 New Revision: 42605 URL: http://svnweb.freebsd.org/changeset/doc/42605 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Thu Aug 29 19:06:59 2013 (r42604) +++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Thu Aug 29 20:01:37 2013 (r42605) @@ -93,8 +93,8 @@ <indexterm><primary>console</primary></indexterm> - <para>Unless &os; has been configured to automatically start - a graphical environment during startup, the system will boot + <para>Unless &os; has been configured to automatically start a + graphical environment during startup, the system will boot into a command line login prompt, as seen in this example:</para> @@ -102,10 +102,10 @@ login:</screen> - <para>The first line contains some information about the - system. The <literal>amd64</literal> indicates that the - system in this example is running a 64-bit version of &os;. - The hostname is <hostid>pc3.example.org</hostid>, and + <para>The first line contains some information about the system. + The <literal>amd64</literal> indicates that the system in this + example is running a 64-bit version of &os;. The hostname is + <hostid>pc3.example.org</hostid>, and <devicename>ttyv0</devicename> indicates that this is the system console.</para> @@ -116,10 +116,10 @@ login:</screen> <sect2 id="consoles-login"> <title>Logging into &os;</title> - <para>&os; is a multiuser, multiprocessing system. This is - the formal description that is usually given to a system that - can be used by many different people, who simultaneously run a - lot of programs on a single machine.</para> + <para>&os; is a multiuser, multiprocessing system. This is the + formal description that is usually given to a system that can + be used by many different people, who simultaneously run a lot + of programs on a single machine.</para> <para>Every multiuser system needs some way to distinguish one <quote>user</quote> from the rest. In &os; (and all the @@ -127,9 +127,8 @@ login:</screen> requiring that every user must <quote>log into</quote> the system before being able to run programs. Every user has a unique name (the <quote>username</quote>) and a personal, - secret key (the <quote>password</quote>). &os; will ask - for these two before allowing a user to run any - programs.</para> + secret key (the <quote>password</quote>). &os; will ask for + these two before allowing a user to run any programs.</para> <indexterm><primary>startup scripts</primary></indexterm> <para>When a &os; system boots, startup scripts are @@ -141,8 +140,8 @@ login:</screen> <screen>login:</screen> <para>Type the username that was configured during system - installation, as described in <xref - linkend="bsdinstall-addusers"/>, and press + installation, as described in + <xref linkend="bsdinstall-addusers"/>, and press <keycap>Enter</keycap>. Then enter the password associated with the username and press <keycap>Enter</keycap>. The password is <emphasis>not echoed</emphasis> for security @@ -270,8 +269,8 @@ console none <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen> - <para>The output of this command lists the video modes that - are supported by the hardware. To select a new video mode, + <para>The output of this command lists the video modes that are + supported by the hardware. To select a new video mode, specify the mode using &man.vidcontrol.1; as the <username>root</username> user:</para> @@ -290,9 +289,9 @@ console none <indexterm><primary>UNIX</primary></indexterm> - <para>&os;, being a direct descendant of BSD &unix;, is based - on several key &unix; concepts. The first and most pronounced - is that &os; is a multi-user operating system that can handle + <para>&os;, being a direct descendant of BSD &unix;, is based on + several key &unix; concepts. The first and most pronounced is + that &os; is a multi-user operating system that can handle several users working simultaneously on completely unrelated tasks. The system is responsible for properly sharing and managing requests for hardware devices, peripherals, memory, and @@ -300,12 +299,12 @@ console none <para>Much more information about user accounts is in the chapter about <link linkend="users">accounts</link>. It is important to - understand that each person (user) who uses the computer should be - given their own username and password. The system keeps track - of the people using the computer based on this username. Since - it is often the case that several people are working on the same - project &unix; also provides groups. Several users can be placed - in the same group.</para> + understand that each person (user) who uses the computer should + be given their own username and password. The system keeps + track of the people using the computer based on this username. + Since it is often the case that several people are working on + the same project &unix; also provides groups. Several users can + be placed in the same group.</para> <para>Because the system is capable of supporting multiple users, everything the system manages has a set of permissions governing @@ -317,9 +316,10 @@ console none <note> <para>This section will discuss the traditional &unix; - permissions. For finer grained file system access - control, see the <link linkend="fs-acl">File System - Access Control Lists</link> section.</para> + permissions. For finer grained file system access control, + see the + <link linkend="fs-acl">File System Access Control Lists</link> + section.</para> </note> <indexterm><primary>permissions</primary></indexterm> @@ -387,6 +387,7 @@ console none </tbody> </tgroup> </informaltable> + <indexterm> <primary>&man.ls.1;</primary> </indexterm> @@ -1022,9 +1023,9 @@ root 5211 0.0 0.2 3620 1724 2 class="directory">/var/</filename></entry> <entry>Multi-purpose log, temporary, transient, and spool files. A memory-based file system is sometimes - mounted at <filename - class="directory">/var</filename>. This can be - automated using the varmfs-related variables in + mounted at + <filename class="directory">/var</filename>. This can + be automated using the varmfs-related variables in &man.rc.conf.5; or with an entry in <filename>/etc/fstab</filename>; refer to &man.mdmfs.8; for details.</entry> @@ -1053,8 +1054,8 @@ root 5211 0.0 0.2 3620 1724 2 <entry><filename class="directory">/var/tmp/</filename></entry> <entry>Temporary files which are usually preserved - across a system reboot, unless <filename - class="directory">/var</filename> is a + across a system reboot, unless + <filename class="directory">/var</filename> is a memory-based file system.</entry> </row> @@ -1087,8 +1088,8 @@ root 5211 0.0 0.2 3620 1724 2 <para>Files and directories are referenced by giving the file or directory name, followed by a forward slash, <literal>/</literal>, followed by any other directory names that - are necessary. For example, if the directory <filename - class="directory">foo</filename> contains a directory + are necessary. For example, if the directory + <filename class="directory">foo</filename> contains a directory <filename class="directory">bar</filename> which contains the file <filename>readme.txt</filename>, the full name, or <firstterm>path</firstterm>, to the file is @@ -1103,11 +1104,12 @@ root 5211 0.0 0.2 3620 1724 2 file system contains exactly one directory at the very top level, called the <firstterm>root directory</firstterm> for that file system. This root directory can contain other directories. - One file system is designated the <firstterm>root file - system</firstterm> or <literal>/</literal>. Every other file - system is <firstterm>mounted</firstterm> under the root file - system. No matter how many disks are on the &os; system, every - directory appears to be part of the same disk.</para> + One file system is designated the + <firstterm>root file system</firstterm> or <literal>/</literal>. + Every other file system is <firstterm>mounted</firstterm> under + the root file system. No matter how many disks are on the &os; + system, every directory appears to be part of the same + disk.</para> <para>Consider three file systems, called <literal>A</literal>, <literal>B</literal>, and <literal>C</literal>. Each file @@ -1163,10 +1165,10 @@ root 5211 0.0 0.2 3620 1724 2 <para>Any files that are in the <literal>B1</literal> or <literal>B2</literal> directories can be reached with the path - <filename class="directory">/A1/B1</filename> or <filename - class="directory">/A1/B2</filename> as necessary. Any files - that were in <filename class="directory">/A1</filename> have - been temporarily hidden. They will reappear if + <filename class="directory">/A1/B1</filename> or + <filename class="directory">/A1/B2</filename> as necessary. Any + files that were in <filename class="directory">/A1</filename> + have been temporarily hidden. They will reappear if <literal>B</literal> is <firstterm>unmounted</firstterm> from <literal>A</literal>.</para> @@ -1193,8 +1195,9 @@ root 5211 0.0 0.2 3620 1724 2 </mediaobject> <para>and the paths would be - <filename class="directory">/A2/B1</filename> and <filename - class="directory">/A2/B2</filename> respectively.</para> + <filename class="directory">/A2/B1</filename> and + <filename class="directory">/A2/B2</filename> + respectively.</para> <para>File systems can be mounted on top of one another. Continuing the last example, the <literal>C</literal> file @@ -1262,9 +1265,9 @@ root 5211 0.0 0.2 3620 1724 2 <firstterm>mount options</firstterm>. For example, the root file system can be mounted read-only, making it impossible for users to inadvertently delete or edit a critical file. - Separating user-writable file systems, such as <filename - class="directory">/home</filename>, from other file - systems allows them to be mounted + Separating user-writable file systems, such as + <filename class="directory">/home</filename>, from other + file systems allows them to be mounted <firstterm>nosuid</firstterm>. This option prevents the <firstterm>suid</firstterm>/<firstterm>guid</firstterm> bits on executables stored on the file system from taking effect, @@ -1282,11 +1285,11 @@ root 5211 0.0 0.2 3620 1724 2 <listitem> <para>&os;'s file systems are robust if power is lost. - However, a power loss at a critical point could still - damage the structure of the file system. By splitting - data over multiple file systems it is more likely that the - system will still come up, making it easier to restore from - backup as necessary.</para> + However, a power loss at a critical point could still damage + the structure of the file system. By splitting data over + multiple file systems it is more likely that the system will + still come up, making it easier to restore from backup as + necessary.</para> </listitem> </itemizedlist> @@ -1302,9 +1305,9 @@ root 5211 0.0 0.2 3620 1724 2 restoring the backed up data.</para> <important> - <para>&os; features the &man.growfs.8; command, which - makes it possible to increase the size of file system on - the fly, removing this limitation.</para> + <para>&os; features the &man.growfs.8; command, which makes + it possible to increase the size of file system on the + fly, removing this limitation.</para> </important> </listitem> </itemizedlist> @@ -1319,8 +1322,8 @@ root 5211 0.0 0.2 3620 1724 2 point in the file system hierarchy, or the letter of the partition they are contained in.</para> - <para>&os; also uses disk space for <firstterm>swap - space</firstterm> to provide + <para>&os; also uses disk space for + <firstterm>swap space</firstterm> to provide <firstterm>virtual memory</firstterm>. This allows your computer to behave as though it has much more memory than it actually does. When &os; runs out of memory, it moves some of @@ -1360,8 +1363,7 @@ root 5211 0.0 0.2 3620 1724 2 This allows utilities that need to work on the entire slice, such as a bad block scanner, to work on the <literal>c</literal> partition. A file system would not - normally be - created on this partition.</entry> + normally be created on this partition.</entry> </row> <row> @@ -1377,8 +1379,8 @@ root 5211 0.0 0.2 3620 1724 2 <para>Disks in &os; are divided into slices, referred to in &windows; as partitions, which are numbered from 1 to 4. These - are then divided into partitions, which contain file - systems, and are labeled using letters.</para> + are then divided into partitions, which contain file systems, + and are labeled using letters.</para> <indexterm><primary>slices</primary></indexterm> <indexterm><primary>partitions</primary></indexterm> @@ -1401,21 +1403,22 @@ root 5211 0.0 0.2 3620 1724 2 letter is appended to the device name, so <quote>da0<emphasis>a</emphasis></quote> is the <literal>a</literal> partition on the first - <literal>da</literal> drive, which is <quote>dangerously - dedicated</quote>. <quote>ad1s3<emphasis>e</emphasis></quote> - is the fifth partition in the third slice of the second IDE - disk drive.</para> + <literal>da</literal> drive, which is + <quote>dangerously dedicated</quote>. + <quote>ad1s3<emphasis>e</emphasis></quote> is the fifth + partition in the third slice of the second IDE disk + drive.</para> <para>Finally, each disk on the system is identified. A disk name starts with a code that indicates the type of disk, and then a number, indicating which disk it is. Unlike slices, disk - numbering starts at 0. Common codes are listed in <xref - linkend="basics-dev-codes"/>.</para> + numbering starts at 0. Common codes are listed in + <xref linkend="basics-dev-codes"/>.</para> <para>When referring to a partition, include the disk name, <literal>s</literal>, the slice number, and then the partition - letter. Examples are shown in <xref - linkend="basics-disk-slice-part"/>.</para> + letter. Examples are shown in + <xref linkend="basics-disk-slice-part"/>.</para> <para><xref linkend="basics-concept-disk-model"/> shows a conceptual model of a disk layout.</para> @@ -1493,7 +1496,6 @@ root 5211 0.0 0.2 3620 1724 2 <row> <entry><literal>da1s2e</literal></entry> - <entry>The fifth partition (<literal>e</literal>) on the second slice (<literal>s2</literal>) on the second SCSI disk (<literal>da1</literal>).</entry> @@ -1511,15 +1513,15 @@ root 5211 0.0 0.2 3620 1724 2 size, and contains two 2 GB slices (&ms-dos; partitions). The first slice contains a &ms-dos; disk, <devicename>C:</devicename>, and the second slice contains a - &os; installation. This example &os; installation has - three data partitions, and a swap partition.</para> + &os; installation. This example &os; installation has three + data partitions, and a swap partition.</para> <para>The three partitions will each hold a file system. Partition <literal>a</literal> will be used for the root file - system, <literal>e</literal> for the <filename - class="directory">/var/</filename> directory hierarchy, and - <literal>f</literal> for the <filename - class="directory">/usr/</filename> directory + system, <literal>e</literal> for the + <filename class="directory">/var/</filename> directory + hierarchy, and <literal>f</literal> for the + <filename class="directory">/usr/</filename> directory hierarchy.</para> <mediaobject> @@ -1562,29 +1564,31 @@ root 5211 0.0 0.2 3620 1724 2 <sect1 id="mount-unmount"> <title>Mounting and Unmounting File Systems</title> - <para>The file system is best visualized as a tree, - rooted, as it were, at <filename class="directory">/</filename>. - <filename class="directory">/dev</filename>, <filename - class="directory">/usr</filename>, and the other directories - in the root directory are branches, which may have their own - branches, such as <filename - class="directory">/usr/local</filename>, and so on.</para> + <para>The file system is best visualized as a tree, rooted, as it + were, at <filename class="directory">/</filename>. + <filename class="directory">/dev</filename>, + <filename class="directory">/usr</filename>, and the other + directories in the root directory are branches, which may have + their own branches, such as + <filename class="directory">/usr/local</filename>, and so + on.</para> <indexterm><primary>root file system</primary></indexterm> <para>There are various reasons to house some of these - directories on separate file systems. <filename - class="directory">/var</filename> contains the directories - <filename class="directory">log/</filename>, + directories on separate file systems. + <filename class="directory">/var</filename> contains the + directories <filename class="directory">log/</filename>, <filename class="directory">spool/</filename>, and various types of temporary files, and as such, may get filled up. Filling up - the root file system is not a good idea, so splitting <filename - class="directory">/var</filename> from <filename - class="directory">/</filename> is often favorable.</para> + the root file system is not a good idea, so splitting + <filename class="directory">/var</filename> from + <filename class="directory">/</filename> is often + favorable.</para> <para>Another common reason to contain certain directory trees on other file systems is if they are to be housed on separate physical disks, or are separate virtual disks, such as Network - File System mounts, described in <xref linkend="network-nfs"/>, + File System mounts, described in <xref linkend="network-nfs"/>, or CDROM drives.</para> <sect2 id="disks-fstab"> @@ -1595,8 +1599,8 @@ root 5211 0.0 0.2 3620 1724 2 <secondary>mounted with fstab</secondary> </indexterm> - <para>During the boot process (<xref linkend="boot"/>), - file systems listed in <filename>/etc/fstab</filename> are + <para>During the boot process (<xref linkend="boot"/>), file + systems listed in <filename>/etc/fstab</filename> are automatically mounted except for the entries containing <option>noauto</option>. This file contains entries in the following format:</para> @@ -2128,8 +2132,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1 <filename>foo.bar</filename>, type <command>rm fo[<keycap>Tab</keycap>].[<keycap>Tab</keycap>]</command>.</para> - <para>The shell should print out <command>rm - foo[BEEP].bar</command>.</para> + <para>The shell should print out + <command>rm foo[BEEP].bar</command>.</para> <para>The [BEEP] is the console bell, which the shell used to indicate it was unable to complete the filename because there @@ -2252,10 +2256,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1 as special representations of data. The most common meta-character is <literal>*</literal>, which represents any number of characters in a filename. Meta-characters can be - used to perform filename globbing. For example, <command>echo - *</command> is equivalent to &man.ls.1; because the shell - takes all the files that match <literal>*</literal> and - &man.echo.1; lists them on the command line.</para> + used to perform filename globbing. For example, + <command>echo *</command> is equivalent to &man.ls.1; because + the shell takes all the files that match <literal>*</literal> + and &man.echo.1; lists them on the command line.</para> <para>To prevent the shell from interpreting a special character, escape it from the shell by starting it with a backslash @@ -2325,9 +2329,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1 <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to <keycombo action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>. - To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose - the <quote>leave editor</quote> option from the main menu. - The editor will prompt to save any changes if the file has been + To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose the + <quote>leave editor</quote> option from the main menu. The + editor will prompt to save any changes if the file has been modified.</para> <indexterm> @@ -2468,8 +2472,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1 keyword <quote>mail</quote> in their descriptions. This is equivalent to using &man.apropos.1;.</para> - <para>To determine what the commands in <filename - class="directory">/usr/bin</filename> do, + <para>To determine what the commands in + <filename class="directory">/usr/bin</filename> do, type:</para> <screen>&prompt.user; <userinput>cd /usr/bin</userinput> @@ -2493,9 +2497,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1 by the Free Software Foundation (FSF). In addition to manual pages, these programs may include hypertext documents called <literal>info</literal> files. These can be viewed using - &man.info.1; or, if <filename - role="package">editors/emacs</filename> is installed, the - info mode of <application>emacs</application>.</para> + &man.info.1; or, if + <filename role="package">editors/emacs</filename> is + installed, the info mode of + <application>emacs</application>.</para> <para>To use &man.info.1;, type:</para>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308292001.r7TK1c5K060287>