Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 22351778aed539ab26e5e9bd9af2bd5fe040a2da)
+++ xsoft/office/libreoffice.xml	(revision 6cf9769bd2c64239cea63392d78016f80d7e628e)
@@ -130,5 +130,5 @@
       <listitem>
         <para>
-          Required patch for i686 systems, in order to fix a problem inroduced
+          Required patch for i686 systems, in order to fix a problem introduced
           by <application>&gcc-490;</application>:
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
@@ -153,23 +153,25 @@
         Most of these packages are recommended because if they're not installed,
         the build process will compile and install its own (often older)
-        version.
+        version. If you have not installed some of the dependencies listed below,
+        make sure you examine <command>./configure --help</command> output for
+        information on switches that are needed to disable them.
       </para>
     </note>
 
     <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="boost"/>,
+      <!--<xref linkend="boost"/>,-->
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
+      <xref linkend="glu"/>,
       <xref linkend="graphite2"/>,
       <xref linkend="gst-plugins-base"/> or
       <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk2"/>,
       <xref linkend="harfbuzz"/>,
       <xref linkend="icu"/>,
       <xref linkend="lcms2"/>,
+      <xref linkend="libjpeg"/>,
       <xref linkend="librsvg"/>,
       <xref linkend="libxml2"/> and
@@ -193,5 +195,5 @@
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
       <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
-      <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
+      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
       <xref linkend="gdb"/>,
       <xref linkend="gtk3"/>,
@@ -225,5 +227,5 @@
       <xref linkend="sane"/>,
       <xref linkend="vlc"/>, and
-      <ulink url="&gnome-download-http;/zenity/">Zenity</ulink>
+      <xref linkend="zenity"/>
     </para>
 
@@ -257,9 +259,8 @@
         You can avoid this unpleasantness by
         <emphasis>not</emphasis> untaring it as
-        <systemitem class="username">root</systemitem>. If you must untar it as
-        <systemitem class="username">root</systemitem> pass the option
-        <option>--no-overwrite-dir</option> to tar. This is the default when you
-        untar as a user but has to be passed as an option when untaring as
-        <systemitem class="username">root</systemitem>:
+        <systemitem class="username">root</systemitem>. If you must untar
+        it as <systemitem class="username">root</systemitem> pass the
+        option <option>--no-overwrite-dir</option> to tar when untaring
+        as <systemitem class="username">root</systemitem>:
       </para>
     </warning>
@@ -270,6 +271,5 @@
     <para>
       Unpack the dictionaries file and create symlinks to tarballs from the
-      source directory so they won't get downloaded again (it is not necessary
-      to unpack the help nor the translations tarballs):
+      source directory so they won't get downloaded again:
     </para>
 
@@ -277,23 +277,12 @@
 
 tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
-<!-- Not necessary for this version
-tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
--->
-ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &amp;&amp;
-ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
-
-<!-- Not necessary for this version
-    <para>
-      If you have downloaded the translations tarball, unpack it:
-    </para>
-
-<screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
-ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
--->
+ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &amp;&amp;
+ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
+
     <para>
       If you have downloaded the translations tarball, create a symlink:
     </para>
 
-<screen><userinput>ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
+<screen><userinput>ln -sfv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
 
     <note>
@@ -307,19 +296,8 @@
 
     <para>
-      In the rest of the page, locales "en-US" and "pt-BR" are examples; you
-      can change them to suit your needs - you might want to read the
-      "Command Explanations", further below, before proceeding.
-    </para>
-
-    <para>
-      Due to the large size of the package, you may prefer to install it in
-      <filename class="directory">/opt</filename>, instead of
-      <filename class="directory">/usr</filename>. Depending on your choice,
-      replace <replaceable>&lt;PREFIX&gt;</replaceable> by
-      <filename class="directory">/usr</filename> or by
-      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
-    </para>
-
-<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
+      In the rest of the page, locales "en-US" and "pt-BR" are examples. Change
+      them to suit your needs. You might want to read the "Command Explanations"
+      further below before proceeding.
+    </para>
 
     <para>
@@ -346,5 +324,5 @@
     -i bin/unpack-sources                          &amp;&amp;
 
-./autogen.sh --prefix=$LO_PREFIX         \
+./autogen.sh --prefix=/usr               \
              --sysconfdir=/etc           \
              --with-vendor="BLFS"        \
@@ -356,5 +334,5 @@
              --disable-odk               \
              --disable-postgresql-sdbc   \
-             --enable-release-build=yes  \
+             --enable-release-build      \
              --enable-python=system      \
              --with-system-boost         \
@@ -398,8 +376,8 @@
     </para>
 
