[Monotone-commits-diffs] net.venge.monotone: b2a116b2fee3ba3bfe18a354389b6e58ff87b3a5

[code]

revision:            b2a116b2fee3ba3bfe18a354389b6e58ff87b3a5
date:                2011-01-11T02:01:11
author:              address@hidden
branch:              net.venge.monotone
changelog:
monotone.texi: Review the Informative commands section.

* cmd_list.cc (CMD unknown, CMD changed): takes a [PATH] arg

* monotone.texi: use @option for options consistently. Review the
  Informative commands section.


manifest:
format_version "1"

new_manifest [4b5c3099c58f2698a89075ea3038979d17d0f974]

old_revision [6d854164c71f5b5b1e8c635a0fedb494f0ee05f6]

patch "cmd_list.cc"
 from [b039c7a5f47200b5a0043178d0d3909ce525f892]
   to [1c449f70b7633a20c1caf2f284494b9959ff0ca9]

patch "monotone.texi"
 from [e376b6b2d07736f11fce16a5ff1b82e29da95ed3]
   to [69e26189b889d50c696dd0c205d058a56fb69ce8]
============================================================
--- monotone.texi	e376b6b2d07736f11fce16a5ff1b82e29da95ed3
+++ monotone.texi	69e26189b889d50c696dd0c205d058a56fb69ce8
@@ -3209,25 +3209,25 @@ @section Merge Conflicts
 In addition, the @command{conflicts} set of commands can be used to
 specify resolutions for some conflicts. The resolutions are stored in a
 file, and given to the @command{merge} command via the
address@hidden or
address@hidden option; see @ref{Conflicts}.
address@hidden or
address@hidden option; see @ref{Conflicts}.
 
 The @command{merge} command normally will perform as many merges as
 necessary to merge all current heads of a branch. However, when
address@hidden is given, the conflicts and their
address@hidden is given, the conflicts and their
 resolutions apply only to the first merge, so the subsequent merges
 are not done; the @command{merge} command must be repeated, possibly
 with new conflicts and resolutions, to merge the remaining heads.
 
 For the special case of file content conflicts, a merge command
-invoked without @command{--resolve-conflicts} will attempt to start an
+invoked without @option{--resolve-conflicts} will attempt to start an
 external interactive merge tool; the user must then resolve the conflicts
 and terminate the merge tool, letting monotone continue with the
 merge. This process is repeated for each file content conflict. See
 @ref{File Content Conflict} below for more detail.
 
 For other conflicts, a merge command invoked without
address@hidden will fail.
address@hidden will fail.
 
 If @command{conflicts} supports resolving a particular conflict, that
 is the simplest way to resolve it. Otherwise, resolving the different
@@ -3271,7 +3271,7 @@ @subheading File Content Conflict
 
 If @code{mtn:manual_merge} is present and @code{true}, or if the
 changes are to the same lines of the file, and neither
address@hidden nor @command{--non-interactive} was
address@hidden nor @option{--non-interactive} was
 specified, the @ref{merge3} hook is called, with the content of both
 conflicting versions and their common ancestor.
 
@@ -3281,7 +3281,7 @@ @subheading File Content Conflict
 @smallexample
 mtn conflicts resolve_first user filename
 @end smallexample
-Then @command{--resolve-conflicts} is specified on the merge command
+Then @option{--resolve-conflicts} is specified on the merge command
 line.
 
 Finally, rather than using a merge tool it is possible to commit
@@ -3786,7 +3786,7 @@ @section Managed Databases
 
 @node Managed Databases, Reserved Files, Vars, Advanced Uses
 @section Managed Databases
-In monotone commands, a database name (provided to a @command{--db}
+In monotone commands, a database name (provided to a @option{--db}
 option) starting with ``:'' is a ``database alias''. The rest of the
 database name is a file name; the file extension @file{.mtn} is added
 if the file name has no extension. The file is searched for in the
@@ -4912,7 +4912,7 @@ @section Global Options
 @file{$HOME/.monotone} on Unix and Cygwin, @file{%APPDATA%\monotone%} on
 Windows MinGW). In this manual, references to these specific directories are
 actually references to the directory specified by
