Fix to make DocBook work on finland and with Hudson.

mgricken · mgricken · commit d3fa1d48f138 · 2009-08-03T21:26:37.000Z
git-svn-id: file:///tmp/test-svn/trunk@4971 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/docs/build.xml b/docs/build.xml
@@ -154,9 +154,9 @@
   
   <target name="generate-html" depends="assert-docbook-xsl-exists">
     <mkdir dir="docs/${docbook-dir}" />
-    <exec executable="xsltproc" failonerror="yes">
+    <exec executable="xsltproc" failonerror="yes" dir="src/${docbook-dir}">
       <arg value="-o" />
-      <arg value="docs/${docbook-dir}/" />
+      <arg value="../../docs/${docbook-dir}/" />
       <arg file="${docbook-xsl-home}/html/chunk.xsl" />
       <arg file="src/${docbook-dir}/${docbook-srcfile}.docbook" />
     </exec>
@@ -178,9 +178,9 @@
     </taskdef>
     <mkdir dir="fo" />
     <mkdir dir="docs" />
-    <exec executable="xsltproc" failonerror="yes">
+    <exec executable="xsltproc" failonerror="yes" dir="src/${docbook-dir}">
       <arg value="-o" />
-      <arg value="fo/${docbook-srcfile}.fo" />
+      <arg value="../../fo/${docbook-srcfile}.fo" />
       <arg file="${docbook-xsl-home}/fo/docbook.xsl" />
       <arg file="src/${docbook-dir}/${docbook-srcfile}.docbook" />
     </exec>
diff --git a/docs/src/developer/devdoc.docbook b/docs/src/developer/devdoc.docbook
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
                     "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY mdash "&#x02014;" >
   <!ENTITY introduction SYSTEM "introduction.docbook">
   <!ENTITY gettingStarted SYSTEM "gettingStarted.docbook">
   <!ENTITY supportingTechnology SYSTEM "supportingTechnology.docbook">
diff --git a/docs/src/developer/introduction.docbook b/docs/src/developer/introduction.docbook
@@ -34,7 +34,7 @@
   
   <section>
     <title>Project Philosophy</title>
-    <para>DrJava is a lightweight, powerful Java development environment.  Its target audience includes both beginning Computer Science students and advanced professional users.  Clearly, there is a tension between these goals --- "lightweight" versus "powerful"; "beginning" versus "advanced."  This tension is generally resolved by <emphasis>ensuring</emphasis> the prior conditions --- that DrJava be easy to use and inobtrusive for beginners --- and adding "advanced" features only if they can be presented in a simple, lightweight (both in terms of system resources and user interface) manner.  The interactions pane is an ideal example of a nice marriage between the goals of simplicity and power.  It is easy for beginners to understand and use --- in fact, it's where many beginners get their first taste of Java programming.  Yet professional developers also find it quite handy, and sometimes lament the lack of something like it in heavier-weight IDEs.</para>
+    <para>DrJava is a lightweight, powerful Java development environment.  Its target audience includes both beginning Computer Science students and advanced professional users.  Clearly, there is a tension between these goals &mdash; "lightweight" versus "powerful"; "beginning" versus "advanced."  This tension is generally resolved by <emphasis>ensuring</emphasis> the prior conditions &mdash; that DrJava be easy to use and inobtrusive for beginners &mdash; and adding "advanced" features only if they can be presented in a simple, lightweight (both in terms of system resources and user interface) manner.  The interactions pane is an ideal example of a nice marriage between the goals of simplicity and power.  It is easy for beginners to understand and use &mdash; in fact, it's where many beginners get their first taste of Java programming.  Yet professional developers also find it quite handy, and sometimes lament the lack of something like it in heavier-weight IDEs.</para>
       
     <para>Because DrJava was originally conceived as a teaching tool, and because it has been almost entirely developed by undergraduate and graduate students, it is uniquely positioned to address the needs of students, teachers, and researchers.  We hope that this fount of experience will translate into a relevant, useful, and unique product.  However, development on the project is at a relative disadvantage due to the lack of a full-time or long-term workforce.  These challenges are addressed by maintaining a self-documenting, self-testing code base.  Developers should keep in mind that the code they write will be browsed and modified subsequently by many others, and if the reasoning behind the code is not documented by comments and tests, it will probably be lost.</para>
     
diff --git a/drjava/lib/docs.jar b/drjava/lib/docs.jar