-<screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
-install -v -m755 -d $LO_PREFIX/share/appdata              &amp;&amp;
-install -v -m644    sysui/desktop/appstream-appdata/*.xml \
-                    $LO_PREFIX/share/appdata</userinput></screen>
+<screen role="root"><userinput>make distro-pack-install             &amp;&amp;
+install -v -dm755 /usr/share/appdata &amp;&amp;
+install -v -m644  sysui/desktop/appstream-appdata/*.xml \
+                  /usr/share/appdata</userinput></screen>
 
     <para>
@@ -408,25 +386,9 @@
     </para>
 
-<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                        &amp;&amp;
-mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
-cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
-mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
-cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
-
-    <para>
-       If installed in <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-       and the icons in the new items of the desktop menu are not properly displayed,
-       optionally run the following commands, as
-       <systemitem class="username">root</systemitem> user (it may be necessary
-       to logout the session, before the icons appear):
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/pixmaps &amp;&amp;
-for i in writer base calc draw impress math startcenter writer
-do
-  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
-          /usr/share/pixmaps/
-done
-unset i</userinput></screen>
+<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                  &amp;&amp;
+mkdir -pv /usr/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
+cp -rv    dictionaries/en/* /usr/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
+mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
+cp -rv    dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
 
   </sect2>
@@ -449,31 +411,27 @@
       the vendor which is mentioned when you click "About" on the toolbar.
     </para>
-<!-- I believe en-US is not necessary anymore
-    <para>
-      <parameter>-\-with-lang="en-US pt-BR"</parameter>: This switch sets
-      what languages to support. en-US is always needed. To list several
-      languages, separate them with a space. For all languages, use
-      <parameter>-\-with-lang=ALL</parameter>
-    </para>
--->
 
     <para>
       <parameter>--with-lang="en-US pt-BR"</parameter>: This switch sets
-      what languages to support. To list several languages, separate them with
-      a space. For all languages, use
+      what languages to support. To list several languages, separate them
+      with a space. For all languages, use
       <parameter>--with-lang=ALL</parameter>.
     </para>
 
-    <note><para>
-      For a list of the available languages, you can uncompress the
-      translations tarball, <command>tar -xf
-      ../libreoffice-translations-&libreoffice-dlversion;.tar.xz
-      --no-overwrite-dir -C /tmp</command>, and run <command>ls
-      /tmp/libreoffice-&libreoffice-dlversion;/translations/source</command>.
-    </para></note>
-
-    <para>
-      <parameter>--with-help</parameter>: Without this switch, the help files
-      are not built.
+    <note>
+      <para>
+        For a list of the available languages, you can uncompress the
+        translations tarball by running the following command:
+        <command>tar -xf
+        ../libreoffice-translations-&libreoffice-dlversion;.tar.xz
+        --no-overwrite-dir -C /tmp</command> and proceed to examine
+        the contents of <filename
+        class="directory">/tmp/libreoffice-&libreoffice-dlversion;/translations/source</filename>.
+      </para>
+    </note>
+
+    <para>
+      <parameter>--with-help</parameter>: This switch is used to build
+      the help files.
     </para>
 
@@ -514,10 +472,7 @@
  
     <para>
-      <parameter>--enable-release-build=yes</parameter>: This switch enables a
-      Release Build.
-      <application>LibreOffice</application> can be built as a Release Build or
-      as a Developer Build, because their default installation paths and user
-      profile paths are different. Developer Build displays the words "Dev" and
-      "Beta" in several places (e.g, menu and splash scren).
+      <parameter>--enable-release-build</parameter>: This switch is used to
+      remove "Beta" or "Dev" from <application>LibreOffice</application>
+      splash screen and "About" menu.
     </para>
 
@@ -545,15 +500,4 @@
 
     <para>
-      <option>--disable-cups</option>: Use this switch if you don't need
-      printing support.
-    </para>
-
-    <para>
-      <option>--disable-dbus</option>: Use this switch if you've not
-      installed D-Bus-1.8.0. It also disables Bluetooth support and 
-      font install via PackageKit. 
-    </para>
-
-    <para>
       <option>--disable-gstreamer-0-10</option>: Use this switch if you've
       not installed <xref linkend="gst-plugins-base"/>.
@@ -584,19 +528,16 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
-          loimpress, lomath, loweb, lowriter, soffice and unopkg;
-          several programs under
-          $LO_PREFIX/lib/libreoffice/program
+          loimpress, lomath, loweb, lowriter, soffice and unopkg
         </seg>
         <seg>
-          several libraries under
-          $LO_PREFIX/lib/libreoffice/{ure/lib,program}
+          None
         </seg>
         <seg>
-          $LO_PREFIX/lib/libreoffice
+          /usr/lib/libreoffice
         </seg>
       </seglistitem>