address@hidden
address@hidden
 
 The configuration directory is where monotone finds:
 
@@ -4920,7 +4920,7 @@ @section Global Options
 @item keys
 in @file{confdir/keys}; see @ref{Certificates}, @ref{Generating
 Keys}. The location of the keys directory can be overridden separately
-with the @command{--keydir} option.
+with the @option{--keydir} option.
 
 @item monotonerc
 which is a per-user configuration file containing Lua code
@@ -4991,7 +4991,7 @@ @section Global Options
 
 @item --no-default-confdir
 @itemx --allow-default-confdir
-Don't use a default confdir; @command{--confdir} must be specified if
+Don't use a default confdir; @option{--confdir} must be specified if
 a configuration file is needed.
 
 @item --no-format-dates
@@ -5024,7 +5024,7 @@ @section Global Options
 Specify an extra rcfile to load. See @ref{rcfiles}.
 
 @itemx --clear-rcfiles
-Cancel all previous @command{--rcfile} options (standard rcfiles are
+Cancel all previous @option{--rcfile} options (standard rcfiles are
 still loaded). See @ref{rcfiles}.
 
 @itemx --root <arg>
@@ -5141,7 +5141,7 @@ @section Tree
 branch already exists, any missing files are dropped and any unknown
 files are added before committing.
 
-If @command{--dry-run} is given, no commit is done.
+If @option{--dry-run} is given, no commit is done.
 
 Roughly speaking, @command{mtn import} does the following:
 
@@ -5167,8 +5167,8 @@ @section Tree
 revision as a member of @var{branchname}. The merged revision will
 contain each of the head revision IDs as ancestors.
 
-A commit message may be provided via @command{--message @var{string}}
-or @command{--message-file @var{filename}}. A message stating the
+A commit message may be provided via @option{--message @var{string}}
+or @option{--message-file @var{filename}}. A message stating the
 revision ids that were merged will be prepended to any user commit
 message.
 
@@ -5229,8 +5229,8 @@ @section Tree
 either @var{sourcebranch} or @var{destbranch} has multiple heads,
 @command{propagate} aborts, doing nothing.
 
-A commit message may be provided via @command{--message @var{string}}
-or @command{--message-file @var{filename}}. A message stating the
+A commit message may be provided via @option{--message @var{string}}
+or @option{--message-file @var{filename}}. A message stating the
 source and target branches will be prepended to any user commit
 message.
 
@@ -5283,9 +5283,9 @@ @subsection Conflicts
 These commands require a workspace, to provide a place to store the
 conflicts and user resolution files.
 
-For all of these commands, if the @command{--conflicts-file} option is
+For all of these commands, if the @option{--conflicts-file} option is
 not given, the file @file{_MTN/conflicts} is used. If the
address@hidden option is given, the file must be in the
address@hidden option is given, the file must be in the
 bookkeeping directory.
 
 Files given in these commands are relative to the current working
@@ -5426,7 +5426,7 @@ @section Workspace
 next @command{commit}. See @ref{Storage and workflow} for
 more information on @command{add} and @command{commit}.
 
-As a convenience, the @command{--unknown @var{pathname...}} option can be used;
+As a convenience, the @option{--unknown @var{pathname...}} option can be used;
 this option will cause all of the files listed by @command{mtn list
 unknown @var{pathname...}} to be added.
 
@@ -5713,7 +5713,7 @@ @section Workspace
 
 This command places @code{rename} entries for the paths specified in
 @var{src} and @var{dst} in @ref{_MTN/revision}, and (if
address@hidden is not specified) renames the paths on the
address@hidden is not specified) renames the paths on the
 disk. This will be part of the next @command{commit}.
 
 The second form renames a number of source paths (or a single source,
@@ -5741,7 +5741,7 @@ @section Workspace
 @item mtn undrop @var{pathname...}
 Undoes a previous @command{drop}; useful when you make a mistake. If
 the file was deleted from the workspace, this reverts it. If it was
-not deleted (because it was changed or @command{--bookkeep-only} was
+not deleted (because it was changed or @option{--bookkeep-only} was
 given), it just removes the pending drop.
 
 @anchor{mtn address@hidden mtn update [--[no-]move-conflicting-paths] [--branch @var{branchname}]
@@ -5751,11 +5751,11 @@ @section Workspace
 
 @command{update} performs 3 separate stages. If any of these stages
 fails, the update aborts, doing nothing. The first two stages select
-the target revision; they are skipped if @command{--revision} is given
+the target revision; they are skipped if @option{--revision} is given
 - that revision is the target.
 
-In the first stage, if @command{--branch} is not given, the workspace
-branch is used. If @command{--branch} is given, the branch becomes the
+In the first stage, if @option{--branch} is not given, the workspace
+branch is used. If @option{--branch} is given, the branch becomes the
 new default branch of the workspace (even if you also specify an
 explicit @option{--revision} argument).
 
@@ -5960,7 +5960,7 @@ @section Network
 Finally, @command{clone} copies the files out of the newly created
 database into a local directory, just as @command{checkout} would.  If
 no @var{directory} is given, the @var{branchname} is used as
-directory. If @command{--revision} is given, that revision must be on
+directory. If @option{--revision} is given, that revision must be on
 the specified branch, and is checked out; otherwise the head of the
 branch is checked out.
 
@@ -5976,35 +5976,45 @@ @section Informative
 @item mtn annotate @var{file}
 @itemx mtn annotate address@hidden [--revs-only] @var{file}
 
-Dumps an annotated copy of the file to stdout. The output is in the form
-<short revision id>.. by <author> <date>: <line> Only the first 8
-characters of the revision id are displayed, the author cert value is
-truncated at the first @code{@@} or space character and the date field
-is truncated to remove the time of day.
+Dumps an annotated copy of the file to stdout. The output is in the
+form:
 
-If @option{--revs-only} is specified, each line of the file is
-translated to <revision id>: <line> in the output, where <revision id>
-is the revision in which that line of the file was last edited.
address@hidden
+<short revision id>.. by <author> <date>: <line>
address@hidden example
 
address@hidden mtn bisect good address@hidden ...] [--[no-]move-conflicting-paths]
-Mark the specified revisions as ``good'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
+<revision id> is the revision in which that line of the file was last
+edited; <author> is the author cert on that revision, <date> is the
+date cert on that revision.
 
+Only the first 8 characters of the revision id are displayed, the
+author cert value is truncated at the first @code{@@} or space
+character and the date field is truncated to remove the time of day.
+
+If @option{--revs-only} is specified, the output format is:
address@hidden
+ <revision id>: <line>
address@hidden example
+
address@hidden mtn bisect bad address@hidden ...] [--[no-]move-conflicting-paths]
+Mark the specified revisions as ``bad'' for the current bisection
+operation (see @ref{Bisecting}). If no bisection operation is in
+progress a new bisection is initialized. If a bisection operation is
+in progress the next update target is selected and the workspace is
+updated to the selected revision.
+
 If the update is blocked by conflicting unversioned paths existing in
 the workspace this command may be re-issued with the
 @option{--move-conflicting-paths} option. Alternatively, the
 @command{bisect update} command can be used with this option to update
 the workspace and move the conflicting paths out of the way.
 
address@hidden mtn bisect bad address@hidden ...] [--[no-]move-conflicting-paths]
-Mark the specified revisions as ``bad'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
address@hidden mtn bisect good address@hidden ...] [--[no-]move-conflicting-paths]
+Mark the specified revisions as ``good'' for the current bisection
+operation (see @ref{Bisecting}). If no bisection operation is in
+progress a new bisection is initialized. If a bisection operation is
+in progress the next update target is selected and the workspace is
+updated to the selected revision.
 
 If the update is blocked by conflicting unversioned paths existing in
 the workspace this command may be re-issued with the
