hgbook
diff en/00book.xml @ 650:7e7c47481e4f
Oops, this is the real merge for my hg's oddity
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Fri Mar 20 16:43:35 2009 +0800 (2009-03-20) |
| parents | cfdb601a3c8b |
| children | 751ee9bf2e8d |
line diff
1.1 --- a/en/00book.xml Thu Mar 12 15:51:39 2009 +0800 1.2 +++ b/en/00book.xml Fri Mar 20 16:43:35 2009 +0800 1.3 @@ -7,20 +7,20 @@ 1.4 1.5 <!-- Chapters. --> 1.6 1.7 -<!ENTITY ch01 SYSTEM "ch01-intro.xml"> 1.8 -<!ENTITY ch02 SYSTEM "ch02-tour-basic.xml"> 1.9 -<!ENTITY ch03 SYSTEM "ch03-tour-merge.xml"> 1.10 -<!ENTITY ch04 SYSTEM "ch04-concepts.xml"> 1.11 -<!ENTITY ch05 SYSTEM "ch05-daily.xml"> 1.12 -<!ENTITY ch06 SYSTEM "ch06-collab.xml"> 1.13 -<!ENTITY ch07 SYSTEM "ch07-filenames.xml"> 1.14 -<!ENTITY ch08 SYSTEM "ch08-branch.xml"> 1.15 -<!ENTITY ch09 SYSTEM "ch09-undo.xml"> 1.16 -<!ENTITY ch10 SYSTEM "ch10-hook.xml"> 1.17 -<!ENTITY ch11 SYSTEM "ch11-template.xml"> 1.18 -<!ENTITY ch12 SYSTEM "ch12-mq.xml"> 1.19 -<!ENTITY ch13 SYSTEM "ch13-mq-collab.xml"> 1.20 -<!ENTITY ch14 SYSTEM "ch14-hgext.xml"> 1.21 +<!ENTITY ch00 SYSTEM "ch00-preface.xml"> 1.22 +<!ENTITY ch01 SYSTEM "ch01-tour-basic.xml"> 1.23 +<!ENTITY ch02 SYSTEM "ch02-tour-merge.xml"> 1.24 +<!ENTITY ch03 SYSTEM "ch03-concepts.xml"> 1.25 +<!ENTITY ch04 SYSTEM "ch04-daily.xml"> 1.26 +<!ENTITY ch05 SYSTEM "ch05-collab.xml"> 1.27 +<!ENTITY ch06 SYSTEM "ch06-filenames.xml"> 1.28 +<!ENTITY ch07 SYSTEM "ch07-branch.xml"> 1.29 +<!ENTITY ch08 SYSTEM "ch08-undo.xml"> 1.30 +<!ENTITY ch09 SYSTEM "ch09-hook.xml"> 1.31 +<!ENTITY ch10 SYSTEM "ch10-template.xml"> 1.32 +<!ENTITY ch11 SYSTEM "ch11-mq.xml"> 1.33 +<!ENTITY ch12 SYSTEM "ch12-mq-collab.xml"> 1.34 +<!ENTITY ch13 SYSTEM "ch13-hgext.xml"> 1.35 <!ENTITY appA SYSTEM "appA-cmdref.xml"> 1.36 <!ENTITY appB SYSTEM "appB-mq-ref.xml"> 1.37 <!ENTITY appC SYSTEM "appC-srcinstall.xml"> 1.38 @@ -79,7 +79,6 @@ 1.39 &ch11; 1.40 &ch12; 1.41 &ch13; 1.42 - &ch14; 1.43 <!-- &appA; --> 1.44 &appB; 1.45 &appC;