1.1 --- a/en/ch09-hook.xml	Tue Apr 28 23:10:43 2009 -0700
     1.2 +++ b/en/ch09-hook.xml	Mon May 04 23:52:38 2009 -0700
     1.3 @@ -21,6 +21,12 @@
     1.4        supports. We will revisit each of these hooks in more detail
     1.5        later, in <xref linkend="sec:hook:ref"/>.</para>
     1.6  
     1.7 +    <para id="x_1f6">Each of the hooks whose description begins with the word
     1.8 +      <quote>Controlling</quote> has the ability to determine whether
     1.9 +      an activity can proceed.  If the hook succeeds, the activity may
    1.10 +      proceed; if it fails, the activity is either not permitted or
    1.11 +      undone, depending on the hook.</para>
    1.12 +
    1.13      <itemizedlist>
    1.14        <listitem><para id="x_1e9"><literal role="hook">changegroup</literal>: This
    1.15  	  is run after a group of changesets has been brought into the
    1.16 @@ -87,12 +93,6 @@
    1.17  	  finished.
    1.18  	</para>
    1.19        </listitem></itemizedlist>
    1.20 -    <para id="x_1f6">Each of the hooks whose description begins with the word
    1.21 -      <quote>Controlling</quote> has the ability to determine whether
    1.22 -      an activity can proceed.  If the hook succeeds, the activity may
    1.23 -      proceed; if it fails, the activity is either not permitted or
    1.24 -      undone, depending on the hook.
    1.25 -    </para>
    1.26  
    1.27    </sect1>
    1.28    <sect1>
    1.29 @@ -139,11 +139,11 @@
    1.30  	</para>
    1.31        </note>
    1.32  
    1.33 -      <para id="x_1fb">XXX To see what hooks are defined in a repository, use the
    1.34 -	<command role="hg-cmd">hg config hooks</command> command.  If
    1.35 -	you are working in one repository, but talking to another that
    1.36 -	you do not own (e.g. using <command role="hg-cmd">hg
    1.37 -	  pull</command> or <command role="hg-cmd">hg
    1.38 +      <para id="x_1fb">To see what hooks are defined in a repository,
    1.39 +	use the <command role="hg-cmd">hg showconfig hooks</command>
    1.40 +	command.  If you are working in one repository, but talking to
    1.41 +	another that you do not own (e.g. using <command
    1.42 +	  role="hg-cmd">hg pull</command> or <command role="hg-cmd">hg
    1.43  	  incoming</command>), remember that it is the other
    1.44  	repository's hooks you should be checking, not your own.
    1.45        </para>
    1.46 @@ -585,11 +585,11 @@
    1.47  
    1.48        &interaction.ch09-hook.ws.better;
    1.49  
    1.50 -      <para id="x_237">As a final aside, note in the example above the use of
    1.51 -	<command>perl</command>'s in-place editing feature to get rid
    1.52 -	of trailing whitespace from a file.  This is concise and
    1.53 -	useful enough that I will reproduce it here.
    1.54 -      </para>
    1.55 +      <para id="x_237">As a final aside, note in the example above the
    1.56 +	use of <command>sed</command>'s in-place editing feature to
    1.57 +	get rid of trailing whitespace from a file.  This is concise
    1.58 +	and useful enough that I will reproduce it here (using
    1.59 +	<command>perl</command> for good measure).</para>
    1.60        <programlisting>perl -pi -e 's,\s+$,,' filename</programlisting>
    1.61  
    1.62      </sect2>
    1.63 @@ -817,10 +817,7 @@
    1.64  		role="rc-item-bugzilla">version</envar>: The version
    1.65  	      of Bugzilla installed on the server.  The database
    1.66  	      schema that Bugzilla uses changes occasionally, so this
    1.67 -	      hook has to know exactly which schema to use. At the
    1.68 -	      moment, the only version supported is
    1.69 -	      <literal>2.16</literal>.
    1.70 -	    </para>
    1.71 +	      hook has to know exactly which schema to use.</para>
    1.72  	  </listitem>
    1.73  	  <listitem><para id="x_253"><envar role="rc-item-bugzilla">host</envar>:
    1.74  	      The hostname of the MySQL server that stores your