svn commit: r43254 - head/en_US.ISO8859-1/books/handbook/basics
Warren Block
wblock at FreeBSD.org
Tue Nov 26 16:05:01 UTC 2013
Author: wblock
Date: Tue Nov 26 16:05:00 2013
New Revision: 43254
URL: http://svnweb.freebsd.org/changeset/doc/43254
Log:
Rewrite the shell completion section, add ID to shell environment
variables table and use xref instead of hardcoded table number.
Submitted by: Alexander Oblovatniy <oblovatniy at gmail.com> on -doc
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 Tue Nov 26 15:55:45 2013 (r43253)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml Tue Nov 26 16:05:00 2013 (r43254)
@@ -3111,22 +3111,21 @@ Swap: 2048M Total, 2048M Free
<para>One common shell feature is filename completion. After a
user types the first few letters of a command or filename and
- presses <keycap>Tab</keycap>, the shell automatically completes
+ presses <keycap>Tab</keycap>, the shell completes
the rest of the command or filename. Consider two files called
- <filename>foobar</filename> and <filename>foo.bar</filename>.
- To delete <filename>foo.bar</filename>, type <command>rm
- fo[Tab].[Tab]</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
- is more than one match. Both <filename>foobar</filename> and
- <filename>foo.bar</filename> start with <literal>fo</literal>.
- By typing <literal>.</literal>, then pressing
- <keycap>Tab</keycap> again, the shell is able to fill in the
- rest of the filename.</para>
+ <filename>foobar</filename> and <filename>football</filename>.
+ To delete <filename>foobar</filename>, the user might type <command>rm
+ foo</command> and press <keycap>Tab</keycap> to complete the filename.</para>
+
+ <para>But the shell only shows
+ <command>rm foo</command>.
+ It was unable to complete the filename because
+ both <filename>foobar</filename> and
+ <filename>football</filename> start with <literal>foo</literal>.
+ Some shells sound a beep or show all the choices if more than one name matches.
+ The user must then type more characters to identify the desired filename. Typing a <literal>t</literal> and pressing
+ <keycap>Tab</keycap> again is enough to let the shell determine which filename is desired and fill in the
+ rest.</para>
<indexterm><primary>environment variables</primary></indexterm>
@@ -3134,11 +3133,11 @@ Swap: 2048M Total, 2048M Free
variables. Environment variables are a variable/key pair stored
in the shell's environment. This environment can be read by any
program invoked by the shell, and thus contains a lot of program
- configuration. Table 4.3 provides a list of common environment
+ configuration. <xref linkend="shell-env-vars"/> provides a list of common environment
variables and their meanings. Note that the names of
environment variables are always in uppercase.</para>
- <table frame="none" pgwide="1">
+ <table xml:id="shell-env-vars" frame="none" pgwide="1">
<title>Common Environment Variables</title>
<tgroup cols="2">
More information about the svn-doc-all
mailing list