From a61314f8b4effd4233b248a122558bff85eb5efa Mon Sep 17 00:00:00 2001
From: YuCheng Hu <yhu@isharkfly.com>
Date: Mon, 28 Jun 2010 21:14:49 +0000
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=9B=AE=E5=BD=95=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+YUCHENG HU+

git-svn-id: https://svn.code.sf.net/p/hawebs/svn@391 a2543c7e-f6e9-4f8a-8bff-1ffc34733512
---
 .../maven/trunk/out/definitive_guide/docs/dita.list  | 12 ++++++------
 .../out/definitive_guide/docs/dita.xml.properties    | 10 +++++-----
 .../docs/tasks/chapter1/chapter1.html                |  3 +++
 .../docs/tasks/chapter1/chapter1_1.html              |  4 ++--
 .../maven/trunk/out/definitive_guide/docs/toc.html   |  1 +
 .../src/definitive_guide/definitive_guide.ditamap    |  3 ++-
 .../definitive_guide/tasks/chapter1/chapter1_1.dita  |  2 +-
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/hadocs/maven/trunk/out/definitive_guide/docs/dita.list b/hadocs/maven/trunk/out/definitive_guide/docs/dita.list
index 07dbb10c..d9da9950 100644
--- a/hadocs/maven/trunk/out/definitive_guide/docs/dita.list
+++ b/hadocs/maven/trunk/out/definitive_guide/docs/dita.list
@@ -1,12 +1,12 @@
-#Mon Jun 28 02:03:20 EDT 2010
+#Mon Jun 28 17:08:04 EDT 2010
 copytosourcelist=
-hreftargetslist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita
+hreftargetslist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita
 fullditatopicfile=fullditatopic.list
 fullditamapandtopicfile=fullditamapandtopic.list
-fullditatopiclist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita
-fullditamapandtopiclist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,definitive_guide.ditamap,tasks/info/hacopyright.dita
+fullditatopiclist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita
+fullditamapandtopiclist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,definitive_guide.ditamap,tasks/info/hacopyright.dita
 hrefditatopicfile=hrefditatopic.list
-hrefditatopiclist=tasks/chapter1/chapter1_1.dita,tasks/info/hacopyright.dita
+hrefditatopiclist=tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita
 user.input.file=definitive_guide.ditamap
 subtargetsfile=subtargets.list
 fullditamapfile=fullditamap.list
@@ -27,7 +27,7 @@ imagelist=images/halogo.jpg
 htmlfile=html.list
 htmllist=
 canditopicsfile=canditopics.list
-canditopicslist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita
+canditopicslist=tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita
 keyreffile=keyref.list
 subjectschemefile=subjectscheme.list
 keyreflist=
diff --git a/hadocs/maven/trunk/out/definitive_guide/docs/dita.xml.properties b/hadocs/maven/trunk/out/definitive_guide/docs/dita.xml.properties
index 177c9c51..372a4aeb 100644
--- a/hadocs/maven/trunk/out/definitive_guide/docs/dita.xml.properties
+++ b/hadocs/maven/trunk/out/definitive_guide/docs/dita.xml.properties
@@ -3,13 +3,13 @@
   SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
    <entry key="copytosourcelist"></entry>
-   <entry key="hreftargetslist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita</entry>
+   <entry key="hreftargetslist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita</entry>
    <entry key="fullditatopicfile">fullditatopic.list</entry>
    <entry key="fullditamapandtopicfile">fullditamapandtopic.list</entry>
-   <entry key="fullditatopiclist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita</entry>
-   <entry key="fullditamapandtopiclist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,definitive_guide.ditamap,tasks/info/hacopyright.dita</entry>
+   <entry key="fullditatopiclist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita</entry>
+   <entry key="fullditamapandtopiclist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,definitive_guide.ditamap,tasks/info/hacopyright.dita</entry>
    <entry key="hrefditatopicfile">hrefditatopic.list</entry>
-   <entry key="hrefditatopiclist">tasks/chapter1/chapter1_1.dita,tasks/info/hacopyright.dita</entry>
+   <entry key="hrefditatopiclist">tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita</entry>
    <entry key="user.input.file">definitive_guide.ditamap</entry>
    <entry key="subtargetsfile">subtargets.list</entry>
    <entry key="fullditamapfile">fullditamap.list</entry>
@@ -30,7 +30,7 @@
    <entry key="htmlfile">html.list</entry>
    <entry key="htmllist"></entry>
    <entry key="canditopicsfile">canditopics.list</entry>
-   <entry key="canditopicslist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/info/hacopyright.dita</entry>
+   <entry key="canditopicslist">tasks/info/apachelicense.dita,tasks/chapter1/chapter1_1.dita,tasks/chapter1/chapter1.dita,tasks/chapter1/chapter1_2.dita,tasks/info/hacopyright.dita</entry>
    <entry key="keyreffile">keyref.list</entry>
    <entry key="subjectschemefile">subjectscheme.list</entry>
    <entry key="keyreflist"></entry>
