diff --git a/doc_src/and.txt b/doc_src/and.txt index 9de49192e..4d45ea9ce 100644 --- a/doc_src/and.txt +++ b/doc_src/and.txt @@ -10,7 +10,7 @@ The \c and builtin is used to execute a command if the current exit status (as s \subsection and-example Example -The following code runs the \c make command to build a program, and if it suceeds, it runs make install, which installs the program. +The following code runs the \c make command to build a program, and if it succeeds, it runs make install, which installs the program. 
 make; and make install
diff --git a/doc_src/begin.txt b/doc_src/begin.txt index 02284f219..b955376de 100644 --- a/doc_src/begin.txt +++ b/doc_src/begin.txt @@ -7,10 +7,10 @@ \subsection begin-description Description The \c begin builtin is used to create a new block of code. The block -is unconditionally erxecuted. Begin is equivalent to if +is unconditionally executed. Begin is equivalent to if true. The begin command is used to group any number of commands into a block. The reason for this is usually either to introduce a new -variable scope or to redirect the input ot output of this set of +variable scope or to redirect the input to output of this set of commands as a group. \subsection begin-example Example diff --git a/doc_src/break.txt b/doc_src/break.txt index 03e8a4169..ebeb4adce 100644 --- a/doc_src/break.txt +++ b/doc_src/break.txt @@ -8,7 +8,7 @@ The \c break builtin is used to halt a currently running loop, such as a for loop or a while loop. It is usually added inside of a conditional block such as an if statement or a switch statement. \subsection break-example Example -The following code searches all .c files for smurfs, and halts at the first occurance. +The following code searches all .c files for smurfs, and halts at the first occurrence.

for i in *.c;
    if grep smurf $i; diff --git a/doc_src/case.txt b/doc_src/case.txt index 44246c9bf..209e87ded 100644 --- a/doc_src/case.txt +++ b/doc_src/case.txt @@ -23,7 +23,7 @@ switch $animal echo evil case wolf dog human moose dolphin whale echo mammal - case duck goose albatros + case duck goose albatross echo bird case shark trout stingray echo fish diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt index 2f9ec02ca..c2434d546 100644 --- a/doc_src/commandline.txt +++ b/doc_src/commandline.txt @@ -25,14 +25,14 @@ or updated - \c -b or \c --current-buffer select the entire buffer (default) - \c -j or \c --current-job select the current job - \c -p or \c --current-process select the current process -- \c -t or \c --current_token select the current token. +- \c -t or \c --current_token select the current token. The following switch changes the way \c commandline prints the current commandline - \c -c or \c --cut-at-cursor only print selection up until the current cursor position -- \c o or \c --tokenize tokenize the selection and print one string-type token per line +- \c -o or \c --tokenize tokenize the selection and print one string-type token per line Other switches diff --git a/doc_src/complete.txt b/doc_src/complete.txt index ecb6bf990..3dced4512 100644 --- a/doc_src/complete.txt +++ b/doc_src/complete.txt @@ -1,4 +1,4 @@ -\section complete complete - edit command specific tab-completions. +\section complete complete - edit command specific tab-completions. \subsection complete-synopsis Synopsis complete (-c|--command|-p|--path) COMMAND [(-s|--short-option) SHORT_OPTION] [(-l|--long-option|-o|--old-option) LONG_OPTION [(-a||--arguments) OPTION_ARGUMENTS] [(-d|--description) DESCRIPTION] @@ -16,8 +16,8 @@ the fish manual. - DESCRIPTION is a description of what the option and/or option arguments do - -e or --erase implies that the specified completion should be deleted - -f or --no-files specifies that the option specified by this completion may not be followed by a filename -- -n or --condition specides a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases. -- -o or --old-option implies that the command uses old long style options with only one dash +- -n or --condition specifies a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases. +- -o or --old-option implies that the command uses old long style options with only one dash - -p or --path implies that the string COMMAND is the full path of the command - -r or --require-parameter specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option - -u or --unauthorative implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors @@ -30,9 +30,9 @@ that do not begin with a hyphen. Fish recognizes three styles of options, the same styles as the GNU version of the getopt library. These styles are: -- Short options, like '-a'. Short options are a single character long, are preceeded by a single hyphen and may ge grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32'). -- Old style long options, like '-Wall'. Old style long options are more than one character long, are preceeded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null'). -- GNU style long options, like '--colors'. GNU style long options are more than one character long, are preceeded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbrevated so long as the abbrevation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h'). +- Short options, like '-a'. Short options are a single character long, are preceded by a single hyphen and may be grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32'). +- Old style long options, like '-Wall'. Old style long options are more than one character long, are preceded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null'). +- GNU style long options, like '--colors'. GNU style long options are more than one character long, are preceded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbreviated so long as the abbreviation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h'). The options for specifying command name, command path, or command switches may all be used multiple times to specify multiple commands @@ -71,5 +71,5 @@ This can be written as: "Don't check dependencies" where \c __fish_contains_opt is a function that checks the commandline -buffer for the presense of a specified set of options. +buffer for the presence of a specified set of options. diff --git a/doc_src/exec.txt b/doc_src/exec.txt index 668d470bc..c915b58b0 100644 --- a/doc_src/exec.txt +++ b/doc_src/exec.txt @@ -7,8 +7,8 @@ \subsection exec-description Description The \c exec builtin is used to replace the currently running shells -process image with a new command. On sucessfull completion, exec never -returns. exec can not be used inside a pipeline. +process image with a new command. On successful completion, exec never +returns. exec can not be used inside a pipeline. \subsection exec-example Example diff --git a/doc_src/fishd.txt b/doc_src/fishd.txt index 2c8901506..9756b5f47 100644 --- a/doc_src/fishd.txt +++ b/doc_src/fishd.txt @@ -7,15 +7,15 @@ \subsection fishd-description Description The \c fishd daemon is used to load, save and distribute universal -variable information. fish automtically connects to fishd via a socket +variable information. fish automatically connects to fishd via a socket on startup. If no instance of fishd is running, fish spawns a new fishd instance. fishd will create a socket in /tmp, and wait for -incoming connections from universal variable clents, such as fish, +incoming connections from universal variable clients, such as fish, When no clients are connected, fishd will automatically shut down. \subsection fishd-commands Commands -Fishd works by sending and recieving sommands. Each command is ended +Fishd works by sending and receiving commands. Each command is ended with a newline. These are the commands supported by fishd: 

