1.1 --- a/en/mq-collab.tex	Tue May 15 16:24:20 2007 -0700
     1.2 +++ b/en/mq-collab.tex	Sun May 27 09:41:55 2007 -0700
     1.3 @@ -108,7 +108,7 @@
     1.4  
     1.5  \section{Controlling the guards on a patch}
     1.6  
     1.7 -The \hgcmd{qguard} command lets you determine which guards should
     1.8 +The \hgxcmd{mq}{qguard} command lets you determine which guards should
     1.9  apply to a patch, or display the guards that are already in effect.
    1.10  Without any arguments, it displays the guards on the current topmost
    1.11  patch.
    1.12 @@ -121,7 +121,7 @@
    1.13  \interaction{mq.guards.qguard.neg}
    1.14  
    1.15  \begin{note}
    1.16 -  The \hgcmd{qguard} command \emph{sets} the guards on a patch; it
    1.17 +  The \hgxcmd{mq}{qguard} command \emph{sets} the guards on a patch; it
    1.18    doesn't \emph{modify} them.  What this means is that if you run
    1.19    \hgcmdargs{qguard}{+a +b} on a patch, then \hgcmdargs{qguard}{+c} on
    1.20    the same patch, the \emph{only} guard that will be set on it
    1.21 @@ -130,20 +130,20 @@
    1.22  
    1.23  Mercurial stores guards in the \sfilename{series} file; the form in
    1.24  which they are stored is easy both to understand and to edit by hand.
    1.25 -(In other words, you don't have to use the \hgcmd{qguard} command if
    1.26 +(In other words, you don't have to use the \hgxcmd{mq}{qguard} command if
    1.27  you don't want to; it's okay to simply edit the \sfilename{series}
    1.28  file.)
    1.29  \interaction{mq.guards.series}
    1.30  
    1.31  \section{Selecting the guards to use}
    1.32  
    1.33 -The \hgcmd{qselect} command determines which guards are active at a
    1.34 +The \hgxcmd{mq}{qselect} command determines which guards are active at a
    1.35  given time.  The effect of this is to determine which patches MQ will
    1.36 -apply the next time you run \hgcmd{qpush}.  It has no other effect; in
    1.37 +apply the next time you run \hgxcmd{mq}{qpush}.  It has no other effect; in
    1.38  particular, it doesn't do anything to patches that are already
    1.39  applied.
    1.40  
    1.41 -With no arguments, the \hgcmd{qselect} command lists the guards
    1.42 +With no arguments, the \hgxcmd{mq}{qselect} command lists the guards
    1.43  currently in effect, one per line of output.  Each argument is treated
    1.44  as the name of a guard to apply.
    1.45  \interaction{mq.guards.qselect.foo}
    1.46 @@ -151,7 +151,7 @@
    1.47  the \sfilename{guards} file.
    1.48  \interaction{mq.guards.qselect.cat}
    1.49  We can see the effect the selected guards have when we run
    1.50 -\hgcmd{qpush}.
    1.51 +\hgxcmd{mq}{qpush}.
    1.52  \interaction{mq.guards.qselect.qpush}
    1.53  
    1.54  A guard cannot start with a ``\texttt{+}'' or ``\texttt{-}''