From 1dbff806919da1ff72699ec84ec003505fa18bfa Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 5 May 2013 03:35:37 -0700 Subject: [PATCH 01/14] Correct sizes of certain fish.app icons --- osx/fish_term_icon.icns | Bin 258264 -> 298380 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/osx/fish_term_icon.icns b/osx/fish_term_icon.icns index 45eb6ad105cee31f83ec0d797c55f127eef48c7e..e8e76861039286686c847b91bc4581dcc1974af4 100644 GIT binary patch delta 65139 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 C1$z+y From 2f5016262a0d01a42df7956d2c07623d2f0962d8 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 12 May 2013 01:57:42 -0700 Subject: [PATCH 02/14] Attempt again to fix UnicodeDecodeError (issue #658) --- share/tools/create_manpage_completions.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/tools/create_manpage_completions.py b/share/tools/create_manpage_completions.py index d861886a0..07475879b 100755 --- a/share/tools/create_manpage_completions.py +++ b/share/tools/create_manpage_completions.py @@ -162,11 +162,14 @@ def built_command(options, description): # But don't let it be empty sentences = [x for x in sentences if x.strip()] if not sentences: sentences = [''] + + udot = lossy_unicode('.') + uspace = lossy_unicode(' ') - truncated_description = sentences[0] + '.' + truncated_description = lossy_unicode(sentences[0]) + udot for line in sentences[1:]: if not line: continue - proposed_description = truncated_description + ' ' + line + '.' + proposed_description = lossy_unicode(truncated_description) + uspace + lossy_unicode(line) + udot if len(proposed_description) <= max_description_width: # It fits truncated_description = proposed_description From 22d1aaa27dbbfc56dca0e31e1ecbcd7db03f322c Mon Sep 17 00:00:00 2001 From: Ian Munsie Date: Thu, 9 May 2013 22:37:28 +1000 Subject: [PATCH 03/14] Prevent fish dying if setupterm() fails in builtin_set_color() Since set_color was changed to a built-in command, the entire shell will exit in the event that setupterm() fails for some reason since ncurses does an exit() if an errret was not passed in. setupterm() can fail if the TERM environment variable is not set. This can cause the shell to die prematurely if set_color is called from a startup file like config.fish (such as vi-mode.fish which caches the results of set_color when it is loaded) and fish is started without a TERM set (e.g. when started from .xsession, or when being used as a remote shell by a command such as rsync, scp or git) A simple repro case for this issue is: ian@delenn~ [i]> echo set_color normal > ~/.config/fish/config.fish ian@delenn~ [i]> scp localhost:test . TERM environment variable not set. ian@delenn~ [i]> This patch passes in an errret variable to setupterm(), which causes ncurses to return the error to builtin_set_color() rather than calling exit(): ian@delenn~ [i]> scp localhost:test . test 100% 0 0.0KB/s 00:00 ian@delenn~ [i]> Signed-off-by: Ian Munsie --- builtin_set_color.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin_set_color.cpp b/builtin_set_color.cpp index 549ea8cf0..14cf84ca0 100644 --- a/builtin_set_color.cpp +++ b/builtin_set_color.cpp @@ -83,6 +83,7 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv) const wchar_t *bgcolor = NULL; bool bold = false, underline=false; + int errret; /* Parse options to obtain the requested operation and the modifiers */ woptind = 0; @@ -165,7 +166,7 @@ static int builtin_set_color(parser_t &parser, wchar_t **argv) } /* Make sure that the term exists */ - if (cur_term == NULL && setupterm(0, STDOUT_FILENO, 0) == ERR) + if (cur_term == NULL && setupterm(0, STDOUT_FILENO, &errret) == ERR) { append_format(stderr_buffer, _(L"%ls: Could not set up terminal\n"), argv[0]); return STATUS_BUILTIN_ERROR; From c80bd104d23513cc26f29fe44fae55e2f8d6cc50 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Mon, 13 May 2013 01:41:50 -0700 Subject: [PATCH 04/14] Add errret param to other calls to setupterm --- fish_pager.cpp | 4 ++-- input.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fish_pager.cpp b/fish_pager.cpp index fac704977..2e1a4bbaa 100644 --- a/fish_pager.cpp +++ b/fish_pager.cpp @@ -1069,8 +1069,8 @@ static void init(int mangle_descriptors, int out) exit(1); } - - if (setupterm(0, STDOUT_FILENO, 0) == ERR) + int errret; + if (setupterm(0, STDOUT_FILENO, &errret) == ERR) { debug(0, _(L"Could not set up terminal")); exit(1); diff --git a/input.cpp b/input.cpp index f786b26ea..6127e23fa 100644 --- a/input.cpp +++ b/input.cpp @@ -336,7 +336,8 @@ int input_init() input_common_init(&interrupt_handler); - if (setupterm(0, STDOUT_FILENO, 0) == ERR) + int errret; + if (setupterm(0, STDOUT_FILENO, &errret) == ERR) { debug(0, _(L"Could not set up terminal")); exit_without_destructors(1); From dd6bb04ba7de2e8f7607935c8a370c0b726d4c2a Mon Sep 17 00:00:00 2001 From: "David Adam (zanchey)" Date: Fri, 10 May 2013 20:29:38 +0800 Subject: [PATCH 05/14] documentation typos --- doc_src/faq.hdr | 8 ++++---- doc_src/index.hdr.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index 23bfa00d9..07c763ab5 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -28,7 +28,7 @@ Writing cd images; ls .. given the above directory structure would list the contents of ~/Documents, not of ~, even though using cd .. changes the current directory to ~, and the prompt, the pwd builtin and many other directory information -sources suggest that the current directory is ~/images and it's +sources suggest that the current directory is ~/images and its parent is ~. This issue is not possible to fix without either making every single command into a builtin, breaking Unix semantics or implementing kludges in every single command. @@ -91,10 +91,10 @@ In order to change your default shell, type: chsh -s /usr/local/bin/fish -You may need to adjust the above path to e.g. /usr/bin/fish. Use the command which fish if you are unsure of where fish is installed. +You may need to adjust the above path to e.g. \c /usr/bin/fish. Use the command which fish if you are unsure of where fish is installed. -Unfortunately, there is no way to make the changes take effect at once, -you will need to log out and back in again. +Unfortunately, there is no way to make the changes take effect at once. +You will need to log out and back in again.
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 6705aa411..62bde6b25 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -163,7 +163,7 @@ Any file descriptor can be directed to a different output than its default through a simple mechanism called a redirection. An example of a file redirection is echo hello \>output.txt, -which directs the output of the echo command to the file error.txt. +which directs the output of the echo command to the file output.txt. - To redirect standard input, write \ - To redirect standard output, write \>DESTINATION @@ -398,7 +398,7 @@ These are the general purpose tab completions that \c fish provides: - Completion of environment variable names. - Completion of usernames for tilde expansion. - Completion of filenames, even on strings with wildcards such as '*', '**' and '?'. -- Completion of job id, job name and process names for process expansion. +- Completion of job ID, job name and process names for process expansion. \c fish provides a large number of program specific completions. Most of these completions are simple options like the \c -l option for \c @@ -1186,7 +1186,7 @@ History searches can be aborted by pressing the escape key. Prefixing the commandline with a space will prevent the entire line from being stored in the history. -The history is stored in the file . +The history is stored in the file ~/.config/fish/fish_history. Examples: @@ -1221,7 +1221,7 @@ continue using the shell. In such cases, there are several ways in which the user can change fish's behavior. -# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. --# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running. +-# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. GNU Emacs uses ^X z to stop running. -# By using the fg and bg builtin commands, the user can send any currently running job into the foreground or background. \section initialization Initialization files From e921dc50e0e5a901d0cee9c4b724b3034d6bc260 Mon Sep 17 00:00:00 2001 From: "David Adam (zanchey)" Date: Fri, 10 May 2013 22:44:46 +0800 Subject: [PATCH 06/14] FAQ updates - implicit cd and autosuggestions --- doc_src/faq.hdr | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index 07c763ab5..fa3bc314e 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -1,7 +1,6 @@ /** \page faq Frequently asked questions - Why does cd, pwd and other fish commands always resolve symlinked directories to their canonical path? -- Why does the cd command autocompletion list the subdirectories of my home directory as completions? - I accidentally entered a directory path and fish changed directory. What happened? - The open command doesn't work. - How do I make fish my default shell? @@ -42,19 +41,9 @@ silently fails in shells that don't resolve symlinked paths.
-\section faq-cd-autocomplete Why does the cd command autocompletion list the subdirectories of my home directory as completions? - -Because they are completions. In fish, if you specify a relative -directory to the cd command, i.e. any path that does not start with -either './' or '/', the environment variable CDPATH will be examined, and any -directories in this path is used as a base directory. To disable this -feature, write set CDPATH . on the commandline. - -
- \section faq-cd-implicit I accidentally entered a directory path and fish changed directory. What happened? -If fish is unable to locate a command with a given name, fish will +If fish is unable to locate a command with a given name, and it starts with '.', '/' or '~', fish will test if a directory of that name exists. If it does, it is implicitly assumed that you want to change working directory. For example, the fastest way to switch to your home directory is to simply press @@ -64,13 +53,12 @@ fastest way to switch to your home directory is to simply press \section faq-open The open command doesn't work. -The open command uses the mimetype database and the .desktop files +The \c open command uses the MIME type database and the .desktop files used by Gnome and KDE to identify filetypes and default actions. If -at least one of these two desktops are installed, but the open command is +at least one of these environments is installed, but the open command is not working, this probably means that the relevant files are installed -in a nonstandard location. Please contact the fish mailing list, and -hopefully this can be resolved. +in a non-standard location. Consider asking for +more help.
From 91aab03b90a6b583a3c0ecff5b015c6066d34f28 Mon Sep 17 00:00:00 2001 From: "David Adam (zanchey)" Date: Fri, 10 May 2013 23:06:29 +0800 Subject: [PATCH 07/14] Document that fish functions cannot be background (Documentation for #238, #563) --- doc_src/index.hdr.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 62bde6b25..0bc4faeeb 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -1224,6 +1224,10 @@ which the user can change fish's behavior. -# By pressing ^Z, the user stops a currently running foreground program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. GNU Emacs uses ^X z to stop running. -# By using the fg and bg builtin commands, the user can send any currently running job into the foreground or background. +Note that functions cannot be started in the background. Functions that +are stopped and then restarted in the background using the \c bg command +will not execute correctly. + \section initialization Initialization files On startup, \c fish evaluates the files /usr/share/fish/config.fish From 1287b9d82382bf22e16edda67eae755f07397f2e Mon Sep 17 00:00:00 2001 From: "David Adam (zanchey)" Date: Sun, 12 May 2013 15:56:01 +0800 Subject: [PATCH 08/14] Help cleanup Large list of changes, including formatting and typos for most commands. More substantive changes have been made to alias, bind, block, break, builtin, case, cd, commandline, count, else, emit, fish_config, funced, function, functions, history, math, mimedb, nextd, not, popd, prevd, pushd, pwd, random, read, set, set_color, switch, test, trap, type, ulimit, umask, and while. --- doc_src/alias.txt | 26 +++++++++--- doc_src/and.txt | 12 +++--- doc_src/begin.txt | 13 +++--- doc_src/bg.txt | 9 +++-- doc_src/bind.txt | 41 +++++++++---------- doc_src/block.txt | 25 +++++++++++- doc_src/break.txt | 9 +++-- doc_src/breakpoint.txt | 8 +++- doc_src/builtin.txt | 10 ++--- doc_src/case.txt | 26 ++++++------ doc_src/cd.txt | 23 ++++++++--- doc_src/command.txt | 8 ++-- doc_src/commandline.txt | 42 ++++++++++---------- doc_src/complete.txt | 6 +-- doc_src/contains.txt | 12 +++--- doc_src/continue.txt | 6 +-- doc_src/count.txt | 15 ++----- doc_src/dirh.txt | 6 ++- doc_src/dirs.txt | 5 ++- doc_src/echo.txt | 14 ++++--- doc_src/else.txt | 20 ++++++---- doc_src/emit.txt | 2 +- doc_src/end.txt | 4 +- doc_src/eval.txt | 7 +++- doc_src/exec.txt | 10 ++--- doc_src/exit.txt | 6 +-- doc_src/fg.txt | 8 ++-- doc_src/fish.txt | 4 +- doc_src/fish_config.txt | 21 +++++++++- doc_src/fish_indent.txt | 4 +- doc_src/fish_pager.txt | 5 +-- doc_src/fish_prompt.txt | 5 ++- doc_src/fish_update_completions.txt | 7 +++- doc_src/fishd.txt | 28 +++++++------ doc_src/for.txt | 4 +- doc_src/funced.txt | 13 +++--- doc_src/funcsave.txt | 7 ++-- doc_src/function.txt | 36 ++++++++--------- doc_src/functions.txt | 52 ++++++++++++++++-------- doc_src/help.txt | 8 ++-- doc_src/history.txt | 52 +++++++++++++----------- doc_src/if.txt | 10 ++--- doc_src/isatty.txt | 9 ++--- doc_src/jobs.txt | 18 +++++---- doc_src/math.txt | 12 ++++-- doc_src/mimedb.txt | 33 ++++++++-------- doc_src/nextd.txt | 22 ++++++++--- doc_src/not.txt | 4 +- doc_src/open.txt | 2 +- doc_src/or.txt | 8 ++-- doc_src/popd.txt | 18 ++++++++- doc_src/prevd.txt | 21 ++++++++-- doc_src/psub.txt | 6 +-- doc_src/pushd.txt | 18 ++++++++- doc_src/pwd.txt | 6 ++- doc_src/random.txt | 9 +++-- doc_src/read.txt | 36 +++++++++-------- doc_src/return.txt | 10 ++--- doc_src/set.txt | 42 ++++++++++++-------- doc_src/set_color.txt | 27 ++++++------- doc_src/source.txt | 12 +++--- doc_src/status.txt | 26 ++++++------ doc_src/switch.txt | 25 ++++++------ doc_src/test.txt | 61 ++++++++++++++--------------- doc_src/trap.txt | 43 +++++++++++--------- doc_src/type.txt | 24 ++++++------ doc_src/ulimit.txt | 61 ++++++++++++++--------------- doc_src/umask.txt | 35 +++++++++++------ doc_src/vared.txt | 4 +- doc_src/while.txt | 14 ++++--- 70 files changed, 726 insertions(+), 509 deletions(-) diff --git a/doc_src/alias.txt b/doc_src/alias.txt index 2ab277e9f..84288c18e 100644 --- a/doc_src/alias.txt +++ b/doc_src/alias.txt @@ -6,13 +6,29 @@ alias NAME=DEFINITION \subsection alias-description Description -Alias is a shellscript wrapper around the function builtin. +\c alias is a simple wrapper for the \c function builtin. It exists for backwards compatibility with Posix shells. For other uses, it is recommended to define a function. -Alias does not keep track of which functions have been defined using -alias, nor does it allow erasing of aliases. +\c fish does not keep track of which functions have been defined using +\c alias. They must be erased using functions -e. + +- NAME is the name of the alias +- DEFINITION is the actual command to execute. The string " $argv" will be appended. + +You cannot create an alias to a function with the same name. + +\subsection alias-example Example + +The following code will create \c rmi, which runs \c rm with additional +arguments on every invocation. + +alias rmi "rm -i" + +This is equivalent to entering the following function: + +
function rmi
+    rm -i $argv
+end
-- NAME is the name of the function to define -- DEFINITION is the body of the function. The string " $argv" will be appended to the body. diff --git a/doc_src/and.txt b/doc_src/and.txt index 0562fae94..3eb42c19f 100644 --- a/doc_src/and.txt +++ b/doc_src/and.txt @@ -5,10 +5,10 @@ \subsection and-description Description -The \c and builtin is used to execute a command if the current exit +\c and is used to execute a command if the current exit status (as set by the last previous command) is 0. -The and command does not change the current exit status. +\c and does not change the current exit status. The exit status of the last foreground command to exit can always be accessed using the $status @@ -16,10 +16,10 @@ variable. \subsection and-example Example -The following code runs the \c make command to build a program, if the -build succeeds, the program is installed. If either step fails, -make clean is run, which removes the files created by the -build process +The following code runs the \c make command to build a program. If the +build succeeds, make's exit status is 0, and the program is installed. If either step fails, +the exit status is 1, and make clean is run, which removes the files created by the. +build process. 
 make; and make install; or make clean
diff --git a/doc_src/begin.txt b/doc_src/begin.txt
index f5f7f53e0..fafe98499 100644
--- a/doc_src/begin.txt
+++ b/doc_src/begin.txt
@@ -5,15 +5,18 @@
 
 \subsection begin-description Description
 
-The \c begin builtin is used to create a new block of code. The block
+\c begin is used to create a new block of code.
+
+The block
 is unconditionally executed. begin; ...; end is equivalent
-to if true; ...; end. The begin command is used to group any
-number of commands into a block. The reason for doing so is usually
-either to introduce a new variable scope, to redirect the input or
+to if true; ...; end.
+
+\c begin is used to group a number of commands into a block.
+This allows the introduction of a new variable scope, redirection of the input or
 output of a set of commands as a group, or to specify precedence when
 using the conditional commands like \c and.
 
-The \c begin command does not change the current exit status.
+\c begin does not change the current exit status.
 
 \subsection begin-example Example
 
diff --git a/doc_src/bg.txt b/doc_src/bg.txt
index dc607b064..9c8f593a6 100644
--- a/doc_src/bg.txt
+++ b/doc_src/bg.txt
@@ -1,16 +1,17 @@
-\section bg bg - send to background
+\section bg bg - send jobs to background
 
 \subsection bg-synopsis Synopsis
 bg [PID...]
 
 \subsection bg-description Description
-Sends the specified jobs to the background. A background job is
+
+\c bg sends jobs to the background, resuming them if they are stopped. 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.
+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 process group IDs are put in the background.
 
 The PID of the desired process is usually found by using process expansion.
 
 \subsection bg-example Example
 
-bg \%0 will put the job with job id 0 in the background.
+bg \%1 will put the job with job ID 1 in the background.
 
diff --git a/doc_src/bind.txt b/doc_src/bind.txt
index 3bf9fb453..614a14950 100644
--- a/doc_src/bind.txt
+++ b/doc_src/bind.txt
@@ -5,33 +5,34 @@
 
 \subsection bind-description Description
 
-The bind builtin causes fish to add a key binding from the specified sequence.
+bind adds a binding for the specified key sequence to the
+specified command.
 
-SEQUENCE is the character sequence to bind to. Usually, one would use
-fish escape sequences to express them. For example, because pressing
+SEQUENCE is the character sequence to bind to. These should be written as
+fish escape sequences. For example, because pressing
 the Alt key and another character sends that character prefixed with
 an escape character, Alt-based key bindings can be written using the
 \c \\e escape. For example, Alt-w can be written as
-\\ew. Control character can be written in much the same way
-using the \c \\c escape, for example Control-x can be written as
+\\ew. The control character can be written in much the same way
+using the \c \\c escape, for example Control-x (^X) can be written as
 \\cx. Note that Alt-based key bindings are case sensitive and
-Control base key bindings are not. This is not a design choice in
-fish, it is simply how terminals work.
+Control-based key bindings are not. This is a constraint of text-based
+termainls, not \c fish.
 
-If SEQUENCE is the empty string, i.e. an empty set of quotes, this is
-interpreted as the default keybinding. It will be used whenever no
+The default key binding can be set by specifying a SEQUENCE of the empty
+string (that is, ''). It will be used whenever no
 other binding matches. For most key bindings, it makes sense to use
 the \c self-insert function (i.e. bind '' self-insert as the
 default keybinding. This will insert any keystrokes not specifically
 bound to into the editor. Non-printable characters are ignored by the
-editor, so this will not result in e.g. control sequences being
+editor, so this will not result in control sequences being
 printable.
 
 If the -k switch is used, the name of the key (such as down, up or
 backspace) is used instead of a sequence. The names used are the same
 as the corresponding curses variables, but without the 'key_'
-prefix. (See man 5 terminfo for more information, or use bind
---key-names for a list of all available named keys)
+prefix. (See \c terminfo(5) for more information, or use bind
+--key-names for a list of all available named keys.)
 
 COMMAND can be any fish command, but it can also be one of a set of
 special input functions. These include functions for moving the
@@ -45,19 +46,19 @@ bind to the function name. This way it becomes significantly easier to
 test the function while editing, and the result is usually more
 readable as well.
 
-If you want to autoload bindings each time you start shell, you should 
-define them inside fish_user_key_bindings function.
+Key bindings are not saved between sessions by default. To save custom
+keybindings, edit the \c fish_user_key_bindings function and insert the
+appropirate \c bind statements.
+
+The following parameters are available:
 
-- -a or --all If --key-names is specified, show all key names, not only the ones that actually are defined for the current terminal. If erase mode is specified, this switch will cause all current bindings to be erased.
-- -e or --erase Erase mode. All non-switch arguments are interpreted as character sequences and any commands associated with those sequences are erased.
-- -h or --help Display help and exit
 - -k or --key Specify a key name, such as 'left' or 'backspace' instead of a character sequence
 - -K or --key-names Display a list of available key names
 - -f or --function-names Display a list of available input functions
 
-\subsection bind-example Example
+\subsection bind-example Examples
 
-bind \\cd 'exit' causes fish to exit on Control-d
+bind \\cd 'exit' causes \c fish to exit when Control-d is pressed.
 
-bind -k ppage history-search-backward Causes fish to perform a history search when the page up key is pressed
+bind -k ppage history-search-backward performs a history search when the Page Up key is pressed.
 
diff --git a/doc_src/block.txt b/doc_src/block.txt
index 670a39b28..0f4cff383 100644
--- a/doc_src/block.txt
+++ b/doc_src/block.txt
@@ -5,15 +5,36 @@
 
 \subsection block-description Description
 
-- -l or --local Release the block at the end of the currently innermost block scope
+\c block prevents events triggered by \c fish or the
+emit command from
+being delivered and acted upon while the block is in place.
+
+In functions, \c block can be useful while performing work that
+should not be interrupted by the shell.
+
+The block can be removed. Any events which triggered while the
+block was in place will then be delivered.
+
+Event blocks should not be confused with code blocks, which are created
+with begin, if, while or
+for
+
+The following parameters are available:
+
+- -l or --local Release the block automatically at the end of the current innermost code block scope
 - -g or --global Never automatically release the lock
 - -e or --erase Release global block
 
 \subsection block-example Example
 
 
+# Create a function that listens for events
+function --on-event foo foo; echo 'foo fired'; end
+# Block the delivery of events
 block -g
-\#Do something that should not be interrupted
+emit foo
+# No output will be produced
 block -e
+# 'foo fired' will now be printed
 

 
diff --git a/doc_src/break.txt b/doc_src/break.txt
index 9e5118728..3f46bb8cc 100644
--- a/doc_src/break.txt
+++ b/doc_src/break.txt
@@ -1,13 +1,16 @@
-\section break break - stop the innermost currently evaluated loop
+\section break break - stop the current inner loop
 
 \subsection break-synopsis Synopsis
  LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 
 \subsection break-description Description
-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.
+
+\c break halts 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.
+
+There are no parameters for break.
 
 \subsection break-example Example
-The following code searches all .c files for smurfs, and halts at the first occurrence.
+The following code searches all .c files for "smurf", and halts at the first occurrence.
 
 
 for i in *.c
diff --git a/doc_src/breakpoint.txt b/doc_src/breakpoint.txt
index f3332c755..744727fa1 100644
--- a/doc_src/breakpoint.txt
+++ b/doc_src/breakpoint.txt
@@ -5,6 +5,10 @@
 
 \subsection breakpoint-description Description
 
-The \c breakpoint builtin is used to halt a running script and launch
-an interactive debug prompt.
+\c breakpoint is used to halt a running script and launch
+an interactive debugging prompt.
 
+For more details, see Debugging fish
+scripts in the \c fish manual.
+
+There are no parameters for breakpoint.
diff --git a/doc_src/builtin.txt b/doc_src/builtin.txt
index a077a1bf1..fd93f703b 100644
--- a/doc_src/builtin.txt
+++ b/doc_src/builtin.txt
@@ -5,12 +5,12 @@
 
 \subsection builtin-description Description
 
-- -n or --names List the names of all defined builtins
+\c builtin forces the shell to use a builtin command, rather than a function or program.
 
-Prefixing a command with the word 'builtin' forces fish to ignore any functions with the same name.
+The following parameters are available:
+
+- -n or --names List the names of all defined builtins
 
 \subsection builtin-example Example
 
-builtin jobs
-
-causes fish to execute the jobs builtin, even if a function named jobs exists.
+builtin jobs executes the jobs builtin, even if a function named jobs exists.
diff --git a/doc_src/case.txt b/doc_src/case.txt
index 468cc3c49..b5601cdb7 100644
--- a/doc_src/case.txt
+++ b/doc_src/case.txt
@@ -5,27 +5,24 @@
 
 \subsection case-description Description
 
-The \c switch statement is used to perform one of several blocks of
-commands depending on whether a specified value equals one of several
-wildcarded values. The \c case statement is used together with the \c
-switch statement in order to determine which block should be
-performed.
+\c switch performs one of several blocks of commands, depending on whether
+a specified value equals one of several wildcarded values. \c case is used
+together with the \c switch statement in order to determine which block should
+be executed.
 
-Each \c case command is given one or more parameter. The first \c case
+Each \c case command is given one or more parameters. The first \c case
 command with a parameter that matches the string specified in the
 switch command will be evaluated. \c case parameters may contain
 wildcards. These need to be escaped or quoted in order to avoid
 regular wildcard expansion using filenames.
 
-Note that fish does not fall through on case statements. Though the
-syntax may look a bit like C switch statements, it behaves more like
-the case statements of traditional shells.
+Note that fish does not fall through on case statements. Only the
+first matching case is executed.
 
-Also note that command substitutions in a case statement will be
-evaluated even if it's body is not taken. This may seem
-counterintuitive at first, but it is unavoidable, since it would be
-impossible to know if a case command will evaluate to true before all
-forms of parameter expansion have been performed for the case command.
+Note that command substitutions in a case statement will be
+evaluated even if its body is not taken. All substitutions, including
+command substitutions, must be performed before the value can be compared
+against the parameter.
 
 \subsection case-example Example
 
@@ -42,6 +39,7 @@ switch $animal
         echo bird
     case shark trout stingray
         echo fish
+    # Note that the next case has a wildcard which is quoted
     case '*'
         echo I have no idea what a $animal is
 end
diff --git a/doc_src/cd.txt b/doc_src/cd.txt
index 13184e107..c1a5875a4 100644
--- a/doc_src/cd.txt
+++ b/doc_src/cd.txt
@@ -4,8 +4,21 @@
 cd [DIRECTORY]
 
 \subsection cd-description Description
-Changes the current directory. If DIRECTORY is supplied it will become
-the new directory. If \c DIRECTORY is a relative path, the paths found in the
-CDPATH environment variable array will be tried as prefixes for the specified
-path. If CDPATH is not set, it is assumed to be '.'. If \c DIRECTORY is not
-specified, \$HOME will be the new directory.
+\c cd changes the current working directory.
+
+If \c DIRECTORY is supplied, it will become the new directory. If no parameter
+is given, the contents of the \c HOME environment variable will be used.
+
+If \c DIRECTORY is a relative path, the paths found in the
+\c CDPATH environment variable array will be tried as prefixes for the specified
+path.
+
+Note that the shell will attempt to change directory without requiring \c cd
+if the name of a directory is provided (starting with '.', '/' or '~').
+
+\subsection cd-example Examples
+
+\c cd changes the working directory to your home directory.
+
+cd /usr/src/fish-shell changes the working directory to
+/usr/src/fish-shell.
diff --git a/doc_src/command.txt b/doc_src/command.txt
index 885cca5f3..19baccd46 100644
--- a/doc_src/command.txt
+++ b/doc_src/command.txt
@@ -4,11 +4,9 @@
 command COMMANDNAME [OPTIONS...]
 
 \subsection command-description Description
-prefixing a command with the word 'command' forces fish to ignore any functions or builtins with the same name.
+
+\c command forces the shell to execute the program \c COMMANDNAME and ignore any functions or builtins with the same name.
 
 \subsection command-example Example
 
-
-command ls
-
-causes fish to execute the ls program, even if there exists a 'ls' function.
+command ls causes fish to execute the \c ls program, even if an 'ls' function exists.
diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt
index df03ab13f..ab771e96d 100644
--- a/doc_src/commandline.txt
+++ b/doc_src/commandline.txt
@@ -1,32 +1,34 @@
-\section commandline commandline - set or get the current commandline buffer
+\section commandline commandline - set or get the current command line buffer
 
 \subsection commandline-synopsis Synopsis
 commandline [OPTIONS] [CMD]
 
 \subsection commandline-description Description
 
+\c commandline can be used to set or get the current contents of the command
+line buffer.
 
-- \c CMD is the new value of the commandline. If unspecified, the
-  current value of the commandline is written to standard output. All
-  output from the commandline builtin is escaped, i.e. quotes are
-  removed, backslash escapes are expanded, etc..
+With no parameters, \c commandline returns the current value of the command
+line.
 
-The following switches change what the commandline builtin does
+With \c CMD specified, the command line buffer is erased and replaced with
+the contents of \c CMD.
+
+The following options are available:
 
 - \c -C or \c --cursor set or get the current cursor position, not
   the contents of the buffer. If no argument is given, the current
   cursor position is printed, otherwise the argument is interpreted
   as the new cursor position.
 - \c -f or \c --function inject readline functions into the
-  reader. This option can not be combined with any other option. It
+  reader. This option cannot be combined with any other option. It
   will cause any additional arguments to be interpreted as readline
   functions, and these functions will be injected into the reader, so
   that they will be returned to the reader before any additional
   actual key presses are read.
 
-
-The following switches change the way \c commandline updates the
-commandline buffer
+The following options change the way \c commandline updates the
+command line buffer:
 
 - \c -a or \c --append do not remove the current commandline, append
   the specified string at the end of it
@@ -35,29 +37,27 @@ commandline buffer
 - \c -r or \c --replace remove the current commandline and replace it
   with the specified string (default)
 
-The following switches change what part of the commandline is printed
-or updated
+The following options change what part of the commandline is printed
+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.
 
-The following switch changes the way \c commandline prints the current
-commandline buffer
+The following options change the way \c commandline prints the current
+commandline buffer:
 
 - \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
 
 
-If commandline is called during a call to complete a given string
-using complete -C STRING, commandline will consider the
-specified string to be the current contents of the commandline.
+If \c commandline is called during a call to complete a given string
+using complete -C STRING, \c commandline will consider the
+specified string to be the current contents of the command line.
 
 \subsection commandline-example Example
 
-commandline -j $history[3]
-
-replaces the job under the cursor with the third item from the
-commandline history.
+commandline -j $history[3] replaces the job under the cursor with the
+third item from the command line history.
diff --git a/doc_src/complete.txt b/doc_src/complete.txt
index f6d00a154..c2085ccb8 100644
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -1,12 +1,12 @@
-\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] 
 
 \subsection complete-description Description
 
-For an introduction to how to specify completions, see the section Writing your own completions of
+For an introduction to specifying completions, see Writing your own completions in
 the fish manual.
 
 - COMMAND is the name of the command for which to add a completion
diff --git a/doc_src/contains.txt b/doc_src/contains.txt
index 1a08a2ac1..cc7463588 100644
--- a/doc_src/contains.txt
+++ b/doc_src/contains.txt
@@ -5,13 +5,15 @@
 
 \subsection contains-description Description
 
+\c contains tests whether the set \c VALUES contains the string
+KEY. If so, \c contains exits with status 0; if not, it exits
+with status 1.
+
+The following options are available:
+
 - \c -i or \c --index print the word index
 - \c -h or \c --help display this message
 
-Test if the set VALUES contains the string KEY. Return status is 0 if
-yes, 1 otherwise
-
-
 \subsection contains-example Example
 
 for i in ~/bin /usr/local/bin
@@ -21,4 +23,4 @@ for i in ~/bin /usr/local/bin
 end
 

 
-The above code tests if ~/bin and  /usr/local/bin are in the path and if they are not, they are added.
+The above code tests if \c ~/bin and \c /usr/local/bin are in the path and adds them if not.
diff --git a/doc_src/continue.txt b/doc_src/continue.txt
index 470093936..9b1803f56 100644
--- a/doc_src/continue.txt
+++ b/doc_src/continue.txt
@@ -1,13 +1,13 @@
-\section continue continue - skip the rest of the current lap of the innermost currently evaluated loop
+\section continue continue - skip the remainder of the current iteration of the current inner loop
 
 \subsection continue-synopsis Synopsis
 LOOP_CONSTRUCT; [COMMANDS...;] continue; [COMMANDS...;] end
 
 \subsection continue-description Description
-The \c continue builtin is used to skip the current lap of the innermost 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.
+\c continue skips the remainder of the current iteration of the current inner 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 continue-example Example
-The following code removes all tmp files without smurfs.
+The following code removes all tmp files that do not contain the word smurf.
 
 
 for i in *.tmp
diff --git a/doc_src/count.txt b/doc_src/count.txt
index 1484588a8..7923ca00a 100644
--- a/doc_src/count.txt
+++ b/doc_src/count.txt
@@ -5,20 +5,13 @@
 
 \subsection count-description Description
 
-The count builtin prints the number of arguments that were
+count prints the number of arguments that were
 passed to it. This is usually used to find out how many elements an
-environment variable array contains, but this is not the only
-potential usage for the count command.
+environment variable array contains.
 
-The count command does not accept any options, not even '-h'. This way
-the user does not have to worry about an array containing elements
-such as dashes. \c fish performs a special check when invoking the
-count command, and if the user uses a help option, this help page is
-displayed, but if a help option is contained inside of a variable or
-is the result of expansion, it will simply be counted like any other
-argument.
+\c count does not accept any options, including '-h'.
 
-Count exits with a non-zero exit status if no arguments were passed
+\c count exits with a non-zero exit status if no arguments were passed
 to it, and with zero if at least one argument was passed.
 
 \subsection count-example Example
diff --git a/doc_src/dirh.txt b/doc_src/dirh.txt
index efd4ac79f..abc498b87 100644
--- a/doc_src/dirh.txt
+++ b/doc_src/dirh.txt
@@ -4,5 +4,9 @@
 dirh
 
 \subsection dirh-description Description
+
 dirh prints the current directory history. The current position in the
-history is highlighted using $fish_color_history_current.
+history is highlighted using the color defined in the
+fish_color_history_current environment variable.
+
+\c dirh does not accept any parameters.
diff --git a/doc_src/dirs.txt b/doc_src/dirs.txt
index b5b9c0aea..e52381076 100644
--- a/doc_src/dirs.txt
+++ b/doc_src/dirs.txt
@@ -4,4 +4,7 @@
 dirs
 
 \subsection dirs-description Description
-dirs prints the current directory stack.
+dirs prints the current directory stack, as created by the
+pushd command.
+
+\c dirs does not accept any parameters.
diff --git a/doc_src/echo.txt b/doc_src/echo.txt
index cfa9849ef..01ddf5a58 100644
--- a/doc_src/echo.txt
+++ b/doc_src/echo.txt
@@ -3,19 +3,21 @@
 \subsection echo-synopsis Synopsis
  echo [STRING]
 
-\subsection echo-description Description                                                                                                                             
-                                                                                                                                                                          
-Display a line of text.                                                                                                           
-                                                                                                                                                                          
+\subsection echo-description Description
+
+\c echo displays a string of text.
+
+The following options are available:
+
 - \c -n, \c Do not output a newline
-- \c -s, \c Do not separate arguments with spaces                                                                                                                                
+- \c -s, \c Do not separate arguments with spaces
 - \c -E, \c Disable interpretation of backslash escapes (default)
 - \c -e, \c Enable interpretation of backslash escapes
 - \c -h, \c --help Display this help
 
 \subsection echo-escapes Escape Sequences
 
-If -e is in effect, the following sequences are recognized:
+If \c -e is used, the following sequences are recognized:
 
 - \c \\\\ \c backslash
 - \\a alert (BEL)
diff --git a/doc_src/else.txt b/doc_src/else.txt
index e0f8b85bb..66d8be3fe 100644
--- a/doc_src/else.txt
+++ b/doc_src/else.txt
@@ -4,14 +4,18 @@
 if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
 
 \subsection else-description Description
-if will execute the command CONDITION.  If the condition's exit
-status is 0, the commands COMMANDS_TRUE will execute.  If it is not 0 and
-else is given, COMMANDS_FALSE will be executed.  Hint: use
-begin; ...; end for complex conditions.
+if will execute the command \c CONDITION. If the condition's exit
+status is 0, the commands \c COMMANDS_TRUE will execute. If it is not 0 and
+else is given, \c COMMANDS_FALSE will be executed.
 
 \subsection else-example Example
 
-The command if test -f foo.txt; echo foo.txt exists; else; echo foo.txt does not exist; end
-will print foo.txt exists if the file foo.txt
-exists and is a regular file, otherwise it will print
-foo.txt does not exist.
+The following code tests whether a file \c foo.txt exists as a regular file.
+
+
+if test -f foo.txt
+    echo foo.txt exists
+else
+    echo foo.txt does not exist
+end
+

diff --git a/doc_src/emit.txt b/doc_src/emit.txt
index c0faab82f..f00e42339 100644
--- a/doc_src/emit.txt
+++ b/doc_src/emit.txt
@@ -5,7 +5,7 @@
 
 \subsection emit-description Description
 
-The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers. The arguments are passed to the event handlers as function arguments. 
+\c emit emits, or fires, an event. Events are delivered to, or caught by, special functions called event handlers. The arguments are passed to the event handlers as function arguments.
 
 \subsection emit-example Example
 
diff --git a/doc_src/end.txt b/doc_src/end.txt
index 5849e339c..2d301e339 100644
--- a/doc_src/end.txt
+++ b/doc_src/end.txt
@@ -10,7 +10,9 @@ switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 

 
 \subsection end-description Description
-end ends a block of commands. For more information, read the
+end ends a block of commands.
+
+For more information, read the
 documentation for the block constructs, such as \c if, \c for and \c
 while.
 
diff --git a/doc_src/eval.txt b/doc_src/eval.txt
index 68fc6fc93..0227255a0 100644
--- a/doc_src/eval.txt
+++ b/doc_src/eval.txt
@@ -4,13 +4,16 @@
 eval [COMMANDS...]
 
 \subsection eval-description Description
-The eval function causes fish to evaluate the specified parameters as a command. If more than one parameter is specified, all parameters will be joined using a space character as a separator.
+eval evaluates the specified parameters as a command. If more than one parameter is specified, all parameters will be joined using a space character as a separator.
 
 \subsection eval-example Example
 
+The folloing code will call the ls command. Note that \c fish does not
+support the use of environment variables as direct commands; \c eval can
+be used to work around this.
+
 
 set cmd ls
 eval $cmd
 

 
-will call the ls command.
diff --git a/doc_src/exec.txt b/doc_src/exec.txt
index e0e661fb2..27f6d8876 100644
--- a/doc_src/exec.txt
+++ b/doc_src/exec.txt
@@ -5,11 +5,11 @@
 
 \subsection exec-description Description
 
-The \c exec builtin is used to replace the currently running shells
-process image with a new command. On successful completion, exec never
-returns. exec can not be used inside a pipeline.
+\c exec replaces the currently running shell with a new command.
+On successful completion, \c exec never returns. \c exec cannot be used
+inside a pipeline.
 
 \subsection exec-example Example
 
-exec emacs starts up the emacs text editor. When emacs exits,
-the session will terminate.
+exec emacs starts up the emacs text editor, and exits \c fish.
+When emacs exits, the session will terminate.
diff --git a/doc_src/exit.txt b/doc_src/exit.txt
index aa96fe95c..cdcf54d46 100644
--- a/doc_src/exit.txt
+++ b/doc_src/exit.txt
@@ -1,13 +1,13 @@
-\section exit exit - exit the shell.
+\section exit exit - exit the shell
 
 \subsection exit-synopsis Synopsis
 exit [STATUS]
 
 \subsection exit-description Description
 
-The exit builtin causes fish to exit. If STATUS is
+\c exit causes fish to exit. If STATUS is
 supplied, it will be converted to an integer and used as the exit
-code. Otherwise the exit code will be that of the last command executed.
+code. Otherwise, the exit code will be that of the last command executed.
 
 If exit is called while sourcing a file (using the . builtin) the rest of the file will be skipped,
diff --git a/doc_src/fg.txt b/doc_src/fg.txt
index db983ee9a..53b5154f6 100644
--- a/doc_src/fg.txt
+++ b/doc_src/fg.txt
@@ -1,14 +1,14 @@
-\section fg fg - send job to foreground
+\section fg fg - bring job to foreground
 
 \subsection fg-synopsis Synopsis
 fg [PID]
 
 \subsection fg-description Description
-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.
+\c fg brings the specified job to the foreground, resuming it if it is stopped. 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 expansion.
 
 \subsection fg-example Example
 
-fg \%0 will put the job with job id 0 in the foreground.
+fg \%1 will put the job with job ID 1 in the foreground.
diff --git a/doc_src/fish.txt b/doc_src/fish.txt
index faa69a14c..ed28cffde 100644
--- a/doc_src/fish.txt
+++ b/doc_src/fish.txt
@@ -5,10 +5,12 @@ fish [-h] [-v] [-c command] [FILE [ARGUMENTS...]]
 
 \subsection fish-description Description
 
-A commandline shell written mainly with interactive use in mind. The
+\c fish is a command-line shell written mainly with interactive use in mind. The
 full manual is available in HTML by using the
 help command from inside fish.
 
+The following options are available:
+
 - -c or --command=COMMANDS evaluate the specified commands instead of reading from the commandline
 - -d or --debug-level=DEBUG_LEVEL specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
 - -h or --help display help and exit
diff --git a/doc_src/fish_config.txt b/doc_src/fish_config.txt
index 78191477a..a9627bb23 100644
--- a/doc_src/fish_config.txt
+++ b/doc_src/fish_config.txt
@@ -1,5 +1,22 @@
-\section fish_config fish_config - Start up the web-based configuration interface
+\section fish_config fish_config - start the web-based configuration interface
 
 \subsection fish_config-description Description
 
-This command starts up the web-based configuration interface, which allows you to edit your colors and view your functions, variables, and history.
+\c fish_config starts the web-based configuration interface.
+
+The web interface allows you to view your functions, variables and history, and
+to make changes to your prompt and color configuration.
+
+\c fish_config starts a local web server and then opens a web browser window; when
+you have finished, close the browser window and then press the Enter key to
+terminate the configuration session.
+
+There are no parameters for fish_config.
+
+If the \c BROWSER environment variable is set, it will be used as the name
+of the web browser to open instead of the system default.
+
+\subsection fish_config-example Example
+
+\c fish_config opens a new web browser window and allows you to configure certain
+fish settings.
diff --git a/doc_src/fish_indent.txt b/doc_src/fish_indent.txt
index 68d0647c9..c5daeace9 100644
--- a/doc_src/fish_indent.txt
+++ b/doc_src/fish_indent.txt
@@ -5,11 +5,11 @@
 
 \subsection fish_indent-description Description
 
-\c fish_indent is used to indent or otherwise prettify a piece of fish
+\c fish_indent is used to indent a piece of fish
 code. \c fish_indent reads commands from standard input and outputs
 them to standard output.
 
-\c fish_indent understands the following options:
+The following options are available:
 
 - -h or --help displays this help message and then exits
 - -i or --no-indent do not indent commands
diff --git a/doc_src/fish_pager.txt b/doc_src/fish_pager.txt
index 304f62140..9efa26b11 100644
--- a/doc_src/fish_pager.txt
+++ b/doc_src/fish_pager.txt
@@ -2,7 +2,6 @@
 
 \subsection fish_pager-description Description
 
-This command is used internally by fish to display a list of
-completions. It should not be used by other commands, as it's
-interface is liable to change in the future.
+\c fish_pager is used internally by fish. It should not be used by other
+commands, as its interface is liable to change in the future.
 
diff --git a/doc_src/fish_prompt.txt b/doc_src/fish_prompt.txt
index d400619c8..5cf5abf9e 100644
--- a/doc_src/fish_prompt.txt
+++ b/doc_src/fish_prompt.txt
@@ -11,7 +11,10 @@ By defining the \c fish_prompt function, the user can choose a custom
 prompt. The \c fish_prompt function is executed when the prompt is to
 be shown, and the output is used as a prompt.
 
-The exit status of commands within \c fish_prompt will not modify the $status seen outside of fish_prompt.
+The exit status of commands within \c fish_prompt will not modify the value of $status outside of the \c fish_prompt function.
+
+\c fish ships with a number of example prompts that can be chosen with the
+\c fish_config command.
 
 \subsection fish_prompt-example Example
 
diff --git a/doc_src/fish_update_completions.txt b/doc_src/fish_update_completions.txt
index 1369f9d11..cff5ce0b5 100644
--- a/doc_src/fish_update_completions.txt
+++ b/doc_src/fish_update_completions.txt
@@ -1,6 +1,9 @@
-\section fish_update_completions fish_update_completions - Update man-page completions
+\section fish_update_completions fish_update_completions - Update completions using manual pages
 
 \subsection fish_update_completions-description Description
 
-This command parses your installed man pages and writes completion files to the fish config directory. This does not overwrite custom completions.
+\c fish_update_completions parses manual pages installed on the system, and attempts to create completion files in the \c fish configuration directory.
 
+This does not overwrite custom completions.
+
+There are no parameters for fish_update_completions.
diff --git a/doc_src/fishd.txt b/doc_src/fishd.txt
index 074e8f5d8..0eb3088a4 100644
--- a/doc_src/fishd.txt
+++ b/doc_src/fishd.txt
@@ -6,26 +6,28 @@
 \subsection fishd-description Description
 
 The \c fishd daemon is used to load, save and distribute universal
-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 clients, such as fish,
-When no clients are connected, fishd will automatically shut down.
+variable information. \c fish automatically connects to \c fishd via a socket
+on startup.
+
+\c fishd is started and stopped automatically.
+
+The following options are available if starting \c fishd manually:
 
 - -h or --help displays this help message and then exits
 - -v or --version displays the current fish version and then exits
 
 \subsection fishd-files Files
 
-\c ~/.config/fish/fishd.MACHINE_ID permanent storage location for universal
-variable data. MACHINE_ID is generally based on the machine's MAC address.
-The data is stored as a set of \c set and \c set_export commands such as
-would be parsed by fishd. The file must always be stored in ASCII format.
-If an instance of fishd is running (which is generally the case), manual
-modifications to ~/.fishd.MACHINE_ID will be lost. Do NOT edit this file manually!
+- \c ~/.config/fish/fishd.MACHINE_ID - permanent storage location for universal
+  variable data. \c MACHINE_ID is generally based on the machine's MAC address.
 
-\c /tmp/fishd.socket.USERNAME the socket which fishd uses to communicate
+  The data is stored as a set of \c set and \c set_export commands such as
+  would be parsed by fishd. The file must always be stored in YAML format.
+  If an instance of fishd is running (which is generally the case), manual
+  modifications to \c ~/.fishd.MACHINE_ID will be lost. Do NOT edit this file manually!
+
+- \c /tmp/fishd.socket.USERNAME - the socket which fishd uses to communicate
 with all clients.
 
-/tmp/fishd.log.USERNAME the fishd log file
+- /tmp/fishd.log.USERNAME - the fishd log file
 
diff --git a/doc_src/for.txt b/doc_src/for.txt
index 2ffffe40a..67a46fc39 100644
--- a/doc_src/for.txt
+++ b/doc_src/for.txt
@@ -5,8 +5,8 @@
 
 \subsection for-description Description
 for is a loop construct. It will perform the commands specified by
-COMMANDS multiple times. Each time the environment variable specified by
-VARNAME is assigned a new value from VALUES. If VALUES is empty, COMMANDS will
+\c COMMANDS multiple times. On each iteration, the environment variable specified by
+\c VARNAME is assigned a new value from \c VALUES. If \c VALUES is empty, \c COMMANDS will
 not be executed at all.
 
 \subsection for-example Example
diff --git a/doc_src/funced.txt b/doc_src/funced.txt
index 19a12f3b0..8b070b97a 100644
--- a/doc_src/funced.txt
+++ b/doc_src/funced.txt
@@ -5,13 +5,14 @@
 
 \subsection funced-description Description
 
-Use the funced command to edit the definition of a function. If there is no
-function with the name specified, a skeleton function is inserted. If the
-function exists, its definition will be shown in your editor or on the command
-line.
+\c funced provides an interface to edit the definition of the function
+NAME.
 
-By default, funced edits functions using the text editor in your $EDITOR
-variable, if set; otherwise it uses the built-in editor.
+If the \c $EDITOR environment variable is set, it will be used as the program
+to edit the function. Otherwise, a built-in editor will be used.
+
+If there is no function called \c NAME a new function will be created with
+the specified name
 
 - -e command or --editor command Open the function
   body inside the text editor given by the command (for example, "vi"). The
diff --git a/doc_src/funcsave.txt b/doc_src/funcsave.txt
index 944e699c0..c81961bf2 100644
--- a/doc_src/funcsave.txt
+++ b/doc_src/funcsave.txt
@@ -1,12 +1,13 @@
 \section funcsave funcsave - save the definition of a function to the user's autoload directory
 
 \subsection funcsave-synopsis Synopsis
- funcsave FUNCTION_NAME
+funcsave FUNCTION_NAME
 
 \subsection funcsave-description Description
 
-funcsave is used to save the current definition of a function to
-a file which will be autoloaded by current and future fish
+\c funcsave saves the current definition of a function to
+a file in the fish configuration directory. This function will be automatically
+loaded by current and future fish
 sessions. This can be useful if you have interactively created a new
 function and wish to save it for later use.
 
diff --git a/doc_src/function.txt b/doc_src/function.txt
index 10d9eec05..c072c5518 100644
--- a/doc_src/function.txt
+++ b/doc_src/function.txt
@@ -5,32 +5,28 @@
 
 \subsection function-description Description
 
-- -d DESCRIPTION or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
+\c function creates a new function \c NAME with the body BODY.
+
+A function is a list of commands that will be executed when the name of the
+function is given as a command.
+
+The following options are available:
+
+- -d DESCRIPTION or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description.
 - -e or --on-event EVENT_NAME tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt.
-- -j PID or  --on-job-exit PID tells fish to run this function when the job with group id PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
-- -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 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
-
-
-function hi
-	echo hello
-end
-

-
-will write hello whenever the user enters \c hi.
+- -j PID or  --on-job-exit PID tells fish to run this function when the job with group ID PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
+- -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 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.
 
 If the user enters any additional arguments after the function, they
-are inserted into the environment variable array argv.
+are inserted into the environment variable array
+$argv.
 
 By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the emit builtin. Fish generates the following named events:
 
-- \c fish_prompt, which is emitted whenever a new fish prompt is about to be displayed
-- \c fish_command_not_found, which is emitted whenever a command lookup failed
+- \c fish_prompt, which is emitted whenever a new fish prompt is about to be displayed.
+- \c fish_command_not_found, which is emitted whenever a command lookup failed.
 
 \subsection function-example Example
 
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 928cd545a..c1f0115e4 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -1,31 +1,51 @@
 \section functions functions - print or erase functions
 
 \subsection function-synopsis Synopsis
-functions [-e] FUNCTIONS...
+
functions [-n]
+functions -c OLDNAME NEWNAME
+functions -d DESCRIPTION FUNCTION
+functions [-eq] FUNCTIONS...

 
 \subsection functions-description Description
 
-This builtin command is used to print or erase functions.
+\c functions prints or erases functions.
 
-- -a or --all list all functions, even those whose name start with an underscore.
+The following options are available:
+
+- -a or --all lists all functions, even those whose name start with an underscore.
 - -c OLDNAME NEWNAME or --copy OLDNAME NEWNAME creates a new function named NEWNAME, using the definition of the OLDNAME function.
-- -d DESCRIPTION or --description=DESCRIPTION change the description of this function
+- -d DESCRIPTION or --description=DESCRIPTION changes the description of this function.
 - -e or --erase causes the specified functions to be erased.
-- -h or --help display a help message and exit
-- -n or --names list only the names of all defined functions, not their definition
-- -q or --query test if the specified functions exist. Does not output anything, but the builtins exit status is the number of functions specified that were not defined.
+- -h or --help displays a help message and exits.
+- -n or --names lists the names of all defined functions.
+- -q or --query tests if the specified functions exist.
 
-The default behavior of \c functions when called with no arguments,
-is to print the names and definitions of all defined functions. If any
-non-switch parameters are given, only the definition of the specified
+The default behavior of functions, when called with no arguments,
+is to print the names of all defined functions. Unless the \c -a option is
+given, no functions starting with underscores are not included in the output.
+
+If any non-option parameters are given, the definition of the specified
 functions are printed.
 
-Automatically loaded functions can not be removed using functions
--e. Either remove the definition file or change the
+Automatically loaded functions cannot be removed using functions
+-e. Either remove the definition file or change the
 $fish_function_path variable to remove autoloaded functions.
 
-Function copies, created with -c, will not have any event/signal/on-exit 
-notifications that the original may have had.
+Copying a function using \c -c copies only the body of the function, and
+does not attach any event notifications from the original function.
 
-The exit status of the functions builtin is the number functions
-specified in the argument list that do not exist.
+Only one function's description can be changed in a single invocation
+of functions -d.
+
+The exit status of \c functions is the number of functions
+specified in the argument list that do not exist, which can be used in
+concert with the \c -q option.
+
+\subsection functions-example Examples
+
+functions -n displays a list of currently-defined functions.
+
+functions -c foo bar copies the \c foo function to a new function called
+bar.
+
+functions -e bar erases the function bar.
diff --git a/doc_src/help.txt b/doc_src/help.txt
index 3dc90e9a8..c4c053826 100644
--- a/doc_src/help.txt
+++ b/doc_src/help.txt
@@ -5,12 +5,14 @@
 
 \subsection help-description Description
 
-The \c help command is used to display a section of the fish help documentation.
+\c help displays the fish help documentation.
+
+If a \c SECTION is specified, the help for that command is shown.
 
 If the BROWSER environment variable is set, it will be used to display the
-documentation, otherwise fish will search for a suitable browser.
+documentation. Otherwise, fish will search for a suitable browser.
 
-Note also that most builtin commands display their help in the terminal when
+Note that most builtin commands display their help in the terminal when
 given the --help option.
 
 \subsection help-example Example
diff --git a/doc_src/history.txt b/doc_src/history.txt
index 8f7b69164..33ee4d662 100644
--- a/doc_src/history.txt
+++ b/doc_src/history.txt
@@ -1,4 +1,4 @@
-\section history history - Show and manipulate user's command history 
+\section history history - Show and manipulate command history
 
 \subsection history-synopsis Synopsis
 
@@ -8,29 +8,37 @@ history (--search | --delete ) (--prefix "prefix string" | --contains "search st
 
 \subsection history-description Description
 
-history is used to list, search and delete user's command history
+\c history is used to list, search and delete the history of commands used.
+
+The following options are available:
+
+- \c --save saves all changes in the history file. The shell automatically
+saves the history file; this option is provided for internal use.
+- \c --clear clears the history file. A prompt is displayed before the history
+is erased.
+- \c --search returns history items in keeping with the \c --prefix or
+\c --contains options.
+- \c --delete deletes history items.
+- \c --prefix searches or deletes items in the history that begin with the
+specified text string.
+- \c --contains searches or deletes items in the history that contain the
+specified text string.
+
+If \c --search is specified without \c --contains or --prefix,
+\c --contains will be assumed.
+
+If \c --delete is specified without \c --contains or --prefix,
+only a history item which exactly matches the parameter will be erased. No
+prompt will be given. If \c --delete is specified with either of these
+parameters, an interactive prompt will be displayed before any items are
+deleted.
 
 \subsection history-examples Example
 
-
-history --save
-Save all changes in history file
+history --clear deletes all history items
 
-history --clear
-Delete all history items
+history --search --contains "foo" outputs a list of all previous
+commands containing the string "foo".
 
-history --search --contains "foo"
-Searches commands containing "foo" string
-
-history --search --prefix "foo"
-Searches for commands with prefix "foo"
-
-history --delete --contains "foo"
-Interactively delete commands containing string "foo"
-
-history --delete --prefix "foo"
-Interactively delete commands with prefix "foo"
-
-history --delete "foo"
-Delete command "foo" from history
-

+history --delete --prefix "foo" interactively deletes the record
+of previous commands which start with "foo".
diff --git a/doc_src/if.txt b/doc_src/if.txt
index dae82ca6c..94d2763a6 100644
--- a/doc_src/if.txt
+++ b/doc_src/if.txt
@@ -5,15 +5,15 @@
 
 \subsection if-description Description
 
-if will execute the command CONDITION.  If the condition's
-exit status is 0, the commands COMMANDS_TRUE will execute.  If the
-exit status is not 0 and else is given, COMMANDS_FALSE will
+if will execute the command \c CONDITION. If the condition's
+exit status is 0, the commands \c COMMANDS_TRUE will execute.  If the
+exit status is not 0 and else is given, \c COMMANDS_FALSE will
 be executed.
 
 In order to use the exit status of multiple commands as the condition
 of an if block, use begin; ...; end and
-the short circuit commands and and or.
+the short circuit commands and
+and or.
 
 The exit status of the last foreground command to exit can always be
 accessed using the $status
diff --git a/doc_src/isatty.txt b/doc_src/isatty.txt
index bccf8ab86..d3b52892c 100644
--- a/doc_src/isatty.txt
+++ b/doc_src/isatty.txt
@@ -4,12 +4,11 @@
  isatty [FILE DESCRIPTOR]
 
 \subsection isatty-description Description
-The isatty command is used to test if a file descriptor is a tty.
+isatty tests if a file descriptor is a tty.
 
-FILE DESCRIPTOR may be either the number of a file descriptor, or one of the
-strings stdin, stdout and stderr.
+FILE DESCRIPTOR may be either the number of a file descriptor, or one of the
+strings stdin, \c stdout and stderr.
 
 If the specified file descriptor is a tty, the exit status of the command is
-zero, otherwise, it is non-zero.
-
+zero. Otherwise, it is non-zero.
 
diff --git a/doc_src/jobs.txt b/doc_src/jobs.txt
index d4ea33dd3..8b96d1278 100644
--- a/doc_src/jobs.txt
+++ b/doc_src/jobs.txt
@@ -4,18 +4,22 @@
 jobs [OPTIONS] [PID]
 
 \subsection jobs-description Description
-The jobs builtin causes fish to print a list of the currently
-running jobs and their status.
+jobs prints a list of the currently
+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
-- -h or --help display a help message and exit
-- -l or --last only the last job to be started is printed
-- -p or --pid print the process id for each process in all jobs
+- -c or --command prints the command name for each process in jobs.
+- -g or --group only prints the group ID of each job.
+- -h or --help displays a help message and exits.
+- -l or --last prints only the last job to be started.
+- -p or --pid prints 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
 expressed as a percentage of full CPU activity. Note that on
 multiprocessor systems, the total activity may be more than 100\%.
+
+\subsection jobs-example Example
+
+jobs outputs a summary of the current jobs.
diff --git a/doc_src/math.txt b/doc_src/math.txt
index 9455e0da0..9904a2cce 100644
--- a/doc_src/math.txt
+++ b/doc_src/math.txt
@@ -6,10 +6,10 @@
 
 \subsection math-description Description
 
-math is used to perform mathematical calculations. It is only a very
-thin wrapper for the bc program, that makes it possible to specify an
+\c math is used to perform mathematical calculations. It is a very
+thin wrapper for the bc program, which makes it possible to specify an
 expression from the command line without using non-standard extensions
-or a pipeline. Simply use a command like math 1+1.
+or a pipeline.
 
 For a description of the syntax supported by math, see the manual for
 the bc program. Keep in mind that parameter expansion takes place on
@@ -18,3 +18,9 @@ order to perform calculations involving environment variables or the
 output of command substitutions, but it also means that parenthesis
 have to be escaped.
 
+\subsection math-example Examples
+
+math 1+1 outputs 2.
+
+math $status-128 outputs the numerical exit status of the
+last command minus 128.
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index 6a4e99446..e38597ebc 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -5,21 +5,22 @@
 
 \subsection mimedb-description Description
 
-- \c FILES is a list of files to analyse
-- \c -t, \c --input-file-data the specified files type should be determined both by their filename and by their contents (Default)
-- \c -f, \c --input-filename the specified files type should be determined by their filename
-- \c -i, \c --input-mime the arguments are not files but mimetypes
-- \c -m, \c --output-mime the output will be the mimetype of each file (Default)
-- \c -f, \c --output-description the output will be the description of each mimetype
-- \c -a, \c --output-action the output will be the default action of each mimetype
-- \c -l, \c --launch launch the default action for the specified file(s)
-- \c -h, \c --help display a help message and exit
-- \c -v, \c --version display version number and exit
+\c mimedb queries the MIME type database and the \c .desktop files
+installed on the system in order to find information on
+the files listed in FILES. The information that \c mimedb
+can retrieve includes the MIME type for a file, a description of the type,
+and the default action that can be performed on the file. \c mimedb can also
+be used to launch the default action for this file.
 
-The mimedb command is used to query the mimetype database and the
-.desktop files installed on the system in order to find information on
-a file. The information that mimedb can retrieve includes the mimetype
-for a file, a description of the type and what its default action
-is. mimedb can also be used to launch the default action for this
-file.
+The following options are available:
+
+- \c -t, \c --input-file-data determines the files' type both by their filename and by their contents (default behaviour).
+- \c -f, \c --input-filename determines the files' type by their filename.
+- \c -i, \c --input-mime specifies that the arguments are not files, but MIME types.
+- \c -m, \c --output-mime outputs the MIME type of each file (default behaviour).
+- \c -f, \c --output-description outputs the description of each MIME type.
+- \c -a, \c --output-action outputs the default action of each MIME type.
+- \c -l, \c --launch launches the default action for the specified files.
+- \c -h, \c --help displays a help message and exit.
+- \c -v, \c --version displays the version number and exits.
 
diff --git a/doc_src/nextd.txt b/doc_src/nextd.txt
index 5adbc915f..dba94ce02 100644
--- a/doc_src/nextd.txt
+++ b/doc_src/nextd.txt
@@ -1,10 +1,22 @@
 \section nextd nextd - move forward through directory history
 
 \subsection nextd-synopsis Synopsis
-nextd [-l | --list] [pos]
+nextd [-l | --list] [POS]
 
 \subsection nextd-description Description
-nextd moves forwards pos positions in the history of visited
-directories; if the end of the history has been hit, a warning is printed. If
-the -l> or --list flag is specified, the current
-history is also displayed.
+nextd moves forwards POS positions in the history of visited
+directories; if the end of the history has been hit, a warning is printed.
+
+If the -l> or --list flag is specified, the current
+directory history is also displayed.
+
+\subsection nextd-example Example
+
+
cd /usr/src
+# Working directory is now /usr/src
+cd /usr/src/fish-shell
+# Working directory is now /usr/src/fish-shell
+prevd
+# Working directory is now /usr/src
+nextd
+# Working directory is now /usr/src/fish-shell

diff --git a/doc_src/not.txt b/doc_src/not.txt
index bb053da74..a1a1d2063 100644
--- a/doc_src/not.txt
+++ b/doc_src/not.txt
@@ -5,11 +5,13 @@
 
 \subsection not-description Description
 
-The \c not builtin is used to negate the exit status of another command.
+\c not negates the exit status of another command. If the exit status
+is zero, \c not returns 1. Otherwise, \c not returns 0.
 
 \subsection not-example Example
 
 The following code reports an error and exits if no file named spoon can be found.
+
 
 if not test -f spoon
 	echo There is no spoon
diff --git a/doc_src/open.txt b/doc_src/open.txt
index 0a4b89585..4dc03f9b7 100644
--- a/doc_src/open.txt
+++ b/doc_src/open.txt
@@ -5,7 +5,7 @@
 
 \subsection open-description Description
 
-The \c open command is used to open a file in its default application. \c open is implemented using the \c xdg-open command if it exists, or else the mimedb command.
+\c open opens a file in its default application, using the \c xdg-open command if it exists, or else the mimedb command.
 
 \subsection open-example Example
 
diff --git a/doc_src/or.txt b/doc_src/or.txt
index a33cb50d7..3567917f9 100644
--- a/doc_src/or.txt
+++ b/doc_src/or.txt
@@ -5,10 +5,10 @@
 
 \subsection or-description Description
 
-The \c or builtin is used to execute a command if the current exit
+\c or is used to execute a command if the current exit
 status (as set by the last previous command) is not 0.
 
-The or command does not change the current exit status.
+\c or does not change the current exit status.
 
 The exit status of the last foreground command to exit can always be
 accessed using the $status
@@ -16,10 +16,10 @@ variable.
 
 \subsection or-example Example
 
-The following code runs the \c make command to build a program, if the
+The following code runs the \c make command to build a program. If the
 build succeeds, the program is installed. If either step fails,
 make clean is run, which removes the files created by the
-build process
+build process.
 
 
 make; and make install; or make clean
diff --git a/doc_src/popd.txt b/doc_src/popd.txt
index b3c87584d..deb3719f6 100644
--- a/doc_src/popd.txt
+++ b/doc_src/popd.txt
@@ -4,5 +4,21 @@
 popd
 
 \subsection popd-description Description
+
 popd removes the top directory from the directory stack and
-cd's to the new top directory.
+changes the working directory to the new top directory. Use pushd to add directories to the stack.
+
+\subsection popd-example Example
+
+
+pushd /usr/src
+# Working directory is now /usr/src
+# Directory stack contains /usr/src
+pushd /usr/src/fish-shell
+# Working directory is now /usr/src/fish-shell
+# Directory stack contains /usr/src /usr/src/fish-shell
+popd
+# Working directory is now /usr/src
+# Directory stack contains /usr/src
+

diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt
index 83d6b9093..b72fc3752 100644
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -1,11 +1,24 @@
 \section prevd prevd - move backward through directory history
 
 \subsection prevd-synopsis Synopsis
-prevd [-l | --list] [pos]
+prevd [-l | --list] [POS]
 
 \subsection prevd-description Description
 
-prevd moves backwards pos positions in the history
+prevd moves backwards POS positions in the history
 of visited directories; if the beginning of the history has been hit,
-a warning is printed. If the -l or --list
-flag is specified, the current history is also displayed.
+a warning is printed.
+
+If the -l or --list flag is specified, the current
+history is also displayed.
+
+\subsection prevd-example Example
+
+
cd /usr/src
+# Working directory is now /usr/src
+cd /usr/src/fish-shell
+# Working directory is now /usr/src/fish-shell
+prevd
+# Working directory is now /usr/src
+nextd
+# Working directory is now /usr/src/fish-shell

diff --git a/doc_src/psub.txt b/doc_src/psub.txt
index c12278d3e..7f4dbedd4 100644
--- a/doc_src/psub.txt
+++ b/doc_src/psub.txt
@@ -11,12 +11,12 @@ send the output of a command into the calling command, much like
 command substitution, but with the difference that the output is not
 sent through commandline arguments but through a named pipe, with the
 filename of the named pipe sent as an argument to the calling
-program. The psub shellscript function, which when combined with a
+program. \c psub combined with a
 regular command substitution provides the same functionality.
 
-If the \c -f or \c --file switch is given to psub, psub will use a
+If the \c -f or \c --file switch is given to psub, \c psub will use a
 regular file instead of a named pipe to communicate with the calling
-process. This will cause psub to be significantly slower when large
+process. This will cause \c psub to be significantly slower when large
 amounts of data are involved, but has the advantage that the reading
 process can seek in the stream.
 
diff --git a/doc_src/pushd.txt b/doc_src/pushd.txt
index 3093cbaa0..dbcd7f917 100644
--- a/doc_src/pushd.txt
+++ b/doc_src/pushd.txt
@@ -4,6 +4,20 @@
 pushd [DIRECTORY]
 
 \subsection pushd-description Description
-The pushd function adds DIRECTORY to the top of the directory stack
-and makes it the current directory. Use popd to pop it off and
+The pushd function adds \c DIRECTORY to the top of the directory stack
+and makes it the current working directory. popd will pop it off and
 return to the original directory.
+
+\subsection pushd-example Example
+
+
+pushd /usr/src
+# Working directory is now /usr/src
+# Directory stack contains /usr/src
+pushd /usr/src/fish-shell
+# Working directory is now /usr/src/fish-shell
+# Directory stack contains /usr/src /usr/src/fish-shell
+popd
+# Working directory is now /usr/src
+# Directory stack contains /usr/src
+

diff --git a/doc_src/pwd.txt b/doc_src/pwd.txt
index 92bb5e551..138e8dcb1 100644
--- a/doc_src/pwd.txt
+++ b/doc_src/pwd.txt
@@ -1,8 +1,10 @@
-\section pwd pwd - returns the current directory
+\section pwd pwd - output the current working directory
 
 \subsection pwd-synopsis Synopsis
  pwd
 
 \subsection pwd-description Description
 
-Returns the current directory. Note that fish always resolves symbolic links in the current directory path.
+\c pwd outputs (prints) the current working directory.
+
+Note that \c fish always resolves symbolic links in the current directory path.
diff --git a/doc_src/random.txt b/doc_src/random.txt
index ad9b658a0..b6bb9df09 100644
--- a/doc_src/random.txt
+++ b/doc_src/random.txt
@@ -5,10 +5,11 @@
 
 \subsection random-description Description
 
-The \c random command is used to generate a random number in the
-interval 0<=N<32767. If an argument is given, it is used to seed the
-random number generator. This can be useful for debugging purposes,
-where it can be desirable to get the same random number sequence
+\c random outputs a random number from 0 to 32766, inclusive.
+
+If a \c SEED value is provided, it is used to seed the random number
+generator, and no output will be produced. This can be useful for debugging
+purposes, where it can be desirable to get the same random number sequence
 multiple times. If the random number generator is called without first
 seeding it, the current time will be used as the seed.
 
diff --git a/doc_src/read.txt b/doc_src/read.txt
index d69d715b7..1e8aef373 100644
--- a/doc_src/read.txt
+++ b/doc_src/read.txt
@@ -5,27 +5,29 @@
 
 \subsection read-description Description
 
-The read builtin causes fish to read one line from standard
-input and store the result in one or more environment variables.
+read reads one line from standard
+input and stores the result in one or more environment variables.
 
-- -c CMD or --command=CMD specifies that the initial string in the interactive mode command buffer should be CMD.
-- -g or --global specifies that the variables will be made global.
-- -l or --local specifies that the variables will be made local.
+The following options are available:
+
+- -c CMD or --command=CMD sets the initial string in the interactive mode command buffer to CMD.
+- -g or --global makes the variables global (default behaviour).
+- -l or --local makes the variables local.
 - -m NAME or --mode-name=NAME specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available.
-- -p PROMPT_CMD or --prompt=PROMPT_CMD specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is set_color green; echo read; set_color normal; echo "> ".
-- -s or --shell Use syntax highlighting, tab completions and command termination suitable for entering shellscript code
-- -u or --unexport causes the specified environment not to be exported to child processes
-- -U or --universal causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
-- -x or --export causes the specified environment variable to be exported to child processes
+- -p PROMPT_CMD or --prompt=PROMPT_CMD uses the output of the shell command \c PROMPT_CMD as the prompt for the interactive mode. The default prompt command is set_color green; echo read; set_color normal; echo "> ".
+- -s or --shell enables syntax highlighting, tab completions and command termination suitable for entering shellscript code in the interactive mode.
+- -u or --unexport prevents the variables from being exported to child processes (default behaviour).
+- -U or --universal causes the specified environment variable to be made universal.
+- -x or --export exports the variables to child processes.
 
-Read starts by reading a single line of input from stdin, the line is
-then tokenized using the IFS environment variable. Each variable
-specified in VARIABLES is then assigned one tokenized string
-element. If there are more tokens than variables, the complete
-remainder is assigned to the last variable.
+\c read reads a single line of input from stdin, breaks it into tokens
+based on the IFS environment variable, and then assigns one
+token to each variable specified in VARIABLES. If there are more
+tokens than variables, the complete remainder is assigned to the last variable.
 
 \subsection read-example Example
 
-echo hello|read foo
+The following code stores the value 'hello' in the environment variable
+$foo.
 
-Will cause the variable \$foo to be assigned the value hello.
+echo hello|read foo
diff --git a/doc_src/return.txt b/doc_src/return.txt
index 2cfd5ab62..9563cf399 100644
--- a/doc_src/return.txt
+++ b/doc_src/return.txt
@@ -1,19 +1,19 @@
-\section return return - stop the innermost currently evaluated function
+\section return return - stop the current inner function
 
 \subsection return-synopsis Synopsis
 function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end
 
 \subsection return-description Description
 
-The \c return builtin is used to halt a currently running function. It
-is usually added inside of a conditional block such as an if statement or a switch
 statement to conditionally stop the executing function and return to
 the caller, but it can also be used to specify the exit status of a
 function.
 
-- \c STATUS is the return status of the function. If unspecified, the status is unchanged.
-
 \subsection return-example Example
 The following code is an implementation of the false command as a fish function
 
diff --git a/doc_src/set.txt b/doc_src/set.txt
index e46cd9c47..e9e67392e 100644
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -1,4 +1,4 @@
-\section set set - handle environment variables.
+\section set set - display and change environment variables.
 
 \subsection set-synopsis Synopsis
 
@@ -10,31 +10,39 @@ set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME
 set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
 

 
-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
-- -l or --local forces the specified environment variable to be given a scope that is local to the current block, even if a variable with the given name exists and is non-local
-- -g or --global causes the specified environment variable to be given a global scope. Non-global variables disappear when the block they belong to ends
-- -U or --universal causes the specified environment variable to be given a universal scope. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
-- -n or --names List only the names of all defined variables, not their value
-- -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.
-- -u or --unexport causes the specified environment not to be exported to child processes
-- -x or --export causes the specified environment variable to be exported to child processes
-- -L or --long do not abbreviate long values when printing set variables
+
+set manipulates environment
+variables.
 
 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.
 
+With both variable names and values provided, \c set assigns the variable
+VARIABLE_NAME the values VALUES....
+
+The following options control variable scope:
+- -l or --local forces the specified environment variable to be given a scope that is local to the current block, even if a variable with the given name exists and is non-local
+- -g or --global causes the specified environment variable to be given a global scope. Non-global variables disappear when the block they belong to ends
+- -U or --universal causes the specified environment variable to be given a universal scope. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
+- -n or --names List only the names of all defined variables, not their value
+- -u or --unexport causes the specified environment not to be exported to child processes
+- -x or --export causes the specified environment variable to be exported to child processes
+
+The following options are available:
+- -e or --erase causes the specified environment variable to be erased
+- -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.
+- -L or --long do not abbreviate long values when printing set variables
+
 If a variable is set to more than one value, the variable will be an
 array with the specified elements. If a variable is set to zero
 elements, it will become an array with zero elements.
 
 If the variable name is one or more array elements, such as
 PATH[1 3 7], only those array elements specified will be
-changed. When array indices are specified to set, multiple arguments
+changed. When array indices are specified to \c set, multiple arguments
 may be used to specify additional indexes, e.g. set PATH[1]
 PATH[4] /bin /sbin. If you specify a negative index when
 expanding or assigning to an array variable, the index will be
@@ -63,17 +71,17 @@ be specified. That way, a global variable can be erased even if a
 local variable with the same name exists. Scope can not be specified
 when erasing a slice of an array. The innermost scope is always used.
 
-The set command requires all switch arguments to come before any
-non-switch arguments. For example, set flags -l will have
+\c set requires all options to come before any
+other arguments. For example, set flags -l will have
 the effect of setting the value of the variable flags to
 '-l', not making the variable local.
 
-In assignment mode, set exits with a non-zero exit status if variable
+In assignment mode, \c set exits with a non-zero exit status if variable
 assignments could not be successfully performed. If the variable assignments
 were performed, the exit status is unchanged. This allows simultaneous capture
 of the output and exit status of a subcommand, e.g. if set output
 (command). In query mode, the exit status is the number of variables that
-were not found. In erase mode, set exits with a zero exit status in case of
+were not found. In erase mode, \c set exits with a zero exit status in case of
 success, with a non-zero exit status if the commandline was invalid, if the
 variable was write-protected or if the variable did not exist.
 
diff --git a/doc_src/set_color.txt b/doc_src/set_color.txt
index 79eca8e0b..546889cd7 100644
--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -5,37 +5,36 @@
 
 \subsection set_color-description Description
 
-Change the foreground and/or background color of the terminal.
-COLOR is one of black, red, green, brown, yellow, blue, magenta,
+\c set_color changes the foreground and/or background color of the terminal.
+\c COLOR is one of black, red, green, brown, yellow, blue, magenta,
 purple, cyan, white and normal.
 
 If your terminal supports term256 (modern xterms and OS X Lion),
 you can specify an RGB value with three or six hex digits, such
-as A0FF33 or f2f. fish will choose the closest supported color.
+as A0FF33 or f2f. \c fish will choose the closest supported color.
 
-- \c -b, \c --background Set the background color
-- \c -c, \c --print-colors Prints a list of all valid color names
-- \c -h, \c --help Display help message and exit
-- \c -o, \c --bold Set bold or extra bright mode
-- \c -u, \c --underline Set underlined mode
+The following options are available:
 
+- \c -b, \c --background \c COLOR sets the background color.
+- \c -c, \c --print-colors prints a list of all valid color names.
+- \c -h, \c --help displays a help message and exit.
+- \c -o, \c --bold sets bold or extra bright mode.
+- \c -u, \c --underline sets underlined mode.
 
 Calling set_color normal will set the terminal color to
-whatever is the default color of the terminal.
+the default color of the terminal.
 
 Some terminals use the --bold escape sequence to switch to a brighter
 color set. On such terminals, set_color white will result
 in a grey font color, while set_color --bold white will
 result in a white font color.
 
-Not all terminal emulators support all these features. This is not a
-bug in set_color but a missing feature in the terminal emulator.
+Not all terminal emulators support all these features.
 
-set_color uses the terminfo database to look up how to change terminal
+\c set_color uses the terminfo database to look up how to change terminal
 colors on whatever terminal is in use. Some systems have old and
 incomplete terminfo databases, and may lack color information for
-terminals that support it. Download and install the latest version of
-ncurses and recompile fish against it in order to fix this issue.
+terminals that support it.
 
 \subsection set_color-example Examples
 
set_color red; echo "Roses are red"
diff --git a/doc_src/source.txt b/doc_src/source.txt
index d92d1cc96..069583754 100644
--- a/doc_src/source.txt
+++ b/doc_src/source.txt
@@ -5,24 +5,22 @@
 
 \subsection source-description Description
 
-Evaluates the commands of the specified file in the current
+\c . (source) evaluates the commands of the specified file in the current
 shell. This is different from starting a new process to perform the
 commands (i.e. fish < FILENAME) since the commands will be
 evaluated by the current shell, which means that changes in
-environment variables, etc., will remain. If additional arguments are
+environment variables affect the current shell. If additional arguments are
 specified after the file name, they will be inserted into the $argv
 variable.
 
 If no file is specified, or if the file name '-' is used, stdin will
 be read.
 
-The return status of . is the return status of the last job to
+The return status of \c . is the return status of the last job to
 execute. If something goes wrong while opening or reading the file,
-. exits with a non-zero status.
+\c . exits with a non-zero status.
 
 \subsection source-example Example
 
-. ~/.config/fish/config.fish
-
-causes fish to reread its initialization file.
+. ~/.config/fish/config.fish causes fish to re-read its initialization file.
 
diff --git a/doc_src/status.txt b/doc_src/status.txt
index a14ee9195..d6238ae3b 100644
--- a/doc_src/status.txt
+++ b/doc_src/status.txt
@@ -6,16 +6,16 @@
 \subsection status-description Description
 With no arguments, status displays a summary of the current login and job control status of the shell.
 
-The following arguments are available:
-- -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.
-- --is-full-job-control returns 0 if full job control is enabled
-- --is-interactive-job-control returns 0 if interactive job control is enabled
-- --is-no-job-control returns 0 if no job control is enabled
-- -f or --current-filename prints the filename of the currently running script
-- -n or --current-line-number prints the line number of the currently running script
-- -j CONTROLTYPE or --job-control=CONTROLTYPE set the job control type.  Can be one of: none, full, interactive
-- -t or --print-stack-trace prints a stack trace of all function calls on the call stack
-- -h or --help display a help message and exit
+The following options are available:
+- -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 - that is, connected to a keyboard.
+- -l or --is-login returns 0 if fish is a login shell - that is, if fish should perform login tasks such as setting up the PATH.
+- --is-full-job-control returns 0 if full job control is enabled.
+- --is-interactive-job-control returns 0 if interactive job control is enabled.
+- --is-no-job-control returns 0 if no job control is enabled.
+- -f or --current-filename prints the filename of the currently running script.
+- -n or --current-line-number prints the line number of the currently running script.
+- -j CONTROLTYPE or --job-control=CONTROLTYPE sets the job control type, which can be none, full, or interactive.
+- -t or --print-stack-trace prints a stack trace of all function calls on the call stack.
+- -h or --help displays a help message and exit.
diff --git a/doc_src/switch.txt b/doc_src/switch.txt
index cbfb4be9a..7b9b0308e 100644
--- a/doc_src/switch.txt
+++ b/doc_src/switch.txt
@@ -5,27 +5,24 @@
 
 \subsection switch-description Description
 
-The \c switch statement is used to perform one of several blocks of
-commands depending on whether a specified value equals one of several
-wildcarded values. The \c case statement is used together with the \c
-switch statement in order to determine which block should be
-performed.
+\c switch performs one of several blocks of commands, depending on whether
+a specified value equals one of several wildcarded values. \c case is used
+together with the \c switch statement in order to determine which block should
+be executed.
 
-Each \c case command is given one or more parameter. The first \c case
+Each \c case command is given one or more parameters. The first \c case
 command with a parameter that matches the string specified in the
 switch command will be evaluated. \c case parameters may contain
 wildcards. These need to be escaped or quoted in order to avoid
 regular wildcard expansion using filenames.
 
-Note that fish does not fall through on case statements. Though the
-syntax may look a bit like C switch statements, it behaves more like
-the case statements of traditional shells.
+Note that fish does not fall through on case statements. Only the
+first matching case is executed.
 
-Also note that command substitutions in a case statement will be
-evaluated even if it's body is not taken. This may seem
-counterintuitive at first, but it is unavoidable, since it would be
-impossible to know if a case command will evaluate to true before all
-forms of parameter expansion have been performed for the case command.
+Note that command substitutions in a case statement will be
+evaluated even if its body is not taken. All substitutions, including
+command substitutions, must be performed before the value can be compared
+against the parameter.
 
 \subsection switch-example Example
 
diff --git a/doc_src/test.txt b/doc_src/test.txt
index b48790573..600e7ea78 100644
--- a/doc_src/test.txt
+++ b/doc_src/test.txt
@@ -3,41 +3,40 @@
 \subsection test-synopsis Synopsis
  test [EXPRESSION]
 
-\subsection test-description Description                                                                                                                             
-                                                                                                                                                                          
-Tests the expression given and returns true or false.                                                                                                           
+\subsection test-description Description
 
-- \c -h, \c Display this help
-- \c -G, \c File owned by effective group ID
-- \c -L, \c File is symlink
-- \c -O, \c File owned by effective user ID
-- \c -S, \c File is socket
-- \c -a, \c Logical and 
-- \c -b, \c File is block device 
-- \c -c, \c File is character device 
-- \c -d, \c File is a directory
-- \c -e, \c File exists
-- \c -f, \c File is regular 
-- \c -f, \c File is set-group-ID 
-- \c -k, \c File has sticky bit set 
-- \c -n, \c String length is non-zero
-- \c -o, \c Logical or
-- \c -p, \c File is named pipe
-- \c -r, \c File is readable
-- \c -s, \c File size is non-zero
-- \c -t, \c FD is terminal
-- \c -u, \c File set-user-ID bit is set
-- \c -w, \c File is writable
-- \c -x, \c File is executable 
-- \c -z, \c String length is zero
+Tests the expression given and sets the exit status to 0 if true,
+and 1 if false.
+
+The following options are available:
+- \c -h displays a help message and then exits.
+- -L FILE returns true if \c FILE is a symbolic link.
+- -S FILE returns true if \c FILE is a socket.
+- COND1 -a COND2 combines two conditions with a logical and.
+- -b FILE returns true if \c FILE is a block device.
+- -c FILE returns true if \c FILE is a character device.
+- -d FILE returns true if \c FILE is a directory.
+- -e FILE returns true if \c FILE exists.
+- -f FILE returns true if \c FILE is a regular file.
+- -f FILE returns true if \c FILE has set-group-ID bit set.
+- -n STRING returns true if the length of \c STRING is non-zero.
+- COND1 -o COND2 combines two conditions with a logical or.
+- -p FILE returns true if \c FILE is a named pipe.
+- -r FILE returns true if \c FILE is readable.
+- -s FILE returns true if the size of \c FILE is non-zero.
+- -t FD returns true if \c FD is a terminal (TTY).
+- -u FILE returns true if \c FILE has set-user-ID bit set.
+- -w FILE returns true if \c FILE is writable.
+- -x FILE returns true if \c FILE is executable.
+- -z STRING returns true if \c STRING length is zero.
 
 \subsection test-example Example
 
 
-    if test -d "/"
-	echo "Fish is cool"
-    end
+if test -d "/"
+    echo "Fish is cool"
+end
 
 
 
-Because "/" is a directory the expression will evaluate
-to true, and "Fish is cool" will be echoed
+Because "/" is a directory, the expression will evaluate to true, and
+"Fish is cool" will be output.
diff --git a/doc_src/trap.txt b/doc_src/trap.txt
index bd44d4584..aaaa5b2b6 100644
--- a/doc_src/trap.txt
+++ b/doc_src/trap.txt
@@ -5,32 +5,39 @@
 
 \subsection trap-description Description
 
-Trap is a shellscript wrapper around the fish event delivery
-framework. It exists for backwards compatibility with Posix
-shells. For other uses, it is recommended to define a event handler.
 
-- 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
-- \c -p or \c --print print all defined signal handlers
+The following parameters are available:
 
-If ARG and SIGSPEC are both specified, ARG is the command to be
-executed when the signal specified by SIGSPEC is delivered.
+- \c ARG is the command to be executed on signal delivery.
+- \c SIGSPEC is the name of the signal to trap.
+- \c -h or \c --help displays help and exits.
+- \c -l or \c --list-signals prints a list of signal names.
+- \c -p or \c --print prints all defined signal handlers.
 
-If ARG is absent (and there is a single SIGSPEC) or -, each specified
+If \c ARG and \c SIGSPEC are both specified, \c ARG is the command to be
+executed when the signal specified by \c SIGSPEC is delivered.
+
+If \c ARG is absent (and there is a single SIGSPEC) or -, each specified
 signal is reset to its original disposition (the value it had upon
-entrance to the shell).  If ARG is the null string the signal
-specified by each SIGSPEC is ignored by the shell and by the commands
+entrance to the shell).  If \c ARG is the null string the signal
+specified by each \c SIGSPEC is ignored by the shell and by the commands
 it invokes.
 
-If ARG is not present and -p has been supplied, then the trap commands
-associated with each SIGSPEC are displayed. If no arguments are
-supplied or if only -p is given, trap prints the list of commands
+If \c ARG is not present and \c -p has been supplied, then the trap commands
+associated with each \c SIGSPEC are displayed. If no arguments are
+supplied or if only \c -p is given, \c trap prints the list of commands
 associated with each signal.
 
-Signal names are case insensitive and the SIG prefix is optional.
+Signal names are case insensitive and the \c SIG prefix is optional.
 
-The return status is 1 if any SIGSPEC is invalid; otherwise trap
+The return status is 1 if any \c SIGSPEC is invalid; otherwise trap
 returns 0.
+
+\subsection trap-example Example
+
+trap "status --print-stack-trace" SIGUSR1 prints a stack trace
+each time the \c SIGUSR1 signal is sent to the shell.
diff --git a/doc_src/type.txt b/doc_src/type.txt
index dde723644..9b5699f35 100644
--- a/doc_src/type.txt
+++ b/doc_src/type.txt
@@ -1,21 +1,23 @@
-\section type type - indicate how a name would be interpreted if used as a command name
+\section type type - indicate how a command would be interpreted
 
 \subsection type-synopsis Synopsis
- type [OPTIONS] name [name ...]
+ type [OPTIONS] NAME [NAME ...]
 
 \subsection type-description Description
 
-With no options, indicate how each name would be interpreted if used as a command name.
+With no options, \c type indicates how each \c 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 suppresses function and builtin lookup
-- \c -t or \c --type print a string which is one of keyword, function, builtin, or file if name is a 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
+The following options are available:
 
-\c type returns a zero exit status if the specified command was found,
-otherwise the exit status is one.
+- \c -h or \c --help prints help and then exits.
+- \c -a or \c --all prints all of possible definitions of the specified names.
+- \c -f or \c --no-functions suppresses function and builtin lookup.
+- \c -t or \c --type prints keyword, function, builtin, or file if \c NAME is a shell reserved word, function, builtin, or disk file, respectively.
+- \c -p or \c --path returns the name of the disk file that would be executed, or nothing if 'type  -t  name' would not return 'file'.
+- \c -P or \c --force-path returns the name of the disk file that would be executed, or nothing no file with the specified name could be found in the $PATH.
+
+\c type sets the exit status to 0 if the specified command was found,
+and 1 if it could not be found.
 
 \subsection type-example Example
 
diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt
index 6e21eba30..7b4e3c451 100644
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -1,67 +1,66 @@
-\section ulimit ulimit - set or get the shells resource usage limits
+\section ulimit ulimit - set or get resource usage limits
 
 \subsection ulimit-synopsis Synopsis
 ulimit [OPTIONS] [LIMIT]
 
 \subsection ulimit-description Description
 
-The ulimit builtin is used to set the resource usage limits of the
-shell and any processes spawned by it.  If a new limit value is
-omitted, the current value of the limit of the resource is printed.
+\c ulimit builtin sets or outputs the resource usage limits of the
+shell and any processes spawned by it. If a new limit value is
+omitted, the current value of the limit of the resource is printed; otherwise,
+the specified limit is set to the new value.
 
 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. 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
-- -m or --resident-set-size The maximum resident set size
-- -n or --file-descriptor-count The maximum number of open file descriptors (most systems do not allow this value to be set)
-- -s or --stack-size The maximum stack size
-- -t or --cpu-time The maximum amount of cpu time in seconds
-- -u or --process-count The maximum number of processes available to a single user
-- -v or --virtual-memory-size The maximum amount of virtual memory available to the shell. If supported by OS.
+- -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' 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.
+- -m or --resident-set-size: the maximum resident set size.
+- -n or --file-descriptor-count: the maximum number of open file descriptors (most systems do not allow this value to be set).
+- -s or --stack-size: the maximum stack size.
+- -t or --cpu-time: the maximum amount of CPU time in seconds.
+- -u or --process-count: the maximum number of processes available to a single user.
+- -v or --virtual-memory-size The maximum amount of virtual memory available to the shell.
 
 Note that not all these limits are available in all operating systems.
 
 The value of limit can be a number in the unit specified for
-the resource or one of the special values hard, soft, or unlimited,
+the resource or one of the special values hard, soft, or unlimited,
 which stand for the current hard limit, the current soft limit, and no
 limit, respectively.
 
 If limit is given, it is the new value of the specified resource. If
-no option is given, then -f is assumed. Values are in kilobytes,
-except for -t, which is in seconds and -n and -u, which are unscaled
+no option is given, then \c -f is assumed. Values are in kilobytes,
+except for \c -t, which is in seconds and \c -n and \c -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.
 
-ulimit also accepts the following switches that determine what type of
+\c ulimit also accepts the following switches that determine what type of
 limit to set:
 
-- -H or --hard Set hard resource limit
-- -S or --soft Set soft resource limit
+- -H or --hard sets hard resource limit
+- -S or --soft sets soft resource limit
 
-A hard limit can only be decreased, once it is set it can not be
+A hard limit can only be decreased. Once it is set it cannot 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:
+The following additional options are also understood by ulimit:
 
-- -a or --all Print all current limits
-- -h or --help Display help and exit
+- -a or --all prints all current limits
+- -h or --help displays help and exits.
 
-The fish implementation of ulimit should behave identically to the
+The \c fish implementation of \c 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. Fish does not do this because it this method of determining pipe size 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
+- Fish \c ulimit supports GNU-style long options for all switches
+- Fish \c ulimit does not support the \c -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 size is unreliable. Depending on bash version, there may also be further additional limits to set in bash that do not exist in fish.
+- Fish \c ulimit does not support getting or setting multiple limits in one command, except reporting all values using the -a switch
 
 \subsection ulimit-example Example
 
-ulimit -Hs 64
-
-would set the hard stack size limit to 64 kB:
+ulimit -Hs 64 sets the hard stack size limit to 64 kB.
 
diff --git a/doc_src/umask.txt b/doc_src/umask.txt
index 0a75e3db7..bc9aac0c1 100644
--- a/doc_src/umask.txt
+++ b/doc_src/umask.txt
@@ -1,17 +1,31 @@
-\section umask umask - set or get the file-creation mask
+\section umask umask - set or get the file creation mode mask
 
 \subsection umask-synopsis Synopsis
 umask [OPTIONS] [MASK]
 
 \subsection umask-description Description
 
-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.
+\c umask displays and manipulates the "umask", or file creation mode mask,
+which is used to restrict the default access to files.
 
-If a symbolic mask is specified, the actual file permission bits, and
+The umask may be expressed either as an octal number, which represents
+the rights that will be removed by default, or symbolically, which represents
+the only rights that will be granted by default.
+
+Access rights are explained in the manual page for the \c chmod(1) program.
+
+With no parameters, the current file creation mode mask is printed as
+an octal number.
+
+- -h or --help prints this message.
+- -S or --symbolic prints the umask in symbolic form instead of octal form.
+- -p or --as-command outputs the umask in a form that may be reused as input
+
+If a numeric mask is specified as a parameter, the current shell's umask
+will be set to that value, and the rights specified by that mask will be
+removed from new files and directories by default.
+
+If a symbolic mask is specified, the desired permission bits, and
 not the inverse, should be specified. A symbolic mask is a comma
 separated list of rights. Each right consists of three parts:
 
@@ -34,12 +48,7 @@ and \c =, respectively. As an example, r,u+w means all
 users should have read access and the file owner should also have
 write access.
 
-- -h or --help print this message
-- -S or --symbolic prints the file-creation mask in symbolic form instead of octal form. Use man chmod for more information.
-- -p or --as-command prints any output in a form that may be reused as input
-
-The umask implementation in fish should behave identically to the one
-in bash.
+Note that symbolic masks currently do not work as intended.
 
 \subsection umask-example Example
 
diff --git a/doc_src/vared.txt b/doc_src/vared.txt
index 9f1cef531..609172d78 100644
--- a/doc_src/vared.txt
+++ b/doc_src/vared.txt
@@ -5,8 +5,8 @@
 
 \subsection vared-description Description
 
-vared is used to interactively edit the value of an environment
-variable. Array variables as a whole can not be edited using vared,
+\c vared is used to interactively edit the value of an environment
+variable. Array variables as a whole can not be edited using \c vared,
 but individual array elements can.
 
 \subsection vared-example Example
diff --git a/doc_src/while.txt b/doc_src/while.txt
index 1ec643d2f..496c36c22 100644
--- a/doc_src/while.txt
+++ b/doc_src/while.txt
@@ -4,16 +4,18 @@
 while CONDITION; COMMANDS...; end
 
 \subsection while-description Description
-The while builtin causes fish to continually execute CONDITION and
-execute COMMANDS as long as CONDITION returned with status 0. If CONDITION is
-false on the first time, COMMANDS will not be executed at all. Hints: use
-begin; ...; end for complex conditions; more
+while repeatedly executes CONDITION, and if the exit status
+is 0, then executes COMMANDS.
+
+If the exit status of \c CONDITION is non-zero on the first iteration,
+\c COMMANDS will not be executed at all.
+
+Use begin; ...; end for complex conditions; more
 complex control can be achieved with while true containing a
 break.
 
 \subsection while-example Example
 
 while test -f foo.txt; echo file exists; sleep 10; end
-
-causes fish to print the line 'file exists' at 10 second intervals as long as
+outputs 'file exists' at 10 second intervals as long as
 the file foo.txt exists.

From 30af350be0b98987dc5554cab76de9c6dbc225d4 Mon Sep 17 00:00:00 2001
From: "David Adam (zanchey)" 
Date: Sat, 8 Dec 2012 12:40:18 +0800
Subject: [PATCH 09/14] update cvs completions

---
 share/completions/cvs.fish | 41 +++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index 6b647a611..a2a1fb903 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -21,16 +21,17 @@ complete -c cvs -n '__fish_use_subcommand' -s r --description 'Make checked-out
 complete -c cvs -n '__fish_use_subcommand' -s w --description 'Make checked-out files read-write (default).'
 complete -c cvs -n '__fish_use_subcommand' -s n --description 'Do not execute anything that will change the disk.'
 complete -c cvs -n '__fish_use_subcommand' -s t --description 'Show trace of program execution -- try with -n.'
+complete -c cvs -n '__fish_use_subcommand' -s R --description 'Assume repository is read-only, such as CDROM'
 complete -c cvs -n '__fish_use_subcommand' -s v --description 'CVS version and copyright.'
 complete -c cvs -n '__fish_use_subcommand' -s T -x --description 'Use \'tmpdir\' for temporary files.'
 complete -c cvs -n '__fish_use_subcommand' -s e -x --description 'Use \'editor\' for editing log information.'
 complete -c cvs -n '__fish_use_subcommand' -s d -x --description 'Overrides $CVSROOT as the root of the CVS tree.'
 complete -c cvs -n '__fish_use_subcommand' -s f --description 'Do not use the ~/.cvsrc file.'
-complete -c cvs -n '__fish_use_subcommand' -s z -x --description 'Use compression level \'#\' for net traffic.'
+complete -c cvs -n '__fish_use_subcommand' -s z -x --description 'Request compression level \'#\' for net traffic.'
 complete -c cvs -n '__fish_use_subcommand' -s x --description 'Encrypt all net traffic.'
 complete -c cvs -n '__fish_use_subcommand' -s a --description 'Authenticate all net traffic.'
-complete -c cvs -n '__fish_use_subcommand' -s 4 --description 'Use IPv4.'
-complete -c cvs -n '__fish_use_subcommand' -s 6 --description 'Use IPv6.'
+complete -c cvs -n '__fish_use_subcommand' -s 4 --description 'Use IPv4 addresses only.'
+complete -c cvs -n '__fish_use_subcommand' -s 6 --description 'Use IPv6 addresses only.'
 complete -c cvs -n '__fish_use_subcommand' -s s -x --description 'Set CVS user variable.'
 
 #
@@ -53,12 +54,14 @@ complete -c cvs -n '__fish_use_subcommand' -x -a kserver --description 'Kerberos
 complete -c cvs -n '__fish_use_subcommand' -x -a log --description 'Print out history information for files'
 complete -c cvs -n '__fish_use_subcommand' -x -a login --description 'Prompt for password for authenticating server'
 complete -c cvs -n '__fish_use_subcommand' -x -a logout --description 'Removes entry in .cvspass for remote repository'
+complete -c cvs -n '__fish_use_subcommand' -x -a ls --description 'List files available from CVS'
 complete -c cvs -n '__fish_use_subcommand' -x -a pserver --description 'Password server mode'
 complete -c cvs -n '__fish_use_subcommand' -x -a rannotate --description 'Show last revision where each line of module was modified'
 complete -c cvs -n '__fish_use_subcommand' -x -a rdiff --description 'Create \'patch\' format diffs between releases'
 complete -c cvs -n '__fish_use_subcommand' -x -a release --description 'Indicate that a Module is no longer in use'
 complete -c cvs -n '__fish_use_subcommand' -x -a remove --description 'Remove an entry from the repository'
 complete -c cvs -n '__fish_use_subcommand' -x -a rlog --description 'Print out history information for a module'
+complete -c cvs -n '__fish_use_subcommand' -x -a rls --description 'List files in a module'
 complete -c cvs -n '__fish_use_subcommand' -x -a rtag --description 'Add a symbolic tag to a module'
 complete -c cvs -n '__fish_use_subcommand' -x -a server --description 'Server mode'
 complete -c cvs -n '__fish_use_subcommand' -x -a status --description 'Display status information on checked out files'
@@ -140,6 +143,7 @@ complete -c cvs -n 'contains \'checkout\' (commandline -poc)' -s j -x --descript
 # Completions for the 'commit' subcommand
 #
 
+complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s c --description 'Check for valid edits before committing.'
 complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s R --description 'Process directories recursively.'
 complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s l --description 'Local directory only (not recursive).'
 complete -c cvs -n 'contains \'commit\' (commandline -poc)' -s f --description 'Force the file to be committed; disables recursion.'
@@ -200,6 +204,8 @@ complete -c cvs -n 'contains \'diff\' (commandline -poc)' -s H --description '--
 complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s l --description 'Local directory only, not recursive.'
 complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s R --description 'Process directories recursively (default).'
 complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s a --description 'Specify action to register for temporary watch, one of:'
+complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s c --description 'Check for s edited by others and abort if found.'
+complete -c cvs -n 'contains \'edit\' (commandline -poc)' -s f --description 'Allow edit if s are edited by others (default).'
 
 
 #
@@ -254,6 +260,7 @@ complete -c cvs -n 'contains \'history\' (commandline -poc)' -s z -x --descripti
 #
 
 complete -c cvs -n 'contains \'import\' (commandline -poc)' -s d --description 'Use the file\'s modification time as the time of import.'
+complete -c cvs -n 'contains \'import\' (commandline -poc)' -s X --description 'When importing new files, mark their trunk revisions as dead.'
 complete -c cvs -n 'contains \'import\' (commandline -poc)' -s k -x --description 'Set default RCS keyword substitution mode.'
 complete -c cvs -n 'contains \'import\' (commandline -poc)' -s I -x --description 'More files to ignore (! to reset).'
 complete -c cvs -n 'contains \'import\' (commandline -poc)' -s b -x --description 'Vendor branch id.'
@@ -304,10 +311,24 @@ complete -c cvs -n 'contains \'log\' (commandline -poc)' -s w --description '[lo
 
 
 
+#
+# Completions for the 'ls' subcommand
+#
+
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s d --description 'Show dead revisions (with tag when specified).'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s e --description 'Display in CVS/Entries format.'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s l --description 'Display all details.'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s P --description 'Prune empty directories.'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s R --description 'List recursively.'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s r -x --description 'Show files with revision or tag.'
+complete -c cvs -n 'contains \'ls\' (commandline -poc)' -s D -x --description 'Show files from date.'
+
+
 #
 # Completions for the 'pserver' subcommand
 #
 
+complete -c cvs -n 'contains \'pserver\' (commandline -poc)' -s c -x --description 'Path to an alternative CVS config file.'
 
 
 #
@@ -375,6 +396,19 @@ complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s s -x --description
 complete -c cvs -n 'contains \'rlog\' (commandline -poc)' -s w --description '[logins]'
 
 
+#
+# Completions for the 'rls' subcommand
+#
+
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s d --description 'Show dead revisions (with tag when specified).'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s e --description 'Display in CVS/Entries format.'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s l --description 'Display all details.'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s P --description 'Prune empty directories.'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s R --description 'List recursively.'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s r -x --description 'Show files with revision or tag.'
+complete -c cvs -n 'contains \'rls\' (commandline -poc)' -s D -x --description 'Show files from date.'
+
+
 #
 # Completions for the 'rtag' subcommand
 #
@@ -396,6 +430,7 @@ complete -c cvs -n 'contains \'rtag\' (commandline -poc)' -s D --description 'Ex
 # Completions for the 'server' subcommand
 #
 
+complete -c cvs -n 'contains \'server\' (commandline -poc)' -s c -x --description 'Path to an alternative CVS config file.'
 
 
 #

From b03515276eb2d81bdf3c9643b48e83261ac7b5c0 Mon Sep 17 00:00:00 2001
From: "David Adam (zanchey)" 
Date: Sat, 8 Dec 2012 16:58:03 +0800
Subject: [PATCH 10/14] update darcs completions

---
 share/completions/darcs.fish | 1020 ++++++++++++++++++++++++----------
 1 file changed, 728 insertions(+), 292 deletions(-)

diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index 824e5df75..65fc9179a 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -16,53 +16,62 @@ complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref
 # subcommands
 #
 
-complete -c darcs -n '__fish_use_subcommand' -x -a help --description 'Display help for darcs or a single commands'
+complete -c darcs -n '__fish_use_subcommand' -x -a help --description 'Display help about darcs and darcs commands'
 complete -c darcs -n '__fish_use_subcommand' -x -a add --description 'Add one or more new files or directories'
-complete -c darcs -n '__fish_use_subcommand' -x -a remove --description 'Remove one or more files or directories from the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a mv --description 'Move/rename one or more files or directories'
-complete -c darcs -n '__fish_use_subcommand' -x -a replace --description 'Replace a token with a new value for that token'
-complete -c darcs -n '__fish_use_subcommand' -x -a revert --description 'Revert to the recorded version (safe the first time only)'
+complete -c darcs -n '__fish_use_subcommand' -x -a remove --description 'Remove files from version control'
+complete -c darcs -n '__fish_use_subcommand' -x -a move --description 'Move or rename files'
+complete -c darcs -n '__fish_use_subcommand' -x -a replace --description 'Substitute one word for another'
+complete -c darcs -n '__fish_use_subcommand' -x -a revert --description 'Discard unrecorded changes'
 complete -c darcs -n '__fish_use_subcommand' -x -a unrevert --description 'Undo the last revert (may fail if changes after the revert)'
-complete -c darcs -n '__fish_use_subcommand' -x -a whatsnew --description 'Display unrecorded changes in the working copy'
-complete -c darcs -n '__fish_use_subcommand' -x -a record --description 'Save changes in the working copy to the repository as a patch'
+complete -c darcs -n '__fish_use_subcommand' -x -a whatsnew --description 'List unrecorded changes in the working tree'
+complete -c darcs -n '__fish_use_subcommand' -x -a record --description 'Create a patch from unrecorded changes'
 complete -c darcs -n '__fish_use_subcommand' -x -a unrecord --description 'Remove recorded patches without changing the working copy'
-complete -c darcs -n '__fish_use_subcommand' -x -a amend-record --description 'Replace a patch with a better version before it leaves your repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a resolve --description 'Mark any conflicts to the working copy for manual resolution'
-complete -c darcs -n '__fish_use_subcommand' -x -a tag --description 'Tag the contents of the repository with a version name'
-complete -c darcs -n '__fish_use_subcommand' -x -a setpref --description 'Set a value for a preference (test, predist, ...)'
-complete -c darcs -n '__fish_use_subcommand' -x -a rollback --description 'Record an inverse patch without changing the working directory'
+complete -c darcs -n '__fish_use_subcommand' -x -a amend-record --description 'Improve a patch before it leaves your repository'
+complete -c darcs -n '__fish_use_subcommand' -x -a mark-conflicts --description 'Mark unresolved conflicts in working tree, for manual resolution'
+complete -c darcs -n '__fish_use_subcommand' -x -a tag --description 'Name the current repository state for future reference'
+complete -c darcs -n '__fish_use_subcommand' -x -a setpref --description 'Set a preference (test, predist, boringfile or binariesfile)'
 complete -c darcs -n '__fish_use_subcommand' -x -a diff --description 'Create a diff between two versions of the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a changes --description 'Gives a changelog-style summary of the repository history'
+complete -c darcs -n '__fish_use_subcommand' -x -a changes --description 'List patches in the repository'
 complete -c darcs -n '__fish_use_subcommand' -x -a annotate --description 'Display which patch last modified something'
 complete -c darcs -n '__fish_use_subcommand' -x -a dist --description 'Create a distribution tarball'
 complete -c darcs -n '__fish_use_subcommand' -x -a trackdown --description 'Locate the most recent version lacking an error'
-complete -c darcs -n '__fish_use_subcommand' -x -a query --description 'Query information which is stored by darcs'
+complete -c darcs -n '__fish_use_subcommand' -x -a show --description 'Show information which is stored by darcs'
 complete -c darcs -n '__fish_use_subcommand' -x -a pull --description 'Copy and apply patches from another repository to this one'
-complete -c darcs -n '__fish_use_subcommand' -x -a unpull --description 'Opposite of pull; unsafe if patch is not in remote repository'
 complete -c darcs -n '__fish_use_subcommand' -x -a obliterate --description 'Delete selected patches from the repository. (UNSAFE!)'
+complete -c darcs -n '__fish_use_subcommand' -x -a rollback --description 'Record a new patch reversing some recorded changes'
 complete -c darcs -n '__fish_use_subcommand' -x -a push --description 'Copy and apply patches from this repository to another one'
 complete -c darcs -n '__fish_use_subcommand' -x -a send --description 'Send by email a bundle of one or more patches'
-complete -c darcs -n '__fish_use_subcommand' -x -a apply --description 'Apply patches (from an email bundle) to the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a get --description 'Create a local copy of another repository'
+complete -c darcs -n '__fish_use_subcommand' -x -a apply --description 'Apply a patch bundle created by `darcs send''
+complete -c darcs -n '__fish_use_subcommand' -x -a get --description 'Create a local copy of a repository'
 complete -c darcs -n '__fish_use_subcommand' -x -a put --description 'Makes a copy of the repository'
-complete -c darcs -n '__fish_use_subcommand' -x -a initialize --description 'Initialize a new source tree as a darcs repository'
+complete -c darcs -n '__fish_use_subcommand' -x -a initialize --description 'Make the current directory a repository'
 complete -c darcs -n '__fish_use_subcommand' -x -a optimize --description 'Optimize the repository'
 complete -c darcs -n '__fish_use_subcommand' -x -a check --description 'Check the repository for consistency'
-complete -c darcs -n '__fish_use_subcommand' -x -a repair --description 'Repair the corrupted repository'
+complete -c darcs -n '__fish_use_subcommand' -x -a repair --description 'Repair a corrupted repository'
+complete -c darcs -n '__fish_use_subcommand' -x -a convert --description 'Convert a repository from a legacy format'
 
 
 #
 # Completions for the 'help' subcommand
 #
 
-complete -c darcs -n 'contains \'help\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'help\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'help\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'help\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'help\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'help\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'help\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'help\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'help\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -70,53 +79,89 @@ complete -c darcs -n 'contains \'help\' (commandline -poc)' -l run-posthook --de
 #
 
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l boring --description 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-boring --description 'Skip borign files [DEFAULT]'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-case-ok --description 'Refuse to add files whose name differ only in case [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l reserved-ok --description 'Don\'t refuse to add files with Windows-reserved names'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-reserved-ok --description 'Refuse to add files with Windows-reserved names [DEFAULT]'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -s r -l recursive --description 'Add contents of subdirectories'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l not-recursive --description 'Don\'t add contents of subdirectories'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l date-trick --description 'Add files with date appended to avoid conflict. [EXPERIMENTAL]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-date-trick --description 'Don\'t use experimental date appending trick. [DEFAULT]'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l date-trick --description 'Add files with date appended to avoid conflict [EXPERIMENTAL]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-date-trick --description 'Don\'t use experimental date appending trick [DEFAULT]'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'add\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'add\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'add\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'remove' subcommand
 #
 
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s r -l recursive --description 'Recurse into subdirectories'
 complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'remove\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
-# Completions for the 'mv' subcommand
+# Completions for the 'move' subcommand
 #
 
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l case-ok --description 'Don\'t refuse to add files differing only in case'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-case-ok --description 'Refuse to add files whose name differ only in case [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l reserved-ok --description 'Don\'t refuse to add files with Windows-reserved names'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-reserved-ok --description 'Refuse to add files with Windows-reserved names [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'move\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -126,73 +171,119 @@ complete -c darcs -n 'contains \'mv\' (commandline -poc)' -l run-posthook --desc
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l token-chars -x --description 'Define token to contain these characters'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s f -l force --description 'Proceed with replace even if \'new\' token already exists'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-force --description 'Don\'t force the replace if it looks scary'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'replace\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'revert' subcommand
 #
 
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'revert\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'unrevert' subcommand
 #
 
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'unrevert\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'whatsnew' subcommand
 #
 
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l boring --description 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-unified --description 'Output patch in darcs\' usual format'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s l -l look-for-adds --description 'Look for (non-boring) files that could be added'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l boring --description 'Don\'t skip boring files'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-boring --description 'Skip borign files [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -201,34 +292,45 @@ complete -c darcs -n 'contains \'whatsnew\' (commandline -poc)' -l run-posthook
 
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l test --description 'Run the test script'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l pipe --description 'Ask user interactively for the patch metadata'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ask-deps --description 'Ask for extra dependencies'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-ask-deps --description 'Don\'t ask for extra dependencies'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s l -l look-for-adds --description 'Look for (non-boring) files that could be added'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-delete-logfile --description 'Keep the logfile when done [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'record\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'record\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -242,61 +344,102 @@ complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l last -x --des
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l dont-prompt-for-dependencies --description 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-for-dependencies --description 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'unrecord\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'amend-record' subcommand
 #
 
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s p -l patch -x --description 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s n -l index -x --description 'Select one patch'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l test --description 'Run the test script'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s l -l look-for-adds --description 'In addition to modifications, look for files that are not boring, and thus are potentially pending addition'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l dont-look-for-adds --description 'Don\'t look for any files or directories that could be added, and don\'t add them automatically'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s l -l look-for-adds --description 'Look for (non-boring) files that could be added'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'amend-record\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
-# Completions for the 'resolve' subcommand
+# Completions for the 'mark-conflicts' subcommand
 #
 
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'mark-conflicts\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -305,20 +448,31 @@ complete -c darcs -n 'contains \'resolve\' (commandline -poc)' -l run-posthook -
 
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l pipe --description 'Expect to receive input from a pipe'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l pipe --description 'Ask user interactively for the patch metadata'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -328,29 +482,26 @@ complete -c darcs -n 'contains \'tag\' (commandline -poc)' -l run-posthook --des
 complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
-
-
-#
-# Completions for the 'rollback' subcommand
-#
-
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -x --description 'Shell command that runs regression tests'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -x --description 'Shell command to run before `darcs dist\''
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -x --description 'Path to a version-controlled boring file'
+complete -c darcs -n 'contains \'setpref\' (commandline -poc)' -x --description 'Path to a version-controlled binaries file'
 
 
 #
@@ -366,16 +517,31 @@ complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l from-tag -x --des
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s p -l patch -x --description 'Select a single patch matching REGEXP'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s n -l index -x --description 'Select a range of patches'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-command -x -a '(__fish_complete_command)' --description 'Specify diff command (ignores --diff-opts)'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l diff-opts -x --description 'Options to pass to diff'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s u -l unified --description 'Pass -u option to diff'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-unified --description 'Output patch in diff\'s dumb format'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l store-in-memory --description 'Do patch application in memory rather than on disk'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-store-in-memory --description 'Do patch application on disk [DEFAULT]'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'diff\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -389,52 +555,84 @@ complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-match -x
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s n -l index -x --description 'Select a range of patches'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l max-count -x --description 'Return only NUMBER results'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l only-to-files --description 'Show only changes to specified files'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-only-to-files --description 'Show changes to all files [DEFAULT]'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l context --description 'Give output suitable for get --context'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l human-readable --description 'Give human-readable output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l number --description 'Number the changes'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l count --description 'Output count of changes'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l reverse --description 'Show changes in reverse order'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-reverse --description 'Show changes in the usual order [DEFAULT]'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l repo -x --description 'Specify the repository URL'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'changes\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'annotate' subcommand
 #
 
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-unified --description 'Output patch in darcs\' usual format'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l human-readable --description 'Give human-readable output'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l match -x --description 'Select patch matching PATTERN'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s p -l patch -x --description 'Select patch matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s p -l patch -x --description 'Select a single patch matching REGEXP'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s t -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s n -l index -x --description 'Select one patch'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l creator-hash -x --description 'Specify hash of creator patch (see docs)'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -442,37 +640,62 @@ complete -c darcs -n 'contains \'annotate\' (commandline -poc)' -l run-posthook
 #
 
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s d -l dist-name -x --description 'Name of version'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l match -x --description 'Select a single patch matching PATTERN'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s p -l patch -x --description 'Select a single patch matching REGEXP'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s t -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s n -l index -x --description 'Select one patch'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l store-in-memory --description 'Do patch application in memory rather than on disk'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-store-in-memory --description 'Do patch application on disk [DEFAULT]'
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'dist\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'trackdown' subcommand
 #
 
-complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
 complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'trackdown\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
-# Completions for the 'query' subcommand
+# Completions for the 'show' subcommand
 #
 
-complete -c darcs -n 'contains \'query\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'show\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
 
 
 #
@@ -484,58 +707,57 @@ complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s p -l patches -x -
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l intersection --description 'Take intersection of all repositories'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l union --description 'Take union of all repositories [default]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l mark-conflicts --description 'Mark conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l allow-conflicts --description 'Allow conflicts, but don\'t mark them'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l skip-conflicts --description 'Filter out any patches that would create conflicts'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l test --description 'Run the test script'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-prompt-for-dependencies --description 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-for-dependencies --description 'Prompt about patches that are depended on by matched patches [DEFAULT]'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-unrelated-repos --description 'Do not check if repositories are unrelated'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l intersection --description 'Take intersection of all repositories'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l union --description 'Take union of all repositories [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l complement --description 'Take complement of repositories (in order listed)'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l nolinks --description 'Do not link repository or pristine to sibling'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l remote-repo -x --description 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l restrict-paths --description 'Don\'t allow darcs to touch external files or repo metadata'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
-
-
-#
-# Completions for the 'unpull' subcommand
-#
-
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
-complete -c darcs -n 'contains \'unpull\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'pull\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -549,94 +771,195 @@ complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l last -x --d
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dont-prompt-for-dependencies --description 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-for-dependencies --description 'Prompt about patches that are depended on by matched patches [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'obliterate\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
+
+
+#
+# Completions for the 'rollback' subcommand
+#
+
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-match -x --description 'Select changes starting with a patch matching PATTERN'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-patch -x --description 'Select changes starting with a patch matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l from-tag -x --description 'Select changes starting with a tag matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l last -x --description 'Select the last NUMBER patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s m -l patch-name -x --description 'Name of patch'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l edit-long-comment --description 'Edit the long comment by default'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l skip-long-comment --description 'Don\'t give a long comment'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prompt-long-comment --description 'Prompt for whether to edit the long comment'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l test --description 'Run the test script'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'rollback\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'push' subcommand
 #
 
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-prompt-for-dependencies --description 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-for-dependencies --description 'Prompt about patches that are depended on by matched patches [DEFAULT]'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l ignore-unrelated-repos --description 'Do not check if repositories are unrelated'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-apply-as --description 'Don\'t use sudo to apply as another user [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l nolinks --description 'Do not link repository or pristine to sibling'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l remote-repo -x --description 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'push\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'push\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'send' subcommand
 #
 
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l matches -x --description 'Select patches matching PATTERN'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s p -l patches -x --description 'Select patches matching REGEXP'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s t -l tags -x --description 'Select tags matching REGEXP'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-deps --description 'Don\'t automatically fulfill dependencies'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-prompt-for-dependencies --description 'Don\'t ask about patches that are depended on by matched patches (with --match or --patch)'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-for-dependencies --description 'Prompt about patches that are depended on by matched patches [DEFAULT]'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l from -x --description 'Specify email address'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s A -l author -x --description 'Specify author id'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l to -x --description 'Specify destination email'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s)'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l subject -x --description 'Specify mail subject'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l in-reply-to -x --description 'Specify in-reply-to header'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s o -l output -r --description 'Specify output filename'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign --description 'Sign the patch with your gpg key'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-as -x --description 'Sign the patch with a given keyid'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sign-ssl -x --description 'Sign the patch using openssl with a given private key'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-sign --description 'Do not sign the patch'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -s u -l unified --description 'Output patch in a darcs-specific format similar to diff -u'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s s -l summary --description 'Summarize changes'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-summary --description 'Don\'t summarize changes'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l context -r --description 'Send to context stored in FILENAME'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l edit-description --description 'Edit the patch bundle description'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l dont-edit-description --description 'Don\'t edit the patch bundle description'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l ignore-unrelated-repos --description 'Do not check if repositories are unrelated'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l logfile -r --description 'Give patch name and comment in file'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l delete-logfile --description 'Delete the logfile when done'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-delete-logfile --description 'Keep the logfile when done [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l remote-repo -x --description 'Specify the remote repository URL to work with'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l context -r --description 'Send to context stored in FILENAME'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'send\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'send\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
@@ -646,168 +969,281 @@ complete -c darcs -n 'contains \'send\' (commandline -poc)' -l run-posthook --de
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify -x --description 'Verify that the patch was signed by a key in PUBRING'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l verify-ssl -x --description 'Verify using openSSL with authorized keys from file KEYS'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-verify --description 'Don\'t verify patch signature'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reply -x --description 'Reply to email-based patch using FROM address'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s a -l all --description 'Answer yes to all patches'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s i -l interactive --description 'Prompt user interactively'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dry-run --description 'Don\'t actually take the action'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l xml-output --description 'Generate XML formatted output'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l mark-conflicts --description 'Mark conflicts'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l allow-conflicts --description 'Allow conflicts, but don\'t mark them'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-resolve-conflicts --description 'Equivalent to --dont-allow-conflicts, for backwards compatibility'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-allow-conflicts --description 'Fail on patches that create conflicts [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l skip-conflicts --description 'Filter out any patches that would create conflicts'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l external-merge -x -a '(__fish_complete_command)' --description 'Use external tool to merge conflicts'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l test --description 'Run the test script'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l happy-forwarding --description 'Forward unsigned messages without extra header'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l reply -x --description 'Reply to email-based patch using FROM address'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l cc -x --description 'Mail results to additional EMAIL(s). Requires --reply'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l happy-forwarding --description 'Forward unsigned messages without extra header'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-happy-forwarding --description 'Don\'t forward unsigned messages without extra header [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l sendmail-command -x -a '(__fish_complete_command)' --description 'Specify sendmail command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l restrict-paths --description 'Don\'t allow darcs to touch external files or repo metadata'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'apply\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'get' subcommand
 #
 
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l repo-name -x -a '(__fish_complete_directories (commandline -ct))' --description 'Path of output directory'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l partial --description 'Get partial repository using checkpoint'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l repo-name -x --description '--repodir=DIRECTORY'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l partial --description 'Get partial repository using checkpoint (old-fashioned format only)'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l lazy --description 'Get patch files only as needed'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l ephemeral --description 'Don\'t save patch files in the repository'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l complete --description 'Get a complete copy of the repository'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s t -l tag -x --description 'Select tag matching REGEXP'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l dont-set-scripts-executable --description 'Don\'t make scripts executable'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l nolinks --description 'Do not link repository or pristine to sibling'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l hashed --description 'Convert darcs-1 format to hashed format'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l old-fashioned-inventory --description 'Convert from hashed to darcs-1 format'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'get\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'get\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'get\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'put' subcommand
 #
 
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -s t -l tag -x --description 'Select tag matching REGEXP'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l hashed --description 'Convert darcs-1 format to hashed format'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l old-fashioned-inventory --description 'Convert from hashed to darcs-1 format'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l set-default --description 'Set default repository [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-set-default --description 'Don\'t set default repository'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-match -x --description 'Select changes up to a patch matching PATTERN'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l to-patch -x --description 'Select changes up to a patch matching REGEXP'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l tag -x --description 'Select tag matching REGEXP'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l context -r --description 'Version specified by the context in FILENAME'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -l apply-as -x -a '(__fish_complete_users)' --description 'Apply patch as another user using sudo'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l apply-as-myself --description 'Don\'t use sudo to apply as another user [DEFAULT]'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l disable-ssh-cm --description 'Disable use of SSH ControlMaster feature'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l disable --description 'Disable this command'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-apply-as --description 'Don\'t use sudo to apply as another user [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'put\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'put\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'put\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'initialize' subcommand
 #
 
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l plain-pristine-tree --description 'Use a plain pristine tree [DEFAULT]'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-pristine-tree --description 'Use no pristine tree'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l hashed --description 'Some new features. Compatible with older repos'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l darcs-2 --description 'All features. Related repos must use same format [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l old-fashioned-inventory --description 'Minimal features. What older repos use'
 complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'initialize\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'optimize' subcommand
 #
 
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l checkpoint --description 'Create a checkpoint file'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l compress --description 'Create compressed patches'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l dont-compress --description 'Don\'t create compressed patches'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l uncompress --description 'Uncompress patches'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s t -l tag -x --description 'Name of version to checkpoint'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l standard-verbosity --description 'Don\'t give verbose output'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l modernize-patches --description 'Rewrite all patches in current darcs format'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l reorder-patches --description 'Reorder the patches in the repository'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l sibling -x --description 'Specify a sibling directory'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l relink --description 'Relink random internal data to a sibling'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l relink-pristine --description 'Relink pristine tree (not recommended)'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l upgrade --description 'Upgrade repository to latest compatible format'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l pristine --description 'Optimize hashed pristine layout'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l compress --description 'Create compressed patches'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l uncompress --description 'Uncompress patches'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'optimize\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'check' subcommand
 #
 
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -l complete --description 'Check the entire repository'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -l partial --description 'Check patches since latest checkpoint'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l complete --description 'Get a complete copy of the repository'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l partial --description 'Get partial repository using checkpoint (old-fashioned format only)'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-test --description 'Don\'t run the test script'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l test --description 'Run the test script'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l leave-test-directory --description 'Don\'t remove the test directory'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l remove-test-directory --description 'Remove the test directory'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l ignore-times --description 'Don\'t trust the file modification times'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-ignore-times --description 'Trust modification times to find modified files [DEFAULT]'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'check\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'check\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'check\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 #
 # Completions for the 'repair' subcommand
 #
 
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
 complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l repodir -x -a '(__fish_complete_directories (commandline -ct))' --description 'Specify the repository directory in which to run'
 complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l disable --description 'Disable this command'
 complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l umask -x --description 'Specify umask to use when writing'
 complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l no-posthook --description 'Do not run posthook command'
-complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook. [DEFAULT]'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
 complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'repair\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
+
+
+#
+# Completions for the 'convert' subcommand
+#
+
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l repo-name -x --description '--repodir=DIRECTORY'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l set-scripts-executable --description 'Make scripts executable'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l disable --description 'Disable this command'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -s h -l help --description 'Shows brief description of command and its arguments'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l debug --description 'Give only debug output'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l debug-verbose --description 'Give debug and verbose output'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l debug-http --description 'Give debug output for libcurl'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -s v -l verbose --description 'Give verbose output'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -s q -l quiet --description 'Suppress informational output'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l standard-verbosity --description 'Neither verbose nor quiet output'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l timings --description 'Provide debugging timings information'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l ssh-cm --description 'Use SSH ControlMaster feature'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l no-ssh-cm --description 'Don\'t use SSH ControlMaster feature [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l http-pipelining --description 'Enable HTTP pipelining [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l no-http-pipelining --description 'Disable HTTP pipelining'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l no-cache --description 'Don\'t use patch caches'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l remote-darcs -x -a '(__fish_complete_command)' --description 'Name of the darcs executable on the remote server'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l posthook -x -a '(__fish_complete_command)' --description 'Specify command to run after this darcs command'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l no-posthook --description 'Don\'t run posthook command'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l prompt-posthook --description 'Prompt before running posthook [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l run-posthook --description 'Run posthook command without prompting'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l prehook -x -a '(__fish_complete_command)' --description 'Specify command to run before this darcs command'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l no-prehook --description 'Don\'t run prehook command'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l prompt-prehook --description 'Prompt before running prehook [DEFAULT]'
+complete -c darcs -n 'contains \'convert\' (commandline -poc)' -l run-prehook --description 'Run prehook command without prompting'
 
 
 

From ce0c52d35348b3655b70702a219143d5bbedba96 Mon Sep 17 00:00:00 2001
From: Dag Odenhall 
Date: Thu, 9 May 2013 12:53:19 +0200
Subject: [PATCH 11/14] Silence errors when ack doesn't support --dump

It seems to be new in ack 2.x and with 1.96 I get error messages when
the ack completions are loaded.
---
 share/completions/ack.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/ack.fish b/share/completions/ack.fish
index 558ba9264..6ad573b71 100644
--- a/share/completions/ack.fish
+++ b/share/completions/ack.fish
@@ -84,7 +84,7 @@ complete -c ack -l bar -d 'The warning admiral'
 
 # File types
 if type ack > /dev/null
-	for type in (ack --dump | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
+        for type in (ack --dump ^/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
 		complete -c ack -l $type -d "Allow $type file type"
 		complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
 	end

From 622efba247bb944cbe8eabb2a98ccbde59862891 Mon Sep 17 00:00:00 2001
From: ridiculousfish 
Date: Mon, 13 May 2013 02:06:04 -0700
Subject: [PATCH 12/14] Space -> tab in ack completion to match rest of file

---
 share/completions/ack.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/completions/ack.fish b/share/completions/ack.fish
index 6ad573b71..5502bf2b6 100644
--- a/share/completions/ack.fish
+++ b/share/completions/ack.fish
@@ -84,7 +84,7 @@ complete -c ack -l bar -d 'The warning admiral'
 
 # File types
 if type ack > /dev/null
-        for type in (ack --dump ^/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
+	for type in (ack --dump ^/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
 		complete -c ack -l $type -d "Allow $type file type"
 		complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
 	end

From 8befc474c14aa3ad936ffea85963711f5e58475b Mon Sep 17 00:00:00 2001
From: ridiculousfish 
Date: Mon, 13 May 2013 10:17:31 -0700
Subject: [PATCH 13/14] Ugly hack to move functions in sample prompts inside
 fish_prompt to address #736

---
 .../sample_prompts/classic_git.fish           | 45 ++++++++++---------
 .../sample_prompts/robbyrussell.fish          | 20 +++++----
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/share/tools/web_config/sample_prompts/classic_git.fish b/share/tools/web_config/sample_prompts/classic_git.fish
index b09fcef97..0d91f5fe0 100644
--- a/share/tools/web_config/sample_prompts/classic_git.fish
+++ b/share/tools/web_config/sample_prompts/classic_git.fish
@@ -13,6 +13,31 @@ function fish_prompt --description 'Write out the prompt'
 	if not set -q __fish_prompt_normal
 		set -g __fish_prompt_normal (set_color normal)
 	end
+	
+	if not set -q -g __fish_classic_git_functions_defined
+		set -g __fish_classic_git_functions_defined
+
+		function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
+			if status --is-interactive
+				set -e __fish_prompt_user
+				commandline -f repaint ^/dev/null
+			end
+		end
+		
+		function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
+			if status --is-interactive
+				set -e __fish_prompt_host
+				commandline -f repaint ^/dev/null
+			end
+		end
+		
+		function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
+			if status --is-interactive
+				set -e __fish_prompt_status
+				commandline -f repaint ^/dev/null
+			end
+		end
+	end
 
 	set -l delim '>'
 
@@ -54,26 +79,6 @@ function fish_prompt --description 'Write out the prompt'
 	echo -n -s "$__fish_prompt_user" "$USER" "$__fish_prompt_normal" @ "$__fish_prompt_host" "$__fish_prompt_hostname" "$__fish_prompt_normal" ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_git_prompt) "$__fish_prompt_normal" "$prompt_status" "$delim" ' '
 end
 
-function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
-	if status --is-interactive
-		set -e __fish_prompt_user
-		commandline -f repaint ^/dev/null
-	end
-end
-
-function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
-	if status --is-interactive
-		set -e __fish_prompt_host
-		commandline -f repaint ^/dev/null
-	end
-end
-
-function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
-	if status --is-interactive
-		set -e __fish_prompt_status
-		commandline -f repaint ^/dev/null
-	end
-end
 
 # initialize our new variables
 # in theory this would be in a fish_prompt event, but this file isn't sourced
diff --git a/share/tools/web_config/sample_prompts/robbyrussell.fish b/share/tools/web_config/sample_prompts/robbyrussell.fish
index 2493f7662..fdc02f326 100644
--- a/share/tools/web_config/sample_prompts/robbyrussell.fish
+++ b/share/tools/web_config/sample_prompts/robbyrussell.fish
@@ -1,15 +1,19 @@
 # name: Robbyrussell
 # author: Bruno Ferreira Pinto
 
-function _git_branch_name
-  echo (git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
-end
-
-function _is_git_dirty
-  echo (git status -s --ignore-submodules=dirty ^/dev/null)
-end
-
 function fish_prompt
+
+  if not set -q -g __fish_robbyrussell_functions_defined
+    set -g __fish_robbyrussell_functions_defined
+    function _git_branch_name
+      echo (git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
+    end
+	
+    function _is_git_dirty
+      echo (git status -s --ignore-submodules=dirty ^/dev/null)
+    end
+  end
+
   set -l cyan (set_color -o cyan)
   set -l yellow (set_color -o yellow)
   set -l red (set_color -o red)

From f109fa227d4b0463cdd8393f6ea4ceb8fc801650 Mon Sep 17 00:00:00 2001
From: ridiculousfish 
Date: Wed, 15 May 2013 01:02:55 -0700
Subject: [PATCH 14/14] Release notes for fish 2.0

---
 release_notes.html | 106 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/release_notes.html b/release_notes.html
index 737020b6b..8f300c5ce 100644
--- a/release_notes.html
+++ b/release_notes.html
@@ -9,8 +9,114 @@
 li {
 	margin-top: 12px;
 }
+
+.issue_link {
+	font-size: small;
+}
+
 
 
+
Release Notes for fish 2.0.0

+
+
Significant Changes

+
+
    
+
  • Command substitutions now modify $status #547.
+
    
+Previously the exit status of command substitutions (like (pwd)) was ignored; however now it modifies $status. Furthermore, the set command now only sets $status on failure; it is untouched on success. This allows for the following pattern:
+
    +if set python_path (which python)
+   ...
+end
+
    
+
+Because set does not modify $status on success, the if branch effectively tests whether which succeeded, and if so, whether the set also succeeded.
+
+
    • 
+
+
  • Improvements to $PATH handling.
+
    
+
    • There is a new variable, $fish_user_paths, which can be set universally, and whose contents are appended to $PATH #527
      • 
+
    • /etc/paths and /etc/paths.d are now respected on OS X
      • 
+
    • fish no longer modifies $PATH to find its own binaries
      • 
+
    • 
+
    
+
+
+
  • Long lines no longer use ellipsis for line breaks, and copy and paste should no longer include a newline even if the line was broken #300
    • 
+
+
  • New syntax for index ranges (sometimes known as "slices") #212
    • 
+
+
  • fish now supports an else if statement #134
    • 
+
+
  • Process and pid completion now works on OS X #129
    • 
+
+
  • fish is now relocatable, and no longer depends on compiled-in paths #125
    • 
+
+
  • fish now supports a right prompt (RPROMPT) through the fish_right_prompt function #80
    • 
+
+
  • fish now uses posix_spawn instead of fork when possible, which is much faster on BSD and OS X #11
    • 
+
+

+
+
Other Notable Fixes

+
    
+
  • Updated VCS completions (darcs, cvs, svn, etc.)
    • 
+
  • Avoid calling getcwd on the main thread, as it can hang #696
    • 
+
  • Control-D (forward delete) no longer stops at a period #667
    • 
+
  • Completions for many new commands 
    • 
+
  • fish now respects rxvt's unique keybindings #657
    • 
+
  • xsel is no longer built as part of fish. It will still be invoked if installed separately #633
    • 
+
  • __fish_filter_mime no longer spews #628
    • 
+
  • The --no-execute option to fish no longer falls over when reaching the end of a block #624
    • 
+
  • fish_config knows how to find fish even if it's not in the $PATH #621
    • 
+
  • A leading space now prevents writing to history, as is done in bash and zsh #615
    • 
+
  • Hitting enter after a backslash only goes to a new line if it is followed by whitespace or the end of the line #613
    • 
+
  • printf is now a builtin #611
    • 
+
  • Event handlers should no longer fire if signals are blocked #608
    • 
+
  • set_color is now a builtin #578
    • 
+
  • man page completions are now located in a new generated_completions directory, instead of your completions directory #576
    • 
+
  • tab now clears autosuggestions #561
    • 
+
  • tab completion from within a pair of quotes now attempts to "appropriate" the closing quote #552
    • 
+
  • $EDITOR can now be a list: for example, set EDITOR gvim -f) #541
    • 
+
  • case bodies are now indented #530
    • 
+
  • The profile switch -p no longer crashes #517
    • 
+
  • You can now control-C out of read #516
    • 
+
  • umask is now functional on OS X #515
    • 
+
  • Avoid calling getpwnam on the main thread, as it can hang #512
    • 
+
  • Alt-F or Alt-right-arrow (Option-F or option-right-arrow) now accepts one word of an autosuggestion #435
    • 
+
  • Setting fish as your login shell no longer kills OpenSUSE #367
    • 
+
  • Backslashes now join lines, instead of creating multiple commands #347
    • 
+
  • echo now implements the -e flag to interpret escapes #337
    • 
+
  • When the last token in the user's input contains capital letters, use its case in preference to that of the autosuggestion #335
    • 
+
  • Descriptions now have their own muted color #279
    • 
+
  • Wildcards beginning with a . (for example, ls .*) no longer match . and .. #270
    • 
+
  • Recursive wildcards now handle symlink loops #268
    • 
+
  • You can now delete history items from the fish_config web interface #250
    • 
+
  • The OS X build now weak links wcsdup and wcscasecmp #240
    • 
+
  • fish now saves and restores the process group, which prevents certain processes from being erroneously reported as stopped #197
    • 
+
  • funced now takes an editor option #187
    • 
+
  • Alternating row colors are available in fish pager through fish_pager_color_secondary #186
    • 
+
  • Universal variable values are now stored based on your MAC address, not your hostname #183
    • 
+
  • The caret ^ now only does a stderr redirection if it is the first character of a token, making git users happy #168
    • 
+
  • Autosuggestions will no longer cause line wrapping #167
    • 
+
  • Better handling of Unicode combining characters #155
    • 
+
  • fish SIGHUPs processes more often #138
    • 
+
  • fish no longer causes sudo to ask for a password every time
    • 
+
  • fish behaves better under Midnight Commander #121
    • 
+
  • set -e no longer crashes #100
    • 
+
  • fish now will automatically import history from bash, if there is no fish history #66
    • 
+
  • Backslashed-newlines inside quoted strings now behave more intuitively #52
    • 
+
  • Tab titles should be shown correctly in iTerm2 #47
    • 
+
  • scp remote path completion now sometimes works #42
    • 
+
  • The read builtin no longer shows autosuggestions #29
    • 
+
  • Custom key bindings can now be set via the fish_user_key_bindings function #21
    • 
+
  • All Python scripts now run correctly under both Python 2 and Python 3 #14
    • 
+
  • The "accept autosuggestion" key can now be configured #19
    • 
+
  • Autosuggestions will no longer suggest invalid commands #6
    • 
+
+

+
 
Release Notes for fishfish Beta r2

 
 
Bug Fixes