set KEY:VALUE
@@ -38,14 +38,14 @@ Erase the variable with the specified name.
 barrier_reply
-A \c barrier command will result in a barrier_reply beeing added to +A \c barrier command will result in a barrier_reply being added to the end of the senders queue of unsent messages. These commands are used to synchronize clients, since once the reply for a barrier message returns, the sender can know that any updates available at the -time the original barrier request was sent have been recieved. +time the original barrier request was sent have been received. \subsection fishd-files Files -~/.fishd.HOSTNAME permenent storage location for universal variale +~/.fishd.HOSTNAME permanent storage location for universal variable data. The data is stored as a set of \c set and \c set_export commands such as would be parsed by fishd. diff --git a/doc_src/function.txt b/doc_src/function.txt index 6e55e0d9d..6d121cb72 100644 --- a/doc_src/function.txt +++ b/doc_src/function.txt @@ -5,22 +5,22 @@ \subsection function-description Description -- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character. +- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character. - -d DESCRIPTION or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description - -j PID or --on-job-exit PID tells fish to run this function when the job with group id PID exits - -p PID or --on-process-exit PID tells fish to run this function when the fish child process with process id PID exits -- -s or --on-signal SIGSPEC tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a singal number, or the signal name, such as SIGHUP (or just HUP) +- -s or --on-signal SIGSPEC tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP) - -v or --on-variable VARIABLE_NAME tells fish to run this function when the variable VARIABLE_NAME changes value This builtin command is used to create a new function. A Function is a list of commands that will be executed when the name of the function -is entered. The function +is entered. The function 
 function hi
 	echo hello
 end
-
+ will write hello whenever the user enters \c hi. @@ -29,7 +29,7 @@ are inserted into the environment variable function ll +
function ll
 	ls -l $argv
 end