@@ -6012,12 +6022,17 @@ @section Informative
 @command{bisect update} command can be used with this option to update
 the workspace and move the conflicting paths out of the way.
 
address@hidden mtn bisect reset
+Reset the current bisection operation by updating the workspace back
+to the revision from which the bisection was started and clearing the
+current bisection information.
+
 @item mtn bisect skip address@hidden ...] [--[no-]move-conflicting-paths]
 Mark the specified revisions as ``skipped'' for the current bisection
-operation. If no bisection operation is in progress a new bisection is
-initialized. If a bisection operation is in progress the next update
-target is selected and the workspace is updated to the selected
-revision.
+operation (see @ref{Bisecting}). If no bisection operation is in
+progress a new bisection is initialized. If a bisection operation is
+in progress the next update target is selected and the workspace is
+updated to the selected revision.
 
 If the update is blocked by conflicting unversioned paths existing in
 the workspace this command may be re-issued with the
@@ -6025,38 +6040,25 @@ @section Informative
 @command{bisect update} command can be used with this option to update
 the workspace and move the conflicting paths out of the way.
 
address@hidden mtn bisect update [--[no-]move-conflicting-paths]
-Update the workspace to the next revision selected by the previous
-bisect operation. This command can be useful when the previous bisect
-operation fails to update the workspace because of conflicting
-unversioned paths existing in the workspace.
-
 @item mtn bisect status
 Report the status of the current bisection operation including the
 number of revisions that remain to be tested, the number of revisions
 that have been tested and the next revision that will selected for
 testing.
 
