hgbook
diff it/examples/auto-snippets.xml @ 785:0bf0bf61493e
Minor changes and translation of code snippets for Ch.3.
author | Giulio@puck |
---|---|
date | Mon Aug 10 21:59:18 2009 +0200 (2009-08-10) |
parents | 6ba4c405d262 |
children | c09a6231bc79 |
line diff
1.1 --- a/it/examples/auto-snippets.xml Sun Aug 09 17:14:29 2009 +0200 1.2 +++ b/it/examples/auto-snippets.xml Mon Aug 10 21:59:18 2009 +0200 1.3 @@ -221,12 +221,12 @@ 1.4 <!ENTITY interaction.template.svnstyle.syntax.error SYSTEM "results/template.svnstyle.syntax.error.lxo"> 1.5 <!ENTITY interaction.template.svnstyle.syntax.input SYSTEM "results/template.svnstyle.syntax.input.lxo"> 1.6 <!ENTITY interaction.template.svnstyle.template SYSTEM "results/template.svnstyle.template.lxo"> 1.7 -<!ENTITY interaction.tour-merge-conflict.commit SYSTEM "results/tour-merge-conflict.commit.lxo"> 1.8 -<!ENTITY interaction.tour-merge-conflict.cousin SYSTEM "results/tour-merge-conflict.cousin.lxo"> 1.9 -<!ENTITY interaction.tour-merge-conflict.merge SYSTEM "results/tour-merge-conflict.merge.lxo"> 1.10 -<!ENTITY interaction.tour-merge-conflict.pull SYSTEM "results/tour-merge-conflict.pull.lxo"> 1.11 -<!ENTITY interaction.tour-merge-conflict.son SYSTEM "results/tour-merge-conflict.son.lxo"> 1.12 -<!ENTITY interaction.tour-merge-conflict.wife SYSTEM "results/tour-merge-conflict.wife.lxo"> 1.13 +<!ENTITY interaction.tour-merge-conflict.commit SYSTEM "tour-merge-conflict.commit.it"> 1.14 +<!ENTITY interaction.tour-merge-conflict.cousin SYSTEM "tour-merge-conflict.cousin.it"> 1.15 +<!ENTITY interaction.tour-merge-conflict.merge SYSTEM "tour-merge-conflict.merge.it"> 1.16 +<!ENTITY interaction.tour-merge-conflict.pull SYSTEM "tour-merge-conflict.pull.it"> 1.17 +<!ENTITY interaction.tour-merge-conflict.son SYSTEM "tour-merge-conflict.son.it"> 1.18 +<!ENTITY interaction.tour-merge-conflict.wife SYSTEM "tour-merge-conflict.wife.it"> 1.19 <!ENTITY interaction.tour.cat1 SYSTEM "tour.cat1.it"> 1.20 <!ENTITY interaction.tour.cat2 SYSTEM "tour.cat2.it"> 1.21 <!ENTITY interaction.tour.clone SYSTEM "tour.clone.it"> 1.22 @@ -246,20 +246,20 @@ 1.23 <!ENTITY interaction.tour.lxogoing SYSTEM "results/tour.lxogoing.lxo"> 1.24 <!ENTITY interaction.tour.lxogoing.net SYSTEM "results/tour.lxogoing.net.lxo"> 1.25 <!ENTITY interaction.tour.merge.cat SYSTEM "results/tour.merge.cat.lxo"> 1.26 -<!ENTITY interaction.tour.merge.cat1 SYSTEM "results/tour.merge.cat1.lxo"> 1.27 -<!ENTITY interaction.tour.merge.cat2 SYSTEM "results/tour.merge.cat2.lxo"> 1.28 -<!ENTITY interaction.tour.merge.clone SYSTEM "results/tour.merge.clone.lxo"> 1.29 -<!ENTITY interaction.tour.merge.commit SYSTEM "results/tour.merge.commit.lxo"> 1.30 +<!ENTITY interaction.tour.merge.cat1 SYSTEM "tour.merge.cat1.it"> 1.31 +<!ENTITY interaction.tour.merge.cat2 SYSTEM "tour.merge.cat2.it"> 1.32 +<!ENTITY interaction.tour.merge.clone SYSTEM "tour.merge.clone.it"> 1.33 +<!ENTITY interaction.tour.merge.commit SYSTEM "tour.merge.commit.it"> 1.34 <!ENTITY interaction.tour.merge.dummy1 SYSTEM "results/tour.merge.dummy1.lxo"> 1.35 <!ENTITY interaction.tour.merge.dummy2 SYSTEM "results/tour.merge.dummy2.lxo"> 1.36 <!ENTITY interaction.tour.merge.dummy3 SYSTEM "results/tour.merge.dummy3.lxo"> 1.37 <!ENTITY interaction.tour.merge.dummy4 SYSTEM "results/tour.merge.dummy4.lxo"> 1.38 -<!ENTITY interaction.tour.merge.heads SYSTEM "results/tour.merge.heads.lxo"> 1.39 -<!ENTITY interaction.tour.merge.merge SYSTEM "results/tour.merge.merge.lxo"> 1.40 -<!ENTITY interaction.tour.merge.parents SYSTEM "results/tour.merge.parents.lxo"> 1.41 -<!ENTITY interaction.tour.merge.pull SYSTEM "results/tour.merge.pull.lxo"> 1.42 -<!ENTITY interaction.tour.merge.tip SYSTEM "results/tour.merge.tip.lxo"> 1.43 -<!ENTITY interaction.tour.merge.update SYSTEM "results/tour.merge.update.lxo"> 1.44 +<!ENTITY interaction.tour.merge.heads SYSTEM "tour.merge.heads.it"> 1.45 +<!ENTITY interaction.tour.merge.merge SYSTEM "tour.merge.merge.it"> 1.46 +<!ENTITY interaction.tour.merge.parents SYSTEM "tour.merge.parents.it"> 1.47 +<!ENTITY interaction.tour.merge.pull SYSTEM "tour.merge.pull.it"> 1.48 +<!ENTITY interaction.tour.merge.tip SYSTEM "tour.merge.tip.it"> 1.49 +<!ENTITY interaction.tour.merge.update SYSTEM "tour.merge.update.it"> 1.50 <!ENTITY interaction.tour.older SYSTEM "tour.older.it"> 1.51 <!ENTITY interaction.tour.outgoing SYSTEM "tour.outgoing.it"> 1.52 <!ENTITY interaction.tour.outgoing.net SYSTEM "tour.outgoing.net.it">