From e750f1a3c2a76a1bf5093195ebb40e05e069281b Mon Sep 17 00:00:00 2001 From: axel Date: Sun, 25 Mar 2007 05:16:46 +1000 Subject: [PATCH] Minor documentation fixes darcs-hash:20070324191646-ac50b-0892de7e96348caf198830af2b2ad46b84f9f13e.gz --- doc_src/bg.txt | 2 +- doc_src/fg.txt | 2 +- doc_src/index.hdr.in | 7 ++++--- doc_src/ulimit.txt | 14 +++++++------- doc_src/umask.txt | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doc_src/bg.txt b/doc_src/bg.txt index d1b6625c2..dc607b064 100644 --- a/doc_src/bg.txt +++ b/doc_src/bg.txt @@ -8,7 +8,7 @@ Sends the specified jobs to the background. A background job is executed simultaneously with fish, and does not have access to the keyboard. If no job is specified, the last job to be used is put in the background. If PID is specified, the jobs with the specified group ids are put in the background. -The PID of the desired process is usually found by using process globbing. +The PID of the desired process is usually found by using process expansion. \subsection bg-example Example diff --git a/doc_src/fg.txt b/doc_src/fg.txt index 1ab579ff0..db983ee9a 100644 --- a/doc_src/fg.txt +++ b/doc_src/fg.txt @@ -7,7 +7,7 @@ Sends the specified job to the foreground. While a foreground job is executed, fish is suspended. If no job is specified, the last job to be used is put in the foreground. If PID is specified, the job with the specified group id is put in the foreground. -The PID of the desired process is usually found by using process globbing. +The PID of the desired process is usually found by using process expansion. \subsection fg-example Example diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 77f1eb7ff..1d6797bcb 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -741,8 +741,8 @@ command. Example: -To set the variable \c smurf to the value \c blue, use the command -set smurf blue. +To set the variable \c smurf_color to the value \c blue, use the command +set smurf_color blue. After a variable has been set, you can use the value of a variable in the shell through variable expansion. @@ -751,7 +751,8 @@ Example: To use the value of a the variable \c smurf, write $ (dollar symbol) followed by the name of the variable, like echo Smurfs are -$smurf, which would print the result 'Smurfs are blue'. +usually $smurf_color, which would print the result 'Smurfs are +usually blue'. \subsection variables-scope Variable scope diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt index d3ae65b96..e8229a9bd 100644 --- a/doc_src/ulimit.txt +++ b/doc_src/ulimit.txt @@ -11,7 +11,7 @@ omitted, the current value of the limit of the resource is printed. Use one of the following switches to specify which resource limit to set or report: -- -c or --core-size The maximum size of core files created +- -c or --core-size The maximum size of core files created. By setting this limit to zero, core dumps can be disabled. - -d or --data-size The maximum size of a process's data segment - -f or --file-size The maximum size of files created by the shell - -l or --lock-size The maximum size that may be locked into memory @@ -40,11 +40,11 @@ ulimit also accepts the following switches that determine what type of limit to - -H or --hard Set hard resource limit - -S or --soft Set soft resource limit -A hard limit cannot be increased once it is set; a soft limit may be -increased up to the value of the hard limit. If neither -H nor -S is -specified, both the soft and hard limits are updated when assigning a -new limit value, and the soft limit is used when reporting the current -value. +A hard limit can only be decreased, once it is set it can not be +increased; a soft limit may be increased up to the value of the hard +limit. If neither -H nor -S is specified, both the soft and hard +limits are updated when assigning a new limit value, and the soft +limit is used when reporting the current value. The following additional options are also understood by ulimit: @@ -55,7 +55,7 @@ The fish implementation of ulimit should behave identically to the implementation in bash, except for these differences: - Fish ulimit supports GNU-style long options for all switches -- Fish ulimit does not support the -p option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish. +- Fish ulimit does not support the -p option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE. Fish does not do this because it this method of determining pipe sixe is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish. - Fish ulimit does not support getting or setting multiple limits in one command, except reporting all values using the -a switch \subsection ulimit-example Example diff --git a/doc_src/umask.txt b/doc_src/umask.txt index 793b117e9..2150c62c8 100644 --- a/doc_src/umask.txt +++ b/doc_src/umask.txt @@ -1,4 +1,4 @@ -\section umask umask - set or get the shells resource usage limits +\section umask umask - set or get the file-creation mask \subsection umask-synopsis Synopsis umask [OPTIONS] [MASK]