address@hidden mtn bisect reset
-Reset the current bisection operation by updating the workspace back
-to the revision from which the bisection was started and clearing the
-current bisection information.
address@hidden mtn bisect update [--[no-]move-conflicting-paths]
+Update the workspace to the next revision selected by the previous
+bisect operation (see @ref{Bisecting}). This command can be useful
+when the previous bisect operation fails to update the workspace
+because of conflicting unversioned paths existing in the workspace.
 
address@hidden mtn cat @var{path}
address@hidden mtn cat address@hidden @var{path}
address@hidden mtn cat address@hidden @var{path}
+Write the contents of a specific file @var{path} in revision @var{id}
+(default to workspace base revision) to standard output.
 
-Write the contents of a specific file @var{path} to standard output.
-
-Without a @option{--revision} argument, the command outputs the
-contents of @var{path} as found in the current revision. This requires
-the command be executed from within a workspace.
-
-With an explicit @option{--revision} argument, the command outputs
-contents of @var{path} at that revision.
-
 @item mtn complete file @var{partial-id}
address@hidden mtn complete [--brief] key @var{partial-id}
address@hidden mtn complete [--brief] revision @var{partial-id}
address@hidden mtn complete key @var{partial-id}
address@hidden mtn complete revision @var{partial-id}
 
 These commands print out all known completions of a partial @sc{sha1}
 value, listing completions which are @code{file}, @code{manifest} or
@@ -6077,20 +6079,6 @@ @section Informative
 @code{fa36}. This command is intended to be used by programmable
 completion systems, such as those in @command{bash} and @command{zsh}.
 
-The complete command for keys and revisions have a @option{--verbose} option.
-Programmable completion systems can use @option{--verbose} output to
-present users with additional information about each completion option.
-
-For example, verbose output for @code{revision} looks like this:
address@hidden
address@hidden
-$ mtn complete revision 01f
-01f5da490941bee1f0000f0561fc62eabfb2fa23 graydon@@dub.net 2003-12-03T03:14:35
-01f992577bd8bcdcade0f89e724fd5dc2d2bbe8a kinetik@@orcon.nz 2005-05-11T05:19:29
-01faad191d8d0474777c70b4d606782942333a78 kinetik@@orcon.nz 2005-04-11T04:24:01
address@hidden group
address@hidden smallexample
-
 @item mtn diff [--unified] [--[no-]show-encloser]
 @itemx mtn diff --context [--[no-]show-encloser]
 @itemx mtn diff --external address@hidden
