Return-Path: 
 <derby-commits-return-15319-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 54CCB9D37
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Tue,  6 Mar 2012 14:07:23 +0000 (UTC)
Received: (qmail 93397 invoked by uid 500); 6 Mar 2012 14:07:22 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 93378 invoked by uid 500); 6 Mar 2012 14:07:22 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 93349 invoked by uid 99); 6 Mar 2012 14:07:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 14:07:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 14:07:20 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A0B992388C10;
	Tue,  6 Mar 2012 14:07:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1297483 - in /db/derby/docs/branches/10.5: ./ build.xml
 src/ja_JP/build.xml src/pt_BR/build.xml
Date: Tue, 06 Mar 2012 14:07:00 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120306140700.A0B992388C10@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kahatlen
Date: Tue Mar  6 14:06:59 2012
New Revision: 1297483

URL: http://svn.apache.org/viewvc?rev=1297483&view=rev
Log:
DERBY-5586: Remove monohtml targets for translated manuals

Merged revision 1297472 from trunk.

Modified:
    db/derby/docs/branches/10.5/   (props changed)
    db/derby/docs/branches/10.5/build.xml
    db/derby/docs/branches/10.5/src/ja_JP/build.xml
    db/derby/docs/branches/10.5/src/pt_BR/build.xml

Propchange: db/derby/docs/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 14:06:59 2012
@@ -1 +1 @@
-/db/derby/docs/trunk:808424,1297403
+/db/derby/docs/trunk:808424,1297403,1297472

Modified: db/derby/docs/branches/10.5/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/build.xml?rev=1297483&r1=1297482&r2=1297483&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/build.xml (original)
+++ db/derby/docs/branches/10.5/build.xml Tue Mar  6 14:06:59 2012
@@ -226,7 +226,7 @@ limitations under the License.
 
   <!-- Brazilian Portuguese manuals -->
 
-  <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html"/>
+  <target name="pt_BR" depends="init,pt_BR_image,pt_BR.html,pt_BR.pdf"/>
  
   <target name="pt_BR_image">
     <copy todir="${dita.output.dir}/pt_BR/images">
@@ -263,7 +263,7 @@ limitations under the License.
   </target>
     
   <!-- Japanese Japanese manuals -->
-  <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html"/>
+  <target name="ja_JP" depends="init,ja_JP_image,ja_JP.html,ja_JP.pdf"/>
 
   <target name="ja_JP_image">
     <copy todir="${dita.output.dir}/ja_JP/images">

Modified: db/derby/docs/branches/10.5/src/ja_JP/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/ja_JP/build.xml?rev=1297483&r1=1297482&r2=1297483&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/ja_JP/build.xml (original)
+++ db/derby/docs/branches/10.5/src/ja_JP/build.xml Tue Mar  6 14:06:59 2012
@@ -22,13 +22,12 @@
   <target name="usage">
     <echo message="Building Japanese Manuals:"/>
     <echo message="For html output with frames, run &quot;ant ja_JP.html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant ja_JP.monohtml&quot;"/>
     <echo message="For output in all formats, run &quot;ant ja_JP&quot;"/>
   </target>
 
   <target name="ja_JP.getstart">
     <antcall target="ja_JP.getstart.html"/>
-    <antcall target="ja_JP.getstart.monohtml"/>
+    <antcall target="ja_JP.getstart.pdf"/>
   </target>
 
   <target name="ja_JP.getstart.html">
@@ -46,17 +45,9 @@
     </ant>
   </target>
 
-  <target name="ja_JP.getstart.monohtml" depends="ja_JP.getstart.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="getstart"/>
-      <property name="manual.dir" value="ja_JP/getstart"/>
-      <property name="manual.fo" value="getstartderby.fo"/>
-    </ant>
-  </target>
-
   <target name="ja_JP.ref">
     <antcall target="ja_JP.ref.html"/>
-    <antcall target="ja_JP.ref.monohtml"/>
+    <antcall target="ja_JP.ref.pdf"/>
   </target>
 
   <target name="ja_JP.ref.html">
@@ -74,12 +65,4 @@
     </ant>
   </target>
 
-  <target name="ja_JP.ref.monohtml" depends="ja_JP.ref.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="ref"/>
-      <property name="manual.dir" value="ja_JP/ref"/>
-      <property name="manual.fo" value="refderby.fo"/>
-    </ant>
-  </target>
-  
 </project>

Modified: db/derby/docs/branches/10.5/src/pt_BR/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.5/src/pt_BR/build.xml?rev=1297483&r1=1297482&r2=1297483&view=diff
==============================================================================
--- db/derby/docs/branches/10.5/src/pt_BR/build.xml (original)
+++ db/derby/docs/branches/10.5/src/pt_BR/build.xml Tue Mar  6 14:06:59 2012
@@ -23,13 +23,12 @@
     <echo message="Building Brazilian Portuguese Manuals:"/>
     <echo message="For pdf output, run &quot;ant pt_BR.pdf&quot;"/>
     <echo message="For html output with frames, run &quot;ant pt_BR.html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant pt_BR.monohtml&quot;"/>
     <echo message="For output in all formats, run &quot;ant pt_BR&quot;"/>
   </target>
 
   <target name="pt_BR.adminguide">
     <antcall target="pt_BR.adminguide.html"/>
-    <antcall target="pt_BR.adminguide.monohtml"/>
+    <antcall target="pt_BR.adminguide.pdf"/>
   </target>
 
 
@@ -48,17 +47,9 @@
     </ant>
   </target>
 
-  <target name="pt_BR.adminguide.monohtml" depends="pt_BR.adminguide.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="adminguide"/>
-      <property name="manual.dir" value="pt_BR/adminguide"/>
-      <property name="manual.fo" value="derbyadmin.fo"/>
-    </ant>
-  </target>
-
   <target name="pt_BR.getstart">
     <antcall target="pt_BR.getstart.html"/>
-    <antcall target="pt_BR.getstart.monohtml"/>
+    <antcall target="pt_BR.getstart.pdf"/>
   </target>
 
   <target name="pt_BR.getstart.html">
@@ -76,17 +67,9 @@
     </ant>
   </target>
 
-  <target name="pt_BR.getstart.monohtml" depends="pt_BR.getstart.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="getstart"/>
-      <property name="manual.dir" value="pt_BR/getstart"/>
-      <property name="manual.fo" value="getstartderby.fo"/>
-    </ant>
-  </target>
-
   <target name="pt_BR.ref">
     <antcall target="pt_BR.ref.html"/>
-    <antcall target="pt_BR.ref.monohtml"/>
+    <antcall target="pt_BR.ref.pdf"/>
   </target>
 
   <target name="pt_BR.ref.html">
@@ -104,12 +87,4 @@
     </ant>
   </target>
 
-  <target name="pt_BR.ref.monohtml" depends="pt_BR.ref.pdf">
-    <ant dir="../.." target="monohtml.dita">
-      <property name="manual.name" value="ref"/>
-      <property name="manual.dir" value="pt_BR/ref"/>
-      <property name="manual.fo" value="refderby.fo"/>
-    </ant>
-  </target>
-
 </project>