@@ -39,18 +39,18 @@ will run the \c ls command, using the \c -l option, while passing on any additio 
 function mkdir -d "Create a directory and set CWD"
 	mkdir $argv
-	if test $status = 0 
+	if test $status = 0
 		switch $argv[(count $argv)]
 			case '-*'
-				
+
 			case '*'
 				cd $argv[(count $argv)]
 				return
 		end
 	end
 end
-
+ -will run the mkdir command, and if it is succesfull, change the +will run the mkdir command, and if it is successful, change the current working directory to the one just created. diff --git a/doc_src/help.txt b/doc_src/help.txt index a097a683e..93c9a8475 100644 --- a/doc_src/help.txt +++ b/doc_src/help.txt @@ -1,5 +1,5 @@ -\section help help - Display fish documantation +\section help help - Display fish documentation \subsection help-synopsis Synopsis help [SECTION] diff --git a/doc_src/jobs.txt b/doc_src/jobs.txt index 5e8c2cac2..28a5aa700 100644 --- a/doc_src/jobs.txt +++ b/doc_src/jobs.txt @@ -5,14 +5,14 @@ \subsection jobs-description Description The jobs builtin causes fish to print a list of the currently -running jobs and their status. +running jobs and their status. jobs accepts the following switches: - -c or --command print the command name for each process in jobs - -g or --group only print the group id of each job - -l or --last only the last job to be started is printed -- -p or --process print the procces id for each process in all jobs +- -p or --process print the process id for each process in all jobs On systems that supports this feature, jobs will print the CPU usage of each job since the last command was executed. The CPU usage is diff --git a/doc_src/set.txt b/doc_src/set.txt index fb9bfbdfc..b994cd02e 100644 --- a/doc_src/set.txt +++ b/doc_src/set.txt @@ -3,11 +3,11 @@ \subsection set-synopsis Synopsis set [OPTIONS] [VARIABLE_NAME [VALUES...]] -The set builtin causes fish to assign the variable VARIABLE_NAME the values VALUES.... +The set builtin causes fish to assign the variable VARIABLE_NAME the values VALUES.... \subsection set-description Description - -e or --erase causes the specified environment variable to be erased -- -g or --global causes the specified environment variable to be made global. If this option is not supplied, the specified variable will dissapear when the current block ends +- -g or --global causes the specified environment variable to be made global. If this option is not supplied, the specified variable will disappear when the current block ends - -l or --local forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local - -n or --names List only the names of all defined variables - -q or --query test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined. @@ -18,7 +18,7 @@ The set builtin causes fish to assign the variable VARIABLE_N If set is called with no arguments, the names and values of all environment variables are printed. If some of the scope or export flags have been given, only the variables matching the specified scope -are printed. +are printed. If the \c -e or \c --erase option is specified, the variable specified by the following arguments will be erased diff --git a/doc_src/status.txt b/doc_src/status.txt index 84ad46048..08617c6d9 100644 --- a/doc_src/status.txt +++ b/doc_src/status.txt @@ -5,7 +5,7 @@ status [OPTION] \subsection status-description Description -- -c or --is-command-substitution returns 0 if fish is currently executing a command usbstitution +- -c or --is-command-substitution returns 0 if fish is currently executing a command substitution - -b or --is-block returns 0 if fish is currently executing a block of code - -i or --is-interactive returns 0 if fish is interactive, i.e.connected to a keyboard -- -l or --is-login returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH. +- -l or --is-login returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH. diff --git a/doc_src/switch.txt b/doc_src/switch.txt index 06a324503..d94281eba 100644 --- a/doc_src/switch.txt +++ b/doc_src/switch.txt @@ -12,7 +12,7 @@ wildcarded values. \subsection switch-example Example -If the variable \$animal contins the name of an animal, the +If the variable \$animal contains the name of an animal, the following code would attempt to classify it:

@@ -22,7 +22,7 @@ switch $animal echo evil case wolf dog human moose dolphin whale echo mammal - case duck goose albatros + case duck goose albatross echo bird case shark trout stingray echo fish @@ -32,6 +32,6 @@ end

If the above code was run with \$animal set to \c whale, the output -would be \c mammal. +would be \c mammal.

