hgbook
diff en/ch02-tour-merge.xml @ 609:c44d5854620b
Fix up chapter 1.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 22:38:30 2009 -0700 (2009-03-31) |
| parents | 4ce9d0754af3 |
| children | 4e23c220d1b0 1c13ed2130a7 |
line diff
1.1 --- a/en/ch02-tour-merge.xml Thu Mar 26 21:22:03 2009 -0700 1.2 +++ b/en/ch02-tour-merge.xml Tue Mar 31 22:38:30 2009 -0700 1.3 @@ -48,7 +48,7 @@ 1.4 class="directory">my-new-hello</filename> 1.5 repositories</title> 1.6 <mediaobject> 1.7 - <imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject> 1.8 + <imageobject><imagedata fileref="figs/tour-merge-sep-repos.png"/></imageobject> 1.9 <textobject><phrase>XXX add text</phrase></textobject> 1.10 </mediaobject> 1.11 </figure> 1.12 @@ -77,7 +77,7 @@ 1.13 class="directory">my-new-hello</filename></title> 1.14 <mediaobject> 1.15 <imageobject> 1.16 - <imagedata fileref="tour-merge-pull"/> 1.17 + <imagedata fileref="figs/tour-merge-pull.png"/> 1.18 </imageobject> 1.19 <textobject><phrase>XXX add text</phrase></textobject> 1.20 </mediaobject> 1.21 @@ -124,7 +124,7 @@ 1.22 following commit</title> 1.23 <mediaobject> 1.24 <imageobject> 1.25 - <imagedata fileref="tour-merge-merge"/> 1.26 + <imagedata fileref="figs/tour-merge-merge.png"/> 1.27 </imageobject> 1.28 <textobject><phrase>XXX add text</phrase></textobject> 1.29 </mediaobject> 1.30 @@ -179,7 +179,7 @@ 1.31 <figure id="fig:tour-merge:conflict"> 1.32 <title>Conflicting changes to a document</title> 1.33 <mediaobject> 1.34 - <imageobject><imagedata fileref="tour-merge-conflict"/></imageobject> 1.35 + <imageobject><imagedata fileref="figs/tour-merge-conflict.png"/></imageobject> 1.36 <textobject><phrase>XXX add text</phrase></textobject> 1.37 </mediaobject> 1.38 </figure> 1.39 @@ -249,7 +249,7 @@ 1.40 file</title> 1.41 <mediaobject> 1.42 <imageobject> 1.43 - <imagedata fileref="kdiff3"/></imageobject> 1.44 + <imagedata fileref="figs/kdiff3.png"/></imageobject> 1.45 <textobject> 1.46 <phrase>XXX add text</phrase> 1.47 </textobject>