From f167b51caf65a9bbd90007f5fc291571c680ac56 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <yhu@isharkfly.com>
Date: Thu, 15 Jul 2010 01:07:07 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=96=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=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@503 a2543c7e-f6e9-4f8a-8bff-1ffc34733512
---
 hadocs/java/trunk/out/code_conventions/docs/dita.list        | 4 ++--
 .../java/trunk/out/code_conventions/docs/dita.xml.properties | 2 +-
 .../out/code_conventions/docs/tasks/chapter1/chapter1.html   | 5 +++++
 .../trunk/src/code_conventions/tasks/chapter1/chapter1.dita  | 3 +++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hadocs/java/trunk/out/code_conventions/docs/dita.list b/hadocs/java/trunk/out/code_conventions/docs/dita.list
index 0e2f7c92..165f808a 100644
--- a/hadocs/java/trunk/out/code_conventions/docs/dita.list
+++ b/hadocs/java/trunk/out/code_conventions/docs/dita.list
@@ -1,4 +1,4 @@
-#Wed Jul 14 20:34:40 EDT 2010
+#Wed Jul 14 21:06:16 EDT 2010
 copytosourcelist=
 hreftargetslist=tasks/info/hacopyright.dita,tasks/info/apachelicense.dita,tasks/chapter1/chapter1.dita
 fullditatopicfile=fullditatopic.list
@@ -6,7 +6,7 @@ fullditamapandtopicfile=fullditamapandtopic.list
 fullditatopiclist=tasks/info/hacopyright.dita,tasks/info/apachelicense.dita,tasks/chapter1/chapter1.dita
 fullditamapandtopiclist=tasks/info/hacopyright.dita,tasks/info/apachelicense.dita,tasks/chapter1/chapter1.dita,code_conventions.ditamap
 hrefditatopicfile=hrefditatopic.list
-hrefditatopiclist=tasks/info/hacopyright.dita
+hrefditatopiclist=tasks/info/hacopyright.dita,tasks/chapter1/chapter1.dita
 user.input.file=code_conventions.ditamap
 subtargetsfile=subtargets.list
 fullditamapfile=fullditamap.list
diff --git a/hadocs/java/trunk/out/code_conventions/docs/dita.xml.properties b/hadocs/java/trunk/out/code_conventions/docs/dita.xml.properties
index 9e88b241..aa9c520d 100644
--- a/hadocs/java/trunk/out/code_conventions/docs/dita.xml.properties
+++ b/hadocs/java/trunk/out/code_conventions/docs/dita.xml.properties
@@ -9,7 +9,7 @@
    <entry key="fullditatopiclist">tasks/info/hacopyright.dita,tasks/info/apachelicense.dita,tasks/chapter1/chapter1.dita</entry>
    <entry key="fullditamapandtopiclist">tasks/info/hacopyright.dita,tasks/info/apachelicense.dita,tasks/chapter1/chapter1.dita,code_conventions.ditamap</entry>
    <entry key="hrefditatopicfile">hrefditatopic.list</entry>
-   <entry key="hrefditatopiclist">tasks/info/hacopyright.dita</entry>
+   <entry key="hrefditatopiclist">tasks/info/hacopyright.dita,tasks/chapter1/chapter1.dita</entry>
    <entry key="user.input.file">code_conventions.ditamap</entry>
    <entry key="subtargetsfile">subtargets.list</entry>
    <entry key="fullditamapfile">fullditamap.list</entry>
diff --git a/hadocs/java/trunk/out/code_conventions/docs/tasks/chapter1/chapter1.html b/hadocs/java/trunk/out/code_conventions/docs/tasks/chapter1/chapter1.html
index 5c985628..8cadfdd1 100644
--- a/hadocs/java/trunk/out/code_conventions/docs/tasks/chapter1/chapter1.html
+++ b/hadocs/java/trunk/out/code_conventions/docs/tasks/chapter1/chapter1.html
@@ -43,6 +43,11 @@
     <p>一些习惯自由程序人员可能对这些规则很不适应，但是在多个开发人员共同写作的情况下，这些规则是必需的
 。</p>
 
+    <p>程序版式是一个容易引起争议的话题，其实有一点很重要，那就是程序版式并无绝对的好坏之分，最重要的是要有统一的标准。开发过程比较完善的组织会有一份代码规范，其目的就是统一代码的风格。因此此规范仅供大家参考，大多数内容都是建议，而不是规则.。
+</p>
+
+    <p>Java 在这方面有很大优势，Sun MicroSystem在发布Java的同时，也推出了一份代码规范。其中大部分已被广泛接受，成为事实上的标准。可以参考Sun 的Java站点：<a href="http://java.sun.com/docs/codeconv/index.html" target="_blank">http://java.sun.com/docs/codeconv/index.html</a></p>
+
   </div>
 
 
diff --git a/hadocs/java/trunk/src/code_conventions/tasks/chapter1/chapter1.dita b/hadocs/java/trunk/src/code_conventions/tasks/chapter1/chapter1.dita
index 701e97d5..49e6134c 100644
--- a/hadocs/java/trunk/src/code_conventions/tasks/chapter1/chapter1.dita
+++ b/hadocs/java/trunk/src/code_conventions/tasks/chapter1/chapter1.dita
@@ -51,5 +51,8 @@
 </p>
     <p>一些习惯自由程序人员可能对这些规则很不适应，但是在多个开发人员共同写作的情况下，这些规则是必需的
 。</p>
+    <p>程序版式是一个容易引起争议的话题，其实有一点很重要，那就是程序版式并无绝对的好坏之分，最重要的是要有统一的标准。开发过程比较完善的组织会有一份代码规范，其目的就是统一代码的风格。因此此规范仅供大家参考，大多数内容都是建议，而不是规则.。
+</p>
+    <p>Java 在这方面有很大优势，Sun MicroSystem在发布Java的同时，也推出了一份代码规范。其中大部分已被广泛接受，成为事实上的标准。可以参考Sun 的Java站点：<xref format="html" scope="external" href="http://java.sun.com/docs/codeconv/index.html"/></p>
   </conbody>
 </concept>