@@ -6100,12 +6088,12 @@ @section Informative
 @itemx mtn diff address@hidden address@hidden
 @itemx mtn diff address@hidden address@hidden @var{pathname...}
 @itemx mtn di
address@hidden is an alias for @command{diff}.
address@hidden is an alias for @command{diff}. See online help for more options.
 
-These commands print out GNU ``unified diff format'' textual difference
-listings between various manifest versions. With no @option{--revision}
-options, @command{diff} will print the difference from the
-base revision to the current revision in the workspace.
+These commands print out textual difference listings between various
+manifest versions. With no @option{--revision} options, @command{diff}
+will print the difference from the base revision to the current
+revision in the workspace.
 
 With one @option{--revision} option, @command{diff} will print the
 difference from the revision @var{id} to the current revision in the
@@ -6155,11 +6143,6 @@ @section Informative
 @ref{get_encloser_pattern}.  For the regular _expression_ syntax, see
 @ref{Regexps}.
 
address@hidden requests the ``unified diff'' format, the default.
address@hidden requests the ``context diff'' format (analogous to
-running the program @command{diff @option{-c}}).  Both of these formats are
-generated directly by monotone, using its built-in diff algorithm.
-
 Sometimes, you may want more flexibility in output formats; for these
 cases, you can use @option{--external}, which causes monotone to
 invoke an external program to generate the actual output.  By default,
@@ -6167,9 +6150,9 @@ @section Informative
 @option{--diff-args} to pass additional arguments controlling
 formatting.  The actual invocation of @command{diff}, default
 arguments passed to it, and so on, are controlled by the hook
address@hidden for more details.
address@hidden
 
address@hidden mtn help [--[no]-hidden] @var{command...}
address@hidden mtn help [--[no-]hidden] @var{command...}
 Displays help about commands and options.
 
 @item mtn list branches address@hidden address@hidden
@@ -6182,6 +6165,10 @@ @section Informative
 options are provided they are used as globs to exclude specified
 branches.
 
+Normally, branches that have been suspended are not listed; the global
+option @option{--ignore-suspend-certs} causes suspended branches to
+be listed; see @ref{mtn suspend}.
+
 @item mtn list certs @var{id}
 @itemx mtn ls certs
 @command{ls certs} is an alias for @command{list certs}.
@@ -6191,9 +6178,9 @@ @section Informative
 indicate:
 @itemize
 @item
-Whether the signature on the certificate is @code{ok} or @code{bad}
+The key used to sign the certificate
 @item
-The key used to sign the certificate
+Whether the signature on the certificate is @code{ok} or @code{bad}
 @item
 The name of the certificate
 @item
@@ -6240,10 +6227,10 @@ @section Informative
 @end group
 @end smallexample
 
address@hidden mtn list changed
address@hidden mtn list changed @var{pathname...}
address@hidden mtn list changed address@hidden
 @itemx mtn ls changed
 @command{ls changed} is an alias for @command{list changed}.
+See online help for more options.
 
 This command lists all files in your workspace that have changed
 compared to the base revision, including files that are dropped, added
@@ -6270,21 +6257,20 @@ @section Informative
 @itemx mtn ls duplicates
 @command{ls duplicates} is an alias for @command{list duplicates}.
 
-This command lists duplicate files in a given revision. If no revision is
-given, the workspace is used instead. Ignored and unknown files are
-excluded from the listing.
+This command lists duplicate files in a given revision (defaults to
+the workspace base revision). Ignored and unknown files are excluded
+from the listing.
 
 Two or more files are considered duplicates if the @sc{sha1} hashes of their
 contents are equal.
 
address@hidden mtn list ignored
address@hidden mtn list ignored @var{pathname...}
address@hidden mtn list ignored address@hidden
 @itemx mtn ls ignored
 @command{ls ignored} is an alias for @command{list ignored}.
 
 This command lists all files in your workspace that monotone is
