diff en/00book.xml @ 749:7e7c47481e4f

Oops, this is the real merge for my hg's oddity

--- a/en/00book.xml	Fri Mar 20 15:40:06 2009 +0800
+++ b/en/00book.xml	Fri Mar 20 16:43:35 2009 +0800
@@ -7,20 +7,20 @@
 
 <!-- Chapters. -->
 
-<!ENTITY ch01     SYSTEM "ch01-intro.xml">
-<!ENTITY ch02     SYSTEM "ch02-tour-basic.xml">
-<!ENTITY ch03     SYSTEM "ch03-tour-merge.xml">
-<!ENTITY ch04     SYSTEM "ch04-concepts.xml">
-<!ENTITY ch05     SYSTEM "ch05-daily.xml">
-<!ENTITY ch06     SYSTEM "ch06-collab.xml">
-<!ENTITY ch07     SYSTEM "ch07-filenames.xml">
-<!ENTITY ch08     SYSTEM "ch08-branch.xml">
-<!ENTITY ch09     SYSTEM "ch09-undo.xml">
-<!ENTITY ch10     SYSTEM "ch10-hook.xml">
-<!ENTITY ch11     SYSTEM "ch11-template.xml">
-<!ENTITY ch12     SYSTEM "ch12-mq.xml">
-<!ENTITY ch13     SYSTEM "ch13-mq-collab.xml">
-<!ENTITY ch14     SYSTEM "ch14-hgext.xml">
+<!ENTITY ch00     SYSTEM "ch00-preface.xml">
+<!ENTITY ch01     SYSTEM "ch01-tour-basic.xml">
+<!ENTITY ch02     SYSTEM "ch02-tour-merge.xml">
+<!ENTITY ch03     SYSTEM "ch03-concepts.xml">
+<!ENTITY ch04     SYSTEM "ch04-daily.xml">
+<!ENTITY ch05     SYSTEM "ch05-collab.xml">
+<!ENTITY ch06     SYSTEM "ch06-filenames.xml">
+<!ENTITY ch07     SYSTEM "ch07-branch.xml">
+<!ENTITY ch08     SYSTEM "ch08-undo.xml">
+<!ENTITY ch09     SYSTEM "ch09-hook.xml">
+<!ENTITY ch10     SYSTEM "ch10-template.xml">
+<!ENTITY ch11     SYSTEM "ch11-mq.xml">
+<!ENTITY ch12     SYSTEM "ch12-mq-collab.xml">
+<!ENTITY ch13     SYSTEM "ch13-hgext.xml">
 <!ENTITY appA     SYSTEM "appA-cmdref.xml">
 <!ENTITY appB     SYSTEM "appB-mq-ref.xml">
 <!ENTITY appC     SYSTEM "appC-srcinstall.xml">
@@ -79,7 +79,6 @@
   &ch11;
   &ch12;
   &ch13;
-  &ch14;
   <!-- &appA; -->
   &appB;
   &appC;