diff --git a/doc_src/trap.txt b/doc_src/trap.txt index dd4d2fe81..2651edd2b 100644 --- a/doc_src/trap.txt +++ b/doc_src/trap.txt @@ -1,5 +1,5 @@ -\section trap trap - perform an action when the shell recives a signal +\section trap trap - perform an action when the shell receives a signal \subsection trap-synopsis Synopsis trap [OPTIONS] [[ARG] SIGSPEC ... ] @@ -8,10 +8,10 @@ Trap is a shellscript wrapper around the fish event delivery framework. IT is defined for backwards compatibility reasons. For -other uses, it is recomended to define a event handler. -- ARG is the command to be executed on signal delivary +- ARG is the command to be executed on signal delivery - SIGSPEC is the name of the signal to trap - \c -h or \c --help Display help and exit - \c -l or \c --list-signals print a list of signal names diff --git a/doc_src/type.txt b/doc_src/type.txt index e24acfc99..2a20f562d 100644 --- a/doc_src/type.txt +++ b/doc_src/type.txt @@ -6,11 +6,11 @@ \subsection type-description Description -With no options, indicate how each name would be interpreted if used as a command name. +With no options, indicate how each name would be interpreted if used as a command name. - \c -h or \c --help print this message - \c -a or \c --all print all of possible definitions of the specified names -- \c -f or \c --no-functions supresses function and builtin lookup +- \c -f or \c --no-functions suppresses function and builtin lookup - \c -t or \c --type print a string which is one of alias, keyword, function, builtin, or file if name is an alias, shell reserved word, function, builtin, or disk file, respectively - \c -p or \c --path either return the name of the disk file that would be executed if name were specified as a command name, or nothing if 'type -t name' would not return 'file' - \c -P or \c --force-path either return the name of the disk file that would be executed if name were specified as a command name, or nothing no file with the specified name could be found in the PATH diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt index ac21550c0..8c2a53d5f 100644 --- a/doc_src/ulimit.txt +++ b/doc_src/ulimit.txt @@ -1,5 +1,5 @@ -\section ulimit ulimit - Set or get the shells resurce usage limits +\section ulimit ulimit - Set or get the shells resource usage limits \subsection ulimit-synopsis Synopsis ulimit [OPTIONS] [LIMIT] @@ -38,7 +38,7 @@ except for -t, which is in seconds and -n and -u, which are unscaled values. The return status is 0 unless an invalid option or argument is supplied, or an error occurs while setting a new limit. -The fish implementation of ulimit should behave identically to the implementation in bash, except for these differences: +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. diff --git a/doc_src/umask.txt b/doc_src/umask.txt index b355135bc..793ef1f43 100644 --- a/doc_src/umask.txt +++ b/doc_src/umask.txt @@ -1,5 +1,5 @@ -\section umask umask - Set or get the shells resurce usage limits +\section umask umask - Set or get the shells resource usage limits \subsection umask-synopsis Synopsis umask [OPTIONS] [MASK] @@ -10,7 +10,7 @@ With no argument, the current file-creation mask is printed, if an argument is specified, it is the new file creation mask. The mask may be specified as an octal number, in which case it is interpreted as the rights that should be masked away, i.e. it is the inverse of the -file permissions any new files will have. +file permissions any new files will have. If a symbolic mask is specified, the actual file permission bits, and not the inverse, should be specified. A symbolic mask is a comma @@ -19,7 +19,7 @@ separated list of rights. Each right consists of three parts: - The first part specifies to whom this set of right applies, and can be one of \c u, \c g, \c o or \c a, where \c u specifies the user who owns the file, \c g specifies the group owner of the file, \c o -specifiec other users rights and \c a specifies all three should be +specific other users rights and \c a specifies all three should be changed. - The second part of a right specifies the mode, and can be one of \c =, \c + or \c -, where \c = specifies that the rights should be set to @@ -27,7 +27,7 @@ the new value, \c + specifies that the specified right should be added to those previously specified and \c - specifies that the specified rights should be removed from those previously specified. - The third part of a right specifies what rights should be changed -and can be any compination of \c r, \c w and \c x, representing +and can be any combination of \c r, \c w and \c x, representing read, write and execute rights. If the first and second parts are skipped, they are assumed to be \c a