Changeset f0506d09

Timestamp:

08/15/2018 10:03:25 PM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

26d4041

Parents:

b4bff899

Message:

Tidy up java-related explanations in my previous commit.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20309 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• xsoft/office/libreoffice.xml (modified) (3 diffs)

xsoft/office/libreoffice.xml

@@ -522 +522 @@
     <para>
       <parameter>--without-junit</parameter>: This switch disables the tests
-      for the deprecatedHSQLDB driver which is written in Java. If you wish
+      for the deprecated HSQLDB driver which is written in Java. If you wish
       to build this driver replace this switch with the set of switches
       described below under '--with-java'.
@@ -615 +615 @@
 
     <para>
-      <option>--without-fonts</option>: <application>LibreOffice</application>
-      includes a number of third-party TrueType fonts. If you have already
-      installed some or all of the same fonts, you may prefer to use the system
-      versions.
-    </para>
-
-    <para>
       <option>--with-java</option>: This switch enables
       <application>Java</application> support in
@@ -627 +620 @@
       deprecated HSQLDB driver, which allows reading databases created by
       other programs or in earlier versions of libreoffice
-      <application>base</application>. You may also need to add
+      <application>base</application>. You may also need to add:
       <option>--with-junit=/opt/ant/lib/junit-&junit-version;.jar</option>
-      <option>--with-jdk-home=/opt/jdk</option> and
+      <option>--with-jdk-home=/opt/jdk</option>
       <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-&hamcrest-version;.jar</option>
+    </para>
+
+    <para>
+      <option>--without-fonts</option>: <application>LibreOffice</application>
+      includes a number of third-party TrueType fonts. If you have already
+      installed some or all of the same fonts, you may prefer to use the system
+      versions.
     </para>