-intentionally ignoring, due to the results of the @code{ignore_file
-(@var{filename})} hook.
+intentionally ignoring, due to the results of the @ref{ignore_file}
+hook.
 
 Specifying pathnames to the @command{list ignored} command restricts the
 set of paths that are searched for ignored files. Ignored files not
@@ -6295,8 +6281,7 @@ @section Informative
 Specifying only the pathname "." will restrict the search for ignored
 files to the current subdirectory of the workspace.
 
address@hidden mtn list keys
address@hidden mtn list keys @var{pattern}
address@hidden mtn list keys address@hidden
 @itemx mtn ls keys
 @command{ls keys} is an alias for @command{list keys}.
 
@@ -6307,8 +6292,7 @@ @section Informative
 If @var{pattern} is provided, it is used as a glob to limit the keys
 listed. Otherwise all keys in your database are listed.
 
address@hidden mtn list known
address@hidden mtn list known @var{pathname...}
address@hidden mtn list known address@hidden
 @itemx mtn ls known
 @command{ls known} is an alias for @command{list known}.
 
@@ -6324,8 +6308,7 @@ @section Informative
 Specifying only the pathname "." will restrict the search for known
 files to the current subdirectory of the workspace.
 
address@hidden mtn list missing
address@hidden mtn list missing @var{pathname...}
address@hidden mtn list missing address@hidden
 @itemx mtn ls missing
 @command{ls missing} is an alias for @command{list missing}.
 
@@ -6341,8 +6324,7 @@ @section Informative
 Specifying only the pathname "." will restrict the search for missing
 files to the current subdirectory of the workspace.
 
address@hidden mtn list vars
address@hidden mtn list vars @var{domain}
address@hidden mtn list vars address@hidden
 @itemx mtn ls vars
 @command{ls vars} is an alias for @command{list vars}.
 
@@ -6353,18 +6335,16 @@ @section Informative
 @itemx mtn ls tags
 @command{ls tags} is an alias for @command{list tags}.
 
-This command lists all known tags in your database. If @var{pattern}
-is provided, it is used as a glob to select the tags listed, otherwise
-all tags are listed.  If @option{-exclude} options are provided they
-are used as globs to exclude specified tags.
+This command lists all known tags in your database that match the
+given @var{pattern} (default all tags).  If @option{--exclude}
+options are provided they are used as globs to exclude specified tags.
 
address@hidden mtn list unknown
address@hidden mtn list unknown @var{pathname...}
address@hidden mtn list unknown address@hidden
 @itemx mtn ls unknown
 @command{ls unknown} is an alias for @command{list unknown}.
 
-This command lists all files in your workspace that monotone is
-either ignoring or knows nothing about.
+This command lists all files in your workspace that monotone knows
+nothing about.
 
 Specifying pathnames to the @command{list unknown} command restricts the
 set of paths that are searched for unknown files. Unknown files not
@@ -6377,6 +6357,7 @@ @section Informative
 
 @anchor{mtn address@hidden mtn log
 @itemx mtn log address@hidden address@hidden address@hidden [...]] [--clear-from] address@hidden [...]] [--clear-to] address@hidden [...]] [--[no-]brief] [--[no-]merges] [--[no-]files] [--[no-]graph] [--[no-]diffs] address@hidden
+See the online help for more options.
 
 This command prints out a log, in forward ancestry order by default
 but optionally in reverse ancestry order, of small history summaries.
@@ -6454,7 +6435,7 @@ @section Informative
 @item mtn manpage [--formatted/--plain] [--[no-]hidden]
 The manpage command generates a complete (and if monotone is available
 in your language, also localized) manual page for all available commands,
-including all custom Lua commands.
+including all user-defined Lua commands.
 
 If the command's output is directly written to a terminal, its output is
 automatically formatted using @command{nroff} and displayed in the
@@ -6463,7 +6444,7 @@ @section Informative
 option to the command and the @option{--plain} option to achieve the
 opposite, i.e. plain, unformatted troff output.  If you wish to use a
 different formatter or pager, please have a look at the
