svn commit: r44608 - head/en_US.ISO8859-1/books/handbook/basics
Dru Lavigne
dru at FreeBSD.org
Fri Apr 18 19:59:57 UTC 2014
Author: dru
Date: Fri Apr 18 19:59:56 2014
New Revision: 44608
URL: http://svnweb.freebsd.org/changeset/doc/44608
Log:
White space fix only. Translators can ignore.
Sponsored by: iXsystems
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 Fri Apr 18 19:49:21 2014 (r44607)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Fri Apr 18 19:59:56 2014 (r44608)
@@ -534,11 +534,12 @@ console none
<para>The home directory is the full path to a directory
on the system. This is the user's starting directory
when the user logs in. A common convention is to put
- all user home directories under
- <filename class="directory"><replaceable>/home/username</replaceable></filename> or
- <filename class="directory"><replaceable>/usr/home/username</replaceable></filename>. Each user
- stores their personal files and subdirectories in
- their own home directory.</para>
+ all user home directories under <filename
+ class="directory"><replaceable>/home/username</replaceable></filename>
+ or <filename
+ class="directory"><replaceable>/usr/home/username</replaceable></filename>.
+ Each user stores their personal files and
+ subdirectories in their own home directory.</para>
</listitem>
</varlistentry>
@@ -918,11 +919,12 @@ Other information:</screen>
<note>
<para>The commands &man.chfn.1; and &man.chsh.1; are links
- to &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;,
- and &man.ypchsh.1;. Since <acronym>NIS</acronym> support
- is automatic, specifying the <literal>yp</literal> before
- the command is not necessary. How to configure NIS is
- covered in <xref linkend="network-servers"/>.</para>
+ to &man.chpass.1;, as are &man.ypchpass.1;,
+ &man.ypchfn.1;, and &man.ypchsh.1;. Since
+ <acronym>NIS</acronym> support is automatic, specifying
+ the <literal>yp</literal> before the command is not
+ necessary. How to configure NIS is covered in <xref
+ linkend="network-servers"/>.</para>
</note>
</sect3>
@@ -1043,13 +1045,13 @@ passwd: done</screen>
to a login class, <literal>default</literal> by default, and
each login class has a set of login capabilities associated
with it. A login capability is a
- <literal><replaceable>name</replaceable>=<replaceable>value</replaceable></literal> pair, where
- <replaceable>name</replaceable> is a well-known identifier and
- <replaceable>value</replaceable> is an arbitrary string which
- is processed accordingly depending on the
- <replaceable>name</replaceable>. Setting up login classes and
- capabilities is rather straightforward and is also described
- in &man.login.conf.5;.</para>
+ <literal><replaceable>name</replaceable>=<replaceable>value</replaceable></literal>
+ pair, where <replaceable>name</replaceable> is a well-known
+ identifier and <replaceable>value</replaceable> is an
+ arbitrary string which is processed accordingly depending on
+ the <replaceable>name</replaceable>. Setting up login classes
+ and capabilities is rather straightforward and is also
+ described in &man.login.conf.5;.</para>
<note>
<para>&os; does not normally read the configuration in
@@ -2094,14 +2096,17 @@ root 5211 0.0 0.2 3620 1724 2
<entry><filename>/usr/local/</filename></entry>
<entry>Local executables and libraries. Also used as
the default destination for the &os; ports framework.
- Within <filename class="directory">/usr/local</filename>, the general
- layout sketched out by &man.hier.7; for
- <filename class="directory">/usr</filename> should be used. Exceptions
- are the man directory, which is directly under
- <filename class="directory">/usr/local</filename> rather than under
- <filename class="directory">/usr/local/share</filename>, and the ports
- documentation is in
- <filename class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
+ Within
+ <filename class="directory">/usr/local</filename>, the
+ general layout sketched out by &man.hier.7; for
+ <filename class="directory">/usr</filename> should be
+ used. Exceptions are the man directory, which is
+ directly under <filename
+ class="directory">/usr/local</filename> rather than
+ under <filename
+ class="directory">/usr/local/share</filename>, and
+ the ports documentation is in <filename
+ class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
</row>
<row>
@@ -3062,10 +3067,9 @@ Swap: 2048M Total, 2048M Free
figures in the header relate to how many processes are
running, how much memory and swap space has been used, and how
much time the system is spending in different CPU states. If
- the <acronym>ZFS</acronym>
- file system module has been loaded, an <literal>ARC</literal> line indicates
- how much data was read from the memory cache
- instead of from disk.</para>
+ the <acronym>ZFS</acronym> file system module has been loaded,
+ an <literal>ARC</literal> line indicates how much data was
+ read from the memory cache instead of from disk.</para>
<para>Below the header is a series of columns containing similar
information to the output from &man.ps.1;, such as the
@@ -3443,16 +3447,17 @@ Swap: 2048M Total, 2048M Free
</info>
<para>The &unix; shell is not just a command interpreter, it
- acts as a powerful tool which allows users to execute commands,
- redirect their output, redirect their input and chain commands
- together to improve the final command output. When this functionality
- is mixed with built in commands, the user is provided with
- an environment that can maximize efficiency.</para>
-
- <para>Shell redirection is the action of sending the output
- or the input of a command into another command or into a
- file. To capture the output of the &man.ls.1; command, for
- example, into a file, simply redirect the output:</para>
+ acts as a powerful tool which allows users to execute
+ commands, redirect their output, redirect their input and
+ chain commands together to improve the final command output.
+ When this functionality is mixed with built in commands, the
+ user is provided with an environment that can maximize
+ efficiency.</para>
+
+ <para>Shell redirection is the action of sending the output or
+ the input of a command into another command or into a file.
+ To capture the output of the &man.ls.1; command, for example,
+ into a file, simply redirect the output:</para>
<screen>&prompt.user; <userinput>ls > directory_listing.txt</userinput></screen>
@@ -3464,41 +3469,42 @@ Swap: 2048M Total, 2048M Free
<screen>&prompt.user; <userinput>sort < directory_listing.txt</userinput></screen>
<para>The input will be sorted and placed on the screen. To
- redirect that input into another file, one could redirect
- the output of &man.sort.1; by mixing the direction:</para>
+ redirect that input into another file, one could redirect the
+ output of &man.sort.1; by mixing the direction:</para>
<screen>&prompt.user; <userinput>sort < directory_listing.txt > sorted.txt</userinput></screen>
- <para>In all of the previous examples, the commands are performing
- redirection using file descriptors. Every unix system has file
- descriptors; however, here we will focus on three, so named as
- Standard Input, Standard Output, and Standard Error. Each one
- has a purpose, where input could be a keyboard or a mouse,
- something that provides input. Output could be a screen or
- paper in a printer for example. And error would be anything
- that is used for diagnostic or error messages. All three
- are considered <acronym>I/O</acronym> based file descriptors
- and sometimes considered streams.</para>
-
- <para>Through the use of these descriptors, short named
- stdin, stdout, and stderr, the shell allows output and
- input to be passed around through various commands and
- redirected to or from a file. Another method of redirection
- is the pipe operator.</para>
+ <para>In all of the previous examples, the commands are
+ performing redirection using file descriptors. Every unix
+ system has file descriptors; however, here we will focus on
+ three, so named as Standard Input, Standard Output, and
+ Standard Error. Each one has a purpose, where input could be
+ a keyboard or a mouse, something that provides input. Output
+ could be a screen or paper in a printer for example. And
+ error would be anything that is used for diagnostic or error
+ messages. All three are considered <acronym>I/O</acronym>
+ based file descriptors and sometimes considered
+ streams.</para>
+
+ <para>Through the use of these descriptors, short named stdin,
+ stdout, and stderr, the shell allows output and input to be
+ passed around through various commands and redirected to or
+ from a file. Another method of redirection is the pipe
+ operator.</para>
<para>The &unix; pipe operator, <quote>|</quote> allows the
- output of one command to be directly passed, or directed
- to another program. Basically a pipe will allow the
- standard output of a command to be passed as standard
- input to another command, for example:</para>
+ output of one command to be directly passed, or directed to
+ another program. Basically a pipe will allow the standard
+ output of a command to be passed as standard input to another
+ command, for example:</para>
<screen>&prompt.user; <userinput>cat directory_listing.txt | sort | less</userinput></screen>
<para>In that example, the contents of
<filename>directory_listing.txt</filename> will be sorted and
- the output passed to &man.less.1;. This allows the user
- to scroll through the output at their own pace and prevent
- it from scrolling off the screen.</para>
+ the output passed to &man.less.1;. This allows the user to
+ scroll through the output at their own pace and prevent it
+ from scrolling off the screen.</para>
</sect2>
</sect1>
More information about the svn-doc-all
mailing list