Mercurial > hgbook
diff en/ch01-tour-basic.xml @ 691:4ce9d0754af3
Remove the words "section", "chapter", etc from in front of xref tags.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 26 Mar 2009 21:22:03 -0700 |
parents | b788b405e141 |
children | 0b45854f0b7b |
line wrap: on
line diff
--- a/en/ch01-tour-basic.xml Thu Mar 26 21:07:39 2009 -0700 +++ b/en/ch01-tour-basic.xml Thu Mar 26 21:22:03 2009 -0700 @@ -246,8 +246,8 @@ log</command> is purely a summary; it is missing a lot of detail.</para> - <para id="x_23">Figure <xref linkend="fig:tour-basic:history"/> provides a - graphical representation of the history of the <filename + <para id="x_23"><xref linkend="fig:tour-basic:history"/> provides + a graphical representation of the history of the <filename class="directory">hello</filename> repository, to make it a little easier to see which direction history is <quote>flowing</quote> in. We'll be returning to this figure @@ -351,13 +351,13 @@ &interaction.tour.log-v; - <para id="x_2f">If you want to see both the description and content of a - change, add the <option role="hg-opt-log">-p</option> (or - <option role="hg-opt-log">--patch</option>) option. This - displays the content of a change as a <emphasis>unified - diff</emphasis> (if you've never seen a unified diff before, - see section <xref linkend="sec:mq:patch"/> for an - overview).</para> + <para id="x_2f">If you want to see both the description and + content of a change, add the <option + role="hg-opt-log">-p</option> (or <option + role="hg-opt-log">--patch</option>) option. This displays + the content of a change as a <emphasis>unified diff</emphasis> + (if you've never seen a unified diff before, see <xref + linkend="sec:mq:patch"/> for an overview).</para> &interaction.tour.log-vp; @@ -509,11 +509,12 @@ <listitem><para id="x_44">If you have set the <envar>HGUSER</envar> environment variable, this is checked next.</para></listitem> - <listitem><para id="x_45">If you create a file in your home directory - called <filename role="special">.hgrc</filename>, with a - <envar role="rc-item-ui">username</envar> entry, that will - be used next. To see what the contents of this file - should look like, refer to section <xref + <listitem><para id="x_45">If you create a file in your home + directory called <filename + role="special">.hgrc</filename>, with a <envar + role="rc-item-ui">username</envar> entry, that will be + used next. To see what the contents of this file should + look like, refer to <xref linkend="sec:tour-basic:username"/> below.</para></listitem> <listitem><para id="x_46">If you have set the <envar>EMAIL</envar> @@ -727,12 +728,12 @@ <sect2> <title>Updating the working directory</title> - <para id="x_5e">We have so far glossed over the relationship between a - repository and its working directory. The <command + <para id="x_5e">We have so far glossed over the relationship + between a repository and its working directory. The <command role="hg-cmd">hg pull</command> command that we ran in - section <xref linkend="sec:tour:pull"/> brought changes - into the repository, but if we check, there's no sign of those - changes in the working directory. This is because <command + <xref linkend="sec:tour:pull"/> brought changes into the + repository, but if we check, there's no sign of those changes + in the working directory. This is because <command role="hg-cmd">hg pull</command> does not (by default) touch the working directory. Instead, we use the <command role="hg-cmd">hg update</command> command to do this.</para> @@ -756,7 +757,7 @@ role="hg-cmd">hg pull</command>.</para> <para id="x_61">If you look back at the output of <command - role="hg-cmd">hg pull</command> in section <xref + role="hg-cmd">hg pull</command> in <xref linkend="sec:tour:pull"/> when we ran it without <option role="hg-opt-pull">-u</option>, you can see that it printed a helpful reminder that we'd have to take an explicit step to @@ -770,7 +771,7 @@ &interaction.tour.parents; - <para id="x_63">If you look back at figure <xref + <para id="x_63">If you look back at <xref linkend="fig:tour-basic:history"/>, you'll see arrows connecting each changeset. The node that the arrow leads <emphasis>from</emphasis> in each case is a