address@hidden Lua hook.
address@hidden Lua hook.
 
 The option @option{--hidden} additionally enables the output of hidden
 commands and options, which is deactivated by default.
@@ -6475,8 +6456,7 @@ @section Informative
 Note that this does not show conflicts due to update commands, since
 in that case one revision is the workspace.
 
address@hidden mtn status
address@hidden mtn status @var{pathname...}
address@hidden mtn status address@hidden
 This command prints a description of the ``status'' of your workspace.
 In particular, it prints:
 @itemize
@@ -6549,7 +6529,7 @@ @section Review
 one ancestor, since it hasn't been worked out how to generate such
 a descendant in the multi-ancestor case.
 
address@hidden mtn suspend @var{id}
address@hidden address@hidden mtn suspend @var{id}
 This command is a synonym for @command{mtn cert @var{id} suspend
 @var{branchname}} where @var{branchname} is the current branch name
 (either deduced from the workspace or from the @option{--branch}
@@ -6937,7 +6917,7 @@ @section Database
 
 Older monotone versions could sometimes associate certs with the wrong
 key. This fixes such certs if you have the correct key, and if
address@hidden is given, drops any certs that you don't
address@hidden is given, drops any certs that you don't
 have the correct key for. This should only be needed if you had such
 certs in your db when upgrading from monotone 0.44 or earlier, or if
 you loaded such certs with 'mtn read'.
@@ -11050,7 +11030,7 @@ @section Automation
 @item Arguments:
 
 Same as @command{mtn update}; no arguments, options
address@hidden, @address@hidden
address@hidden, @address@hidden
 
 @item Added in:
 
@@ -11786,7 +11766,7 @@ @subsection User Defaults
 @end group
 @end smallexample
 
address@hidden ignore_file (@var{filename})
address@hidden@item ignore_file (@var{filename})
 
 Returns @code{true} if @var{filename} should be ignored while adding,
 dropping, or moving files. Otherwise returns @code{false}. This is
@@ -11795,9 +11775,10 @@ @subsection User Defaults
 
 The default definition of this hook recognises a number of common file
 types and extensions for temporary and generated file types that users
-typically don't want to track. If the file @file{.mtn-ignore} exists,
-this hook will read a list of regular expressions from the file, one per
-line, and ignore all files matching one of these expressions. For the
+typically don't want to track. In addition, if the file
address@hidden exists in the root workspace directory, this hook
+will read a list of regular expressions from the file, one per line,
+and ignore all files matching one of these expressions. For the
 default definition of this hook, see @ref{Default hooks}.
 
 @item ignore_branch (@var{branchname})
@@ -11827,7 +11808,7 @@ @subsection User Defaults
 will issue warnings that the format is unsuitable and the
 @command{commit} command will abort.
 
address@hidden get_man_page_formatter_command ()
address@hidden@item get_man_page_formatter_command ()
 
 Specifies the command chain which should be executed if the
 @command{manpage} command is executed interactively. The default is
============================================================
--- cmd_list.cc	b039c7a5f47200b5a0043178d0d3909ce525f892
+++ cmd_list.cc	1c449f70b7633a20c1caf2f284494b9959ff0ca9
@@ -761,7 +761,7 @@ CMD(known, "known", "", CMD_REF(list), "
        ostream_iterator<file_path>(cout, "\n"));
 }
 
-CMD(unknown, "unknown", "ignored", CMD_REF(list), "",
+CMD(unknown, "unknown", "ignored", CMD_REF(list), "[PATH]",
     N_("Lists workspace files that do not belong to the current branch"),
     "",
     options::opts::depth | options::opts::exclude)
@@ -815,7 +815,7 @@ CMD(missing, "missing", "", CMD_REF(list
 }
 
 
-CMD(changed, "changed", "", CMD_REF(list), "",
+CMD(changed, "changed", "", CMD_REF(list), "[PATH...]",
     N_("Lists files that have changed with respect to the current revision"),
     "",
     options::opts::depth | options::opts::exclude)