Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 91dcef822b862bd696c67ca677740c2e13a91a17)
+++ xsoft/office/libreoffice.xml	(revision 9e1dd1baafd77b69fd0e4458f200ff1a26e825bc)
@@ -8,20 +8,16 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-download-ftp  " ">
   <!ENTITY libreoffice-core-md5sum        "a3c01489036823e9f5b5caf3a8db1f9e">
   <!ENTITY libreoffice-core-size          "100 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-download-ftp  " ">
   <!ENTITY libreoffice-dict-md5sum        "99b7a045525411c9148331ab04bdedff">
   <!ENTITY libreoffice-dict-size          "34 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-download-ftp  " ">
   <!ENTITY libreoffice-help-md5sum        "716f624d7a39b99da8a5d550b6a87875">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-download-ftp  " ">
   <!ENTITY libreoffice-translations-md5sum        "09ec7331354c6f9a0b2f48efe344ce7d">
   <!ENTITY libreoffice-translations-size          "123 MB">
@@ -60,10 +56,5 @@
       <listitem>
         <para>
-          Core Download (HTTP): <ulink url="&libreoffice-core-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Core Download (FTP): <ulink url="&libreoffice-core-download-ftp;"/>
+          Core Download: <ulink url="&libreoffice-core-download-http;"/>
         </para>
       </listitem>
@@ -80,44 +71,4 @@
       <listitem>
         <para>
-          Dictionaries Download (HTTP): <ulink url="&libreoffice-dict-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Dictionaries Download (FTP): <ulink url="&libreoffice-dict-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Dictionaries Download MD5 sum: &libreoffice-dict-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Dictionaries Download size: &libreoffice-dict-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Download (HTTP): <ulink url="&libreoffice-help-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Download (FTP): <ulink url="&libreoffice-help-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Download MD5 sum: &libreoffice-help-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Download size: &libreoffice-help-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           Estimated disk space required: &libreoffice-buildsize;
         </para>
@@ -130,24 +81,49 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads (Optional)</bridgehead>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Translations Download (HTTP): <ulink url="&libreoffice-translations-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations Download (FTP): <ulink url="&libreoffice-translations-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations Download MD5 sum: &libreoffice-translations-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations Download size: &libreoffice-translations-size;
+          Dictionaries: <ulink url="&libreoffice-dict-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Dictionaries MD5 sum: &libreoffice-dict-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Dictionaries size: &libreoffice-dict-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files: <ulink url="&libreoffice-help-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files MD5 sum: &libreoffice-help-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Help Files size: &libreoffice-help-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations: <ulink url="&libreoffice-translations-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations MD5 sum: &libreoffice-translations-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Translations size: &libreoffice-translations-size;
         </para>
       </listitem>
