1.1 --- a/en/mq-ref.tex	Sun May 27 09:41:55 2007 -0700
     1.2 +++ b/en/mq-ref.tex	Sun May 27 09:57:17 2007 -0700
     1.3 @@ -18,7 +18,7 @@
     1.4  The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
     1.5  \sdirname{.hg/patches} repository.  This command only works if the
     1.6  \sdirname{.hg/patches} directory is a repository, i.e.~you created the
     1.7 -directory using \hgcmdargs{qinit}{\hgopt{qinit}{-c}} or ran
     1.8 +directory using \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} or ran
     1.9  \hgcmd{init} in the directory after running \hgxcmd{mq}{qinit}.
    1.10  
    1.11  This command is shorthand for \hgcmdargs{commit}{--cwd .hg/patches}.
    1.12 @@ -29,12 +29,12 @@
    1.13  The \hgxcmd{mq}{qdelete} command removes the entry for a patch from the
    1.14  \sfilename{series} file in the \sdirname{.hg/patches} directory.  It
    1.15  does not pop the patch if the patch is already applied.  By default,
    1.16 -it does not delete the patch file; use the \hgopt{qdel}{-f} option to
    1.17 +it does not delete the patch file; use the \hgxopt{mq}{qdel}{-f} option to
    1.18  do that.
    1.19  
    1.20  Options:
    1.21  \begin{itemize}
    1.22 -\item[\hgopt{qdel}{-f}] Delete the patch file.
    1.23 +\item[\hgxopt{mq}{qdel}{-f}] Delete the patch file.
    1.24  \end{itemize}
    1.25  
    1.26  \subsection{\hgxcmd{mq}{qdiff}---print a diff of the topmost applied patch}
    1.27 @@ -55,17 +55,17 @@
    1.28  
    1.29  The comments from the folded patches are appended to the comments of
    1.30  the destination patch, with each block of comments separated by three
    1.31 -asterisk (``\texttt{*}'') characters.  Use the \hgopt{qfold}{-e}
    1.32 +asterisk (``\texttt{*}'') characters.  Use the \hgxopt{mq}{qfold}{-e}
    1.33  option to edit the commit message for the combined patch/changeset
    1.34  after the folding has completed.
    1.35  
    1.36  Options:
    1.37  \begin{itemize}
    1.38 -\item[\hgopt{qfold}{-e}] Edit the commit message and patch description
    1.39 +\item[\hgxopt{mq}{qfold}{-e}] Edit the commit message and patch description
    1.40    for the newly folded patch.
    1.41 -\item[\hgopt{qfold}{-l}] Use the contents of the given file as the new
    1.42 +\item[\hgxopt{mq}{qfold}{-l}] Use the contents of the given file as the new
    1.43    commit message and patch description for the folded patch.
    1.44 -\item[\hgopt{qfold}{-m}] Use the given text as the new commit message
    1.45 +\item[\hgxopt{mq}{qfold}{-m}] Use the given text as the new commit message
    1.46    and patch description for the folded patch.
    1.47  \end{itemize}
    1.48  
    1.49 @@ -93,7 +93,7 @@
    1.50  
    1.51  Options:
    1.52  \begin{itemize}
    1.53 -\item[\hgopt{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
    1.54 +\item[\hgxopt{mq}{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
    1.55    in its own right.  Also creates a \sfilename{.hgignore} file that
    1.56    will ignore the \sfilename{status} file.
    1.57  \end{itemize}
    1.58 @@ -111,17 +111,17 @@
    1.59  pushed on top of that patch.
    1.60  
    1.61  If \hgxcmd{mq}{qnew} finds modified files in the working directory, it will
    1.62 -refuse to create a new patch unless the \hgopt{qnew}{-f} option is
    1.63 +refuse to create a new patch unless the \hgxopt{mq}{qnew}{-f} option is
    1.64  used (see below).  This behaviour allows you to \hgxcmd{mq}{qrefresh} your
    1.65  topmost applied patch before you apply a new patch on top of it.
    1.66  
    1.67  Options:
    1.68  \begin{itemize}
    1.69 -\item[\hgopt{qnew}{-f}] Create a new patch if the contents of the
    1.70 +\item[\hgxopt{mq}{qnew}{-f}] Create a new patch if the contents of the
    1.71    working directory are modified.  Any outstanding modifications are
    1.72    added to the newly created patch, so after this command completes,
    1.73    the working directory will no longer be modified.
    1.74 -\item[\hgopt{qnew}{-m}] Use the given text as the commit message.
    1.75 +\item[\hgxopt{mq}{qnew}{-m}] Use the given text as the commit message.
    1.76    This text will be stored at the beginning of the patch file, before
    1.77    the patch data.
    1.78  \end{itemize}
    1.79 @@ -157,16 +157,16 @@
    1.80  
    1.81  By default, the \hgxcmd{mq}{qpop} command will not pop any patches if the
    1.82  working directory has been modified.  You can override this behaviour
    1.83 -using the \hgopt{qpop}{-f} option, which reverts all modifications in
    1.84 +using the \hgxopt{mq}{qpop}{-f} option, which reverts all modifications in
    1.85  the working directory.
    1.86  
    1.87  Options:
    1.88  \begin{itemize}
    1.89 -\item[\hgopt{qpop}{-a}] Pop all applied patches.  This returns the
    1.90 +\item[\hgxopt{mq}{qpop}{-a}] Pop all applied patches.  This returns the
    1.91    repository to its state before you applied any patches.
    1.92 -\item[\hgopt{qpop}{-f}] Forcibly revert any modifications to the
    1.93 +\item[\hgxopt{mq}{qpop}{-f}] Forcibly revert any modifications to the
    1.94    working directory when popping.
    1.95 -\item[\hgopt{qpop}{-n}] Pop a patch from the named queue.
    1.96 +\item[\hgxopt{mq}{qpop}{-n}] Pop a patch from the named queue.
    1.97  \end{itemize}
    1.98  
    1.99  The \hgxcmd{mq}{qpop} command removes one line from the end of the
   1.100 @@ -205,16 +205,16 @@
   1.101  
   1.102  Options:
   1.103  \begin{itemize}
   1.104 -\item[\hgopt{qpush}{-a}] Push all unapplied patches from the
   1.105 +\item[\hgxopt{mq}{qpush}{-a}] Push all unapplied patches from the
   1.106    \sfilename{series} file until there are none left to push.
   1.107 -\item[\hgopt{qpush}{-l}] Add the name of the patch to the end
   1.108 +\item[\hgxopt{mq}{qpush}{-l}] Add the name of the patch to the end
   1.109    of the commit message.
   1.110 -\item[\hgopt{qpush}{-m}] If a patch fails to apply cleanly, use the
   1.111 +\item[\hgxopt{mq}{qpush}{-m}] If a patch fails to apply cleanly, use the
   1.112    entry for the patch in another saved queue to compute the parameters
   1.113    for a three-way merge, and perform a three-way merge using the
   1.114    normal Mercurial merge machinery.  Use the resolution of the merge
   1.115    as the new patch content.
   1.116 -\item[\hgopt{qpush}{-n}] Use the named queue if merging while pushing.
   1.117 +\item[\hgxopt{mq}{qpush}{-n}] Use the named queue if merging while pushing.
   1.118  \end{itemize}
   1.119  
   1.120  The \hgxcmd{mq}{qpush} command reads, but does not modify, the
   1.121 @@ -247,11 +247,11 @@
   1.122  
   1.123  Options:
   1.124  \begin{itemize}
   1.125 -\item[\hgopt{qrefresh}{-e}] Modify the commit and patch description,
   1.126 +\item[\hgxopt{mq}{qrefresh}{-e}] Modify the commit and patch description,
   1.127    using the preferred text editor.
   1.128 -\item[\hgopt{qrefresh}{-m}] Modify the commit message and patch
   1.129 +\item[\hgxopt{mq}{qrefresh}{-m}] Modify the commit message and patch
   1.130    description, using the given text.
   1.131 -\item[\hgopt{qrefresh}{-l}] Modify the commit message and patch
   1.132 +\item[\hgxopt{mq}{qrefresh}{-l}] Modify the commit message and patch
   1.133    description, using text from the given file.
   1.134  \end{itemize}
   1.135  
   1.136 @@ -336,7 +336,7 @@
   1.137  Placing the \sfilename{series} file under revision control is also
   1.138  supported; it is a good idea to place all of the patches that it
   1.139  refers to under revision control, as well.  If you create a patch
   1.140 -directory using the \hgopt{qinit}{-c} option to \hgxcmd{mq}{qinit}, this
   1.141 +directory using the \hgxopt{mq}{qinit}{-c} option to \hgxcmd{mq}{qinit}, this
   1.142  will be done for you automatically.
   1.143  
   1.144  \subsection{The \sfilename{status} file}