Return-Path: 
 <derby-commits-return-15329-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 DF1AA98A9
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Tue,  6 Mar 2012 16:01:16 +0000 (UTC)
Received: (qmail 55743 invoked by uid 500); 6 Mar 2012 16:01:16 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 55710 invoked by uid 500); 6 Mar 2012 16:01:16 -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 55702 invoked by uid 99); 6 Mar 2012 16:01:16 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 16:01:16 +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 16:01:13 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5F46F2388847;
	Tue,  6 Mar 2012 16:00:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1297543 - in /db/derby/docs/branches/10.1: ./ build.xml
 lib/fo2html.xsl
Date: Tue, 06 Mar 2012 16:00:52 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120306160052.5F46F2388847@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kahatlen
Date: Tue Mar  6 16:00:51 2012
New Revision: 1297543

URL: http://svn.apache.org/viewvc?rev=1297543&view=rev
Log:
DERBY-5586: Remove the fo2html.xsl script from the docs repository

Merged revision 1297530 from 10.2 and resolved conflicts.

Removed:
    db/derby/docs/branches/10.1/lib/fo2html.xsl
Modified:
    db/derby/docs/branches/10.1/   (props changed)
    db/derby/docs/branches/10.1/build.xml

Propchange: db/derby/docs/branches/10.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar  6 16:00:51 2012
@@ -0,0 +1,3 @@
+/db/derby/docs/branches/10.2:1297530
+/db/derby/docs/branches/10.3:1297502
+/db/derby/docs/trunk:1297403,1297472

Modified: db/derby/docs/branches/10.1/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.1/build.xml?rev=1297543&r1=1297542&r2=1297543&view=diff
==============================================================================
--- db/derby/docs/branches/10.1/build.xml (original)
+++ db/derby/docs/branches/10.1/build.xml Tue Mar  6 16:00:51 2012
@@ -6,11 +6,10 @@
   <target name="usage">
     <echo message="For pdf output, run &quot;ant pdf&quot;"/>
     <echo message="For html output with frames, run &quot;ant html&quot;"/>
-    <echo message="For html output as a single page, run &quot;ant monohtml&quot;"/>
     <echo message="For output in all formats, run &quot;ant all&quot;"/>
   </target>
 
-  <target name="all" depends="html,pdf,monohtml"/>
+  <target name="all" depends="html,pdf"/>
 
   <target name="html" depends="init,html.getstart,html.tools,html.devguide,html.adminguide,html.ref,html.tuning"/>
 
@@ -142,56 +141,5 @@
       <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}"/>
     </ant>
   </target>
-
-  <target name="monohtml" depends="monohtml.adminguide,monohtml.devguide,monohtml.getstart,monohtml.ref,monohtml.tools,monohtml.tuning"/>
-
-  <target name="monohtml.adminguide" depends="init,pdf.adminguide">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="adminguide"/>
-      <param name="manual.fo" value="derbyadmin.fo"/>
-    </antcall>
-  </target>
-  
-  <target name="monohtml.devguide" depends="init,pdf.devguide">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="devguide"/>
-      <param name="manual.fo" value="derbydev.fo"/>
-    </antcall>
-  </target>
-
-  <target name="monohtml.getstart" depends="init,pdf.getstart">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="getstart"/>
-      <param name="manual.fo" value="getstartderby.fo"/>
-    </antcall>
-  </target>
-
-  <target name="monohtml.ref" depends="init,pdf.ref">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="ref"/>
-      <param name="manual.fo" value="refderby.fo"/>
-    </antcall>
-  </target>
-
-  <target name="monohtml.tools" depends="init,pdf.tools">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="tools"/>
-      <param name="manual.fo" value="derbytools.fo"/>
-    </antcall>
-  </target>
-
-  <target name="monohtml.tuning" depends="init,pdf.tuning">
-    <antcall target="monohtml.dita">
-      <param name="manual.name" value="tuning"/>
-      <param name="manual.fo" value="tuningderby.fo"/>
-    </antcall>
-  </target>
-
-  <target name="monohtml.dita">
-    <xslt processor="trax" 
-          in="${dita.output.dir}/${manual.name}/${manual.fo}"
-          out="${dita.output.dir}/${manual.name}/${manual.name}-single.html"
-          style="${basedir}/lib/fo2html.xsl"/>
-  </target>
     
 </project>