diff --git a/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1.html b/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1.html
index 959865fe..a738bc26 100644
--- a/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1.html
+++ b/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1.html
@@ -11,6 +11,7 @@
 <meta name="DC.subject" content="Apache, Maven, 介绍"/>
 <meta name="keywords" content="Apache, Maven, 介绍"/>
 <meta name="DC.Relation" scheme="URI" content="../../tasks/chapter1/chapter1_1.html"/>
+<meta name="DC.Relation" scheme="URI" content="../../tasks/chapter1/chapter1_2.html"/>
 <meta name="prodname" content="Maven权威指南"/>
 <meta name="version" content="1.0.0.0"/>
 <meta name="brand" content="HAWEBS Maven"/>
@@ -37,6 +38,8 @@
 <ul class="ullinks">
 <li class="ulchildlink"><strong><a href="../../tasks/chapter1/chapter1_1.html">Maven 它是什么</a></strong><br/>
 </li>
+<li class="ulchildlink"><strong><a href="../../tasks/chapter1/chapter1_2.html">约定优于配置（Convention Over Configuration）</a></strong><br/>
+</li>
 </ul>
 </div>
 
diff --git a/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1_1.html b/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1_1.html
index d7ab7081..809ebba5 100644
--- a/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1_1.html
+++ b/hadocs/maven/trunk/out/definitive_guide/docs/tasks/chapter1/chapter1_1.html
@@ -15,13 +15,13 @@
 <meta name="copyright" content="HAWEBS信息技术股份有限公司 2006, 2010" type="primary"/>
 <meta name="DC.Rights.Owner" content="HAWEBS信息技术股份有限公司 2006, 2010" type="primary"/>
 <meta name="DC.Format" content="XHTML"/>
-<meta name="DC.Identifier" content="test_drive"/>
+<meta name="DC.Identifier" content="chapter1_2"/>
 <meta name="DC.Language" content="zh"/>
 <link rel="stylesheet" type="text/css" href="../../css/commonltr.css"/>
 <link rel="stylesheet" type="text/css" href="../../css/public.css"/>
 <title>Maven 它是什么</title>
 </head>
-<body id="test_drive"><a name="test_drive"><!-- --></a>
+<body id="chapter1_2"><a name="chapter1_2"><!-- --></a>
 
 
   <h1 class="topictitle1">Maven 它是什么</h1>
diff --git a/hadocs/maven/trunk/out/definitive_guide/docs/toc.html b/hadocs/maven/trunk/out/definitive_guide/docs/toc.html
index 90c6edd0..69cc7f6a 100644
--- a/hadocs/maven/trunk/out/definitive_guide/docs/toc.html
+++ b/hadocs/maven/trunk/out/definitive_guide/docs/toc.html
@@ -15,6 +15,7 @@
 <li><a href="tasks/chapter1/chapter1.html">介绍 Apache Maven</a>
 <ul>
 <li><a href="tasks/chapter1/chapter1_1.html">Maven 它是什么</a></li>
+<li><a href="tasks/chapter1/chapter1_2.html">约定优于配置（Convention Over Configuration）</a></li>
 </ul>
 </li>
 </ul>
diff --git a/hadocs/maven/trunk/src/definitive_guide/definitive_guide.ditamap b/hadocs/maven/trunk/src/definitive_guide/definitive_guide.ditamap
index 046cdaae..2679db22 100644
--- a/hadocs/maven/trunk/src/definitive_guide/definitive_guide.ditamap
+++ b/hadocs/maven/trunk/src/definitive_guide/definitive_guide.ditamap
@@ -60,6 +60,7 @@
   <topicref navtitle="" href="tasks/info/hacopyright.dita"/>
   <topicref href="tasks/info/apachelicense.dita"/>
   <topicref href="tasks/chapter1/chapter1.dita">
-    <topicref href="tasks/chapter1/chapter1_1.dita"/>
+    <topicref href="tasks/chapter1/chapter1_1.dita"/>

+    <topicref href="tasks/chapter1/chapter1_2.dita"/>
   </topicref>
 </map>
diff --git a/hadocs/maven/trunk/src/definitive_guide/tasks/chapter1/chapter1_1.dita b/hadocs/maven/trunk/src/definitive_guide/tasks/chapter1/chapter1_1.dita
index 216f17ac..52c27499 100644
--- a/hadocs/maven/trunk/src/definitive_guide/tasks/chapter1/chapter1_1.dita
+++ b/hadocs/maven/trunk/src/definitive_guide/tasks/chapter1/chapter1_1.dita
@@ -32,7 +32,7 @@
  * +++++++++++++++++++++++++++++++++++++++++++++++++
 -->
 
-<concept id="test_drive" xml:lang="zh">
+<concept id="chapter1_2" xml:lang="zh">
   <title>Maven 它是什么</title>
   <prolog>
     <metadata>