diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index 16e08dc488..d72448692a 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -7,9 +7,9 @@
   <chapterinfo>
     <authorgroup>
       <author>
-        <firstname>Christophe</firstname>
-        <surname>Juniet</surname>
-        <contrib>Contributed by </contrib>
+	<firstname>Christophe</firstname>
+	<surname>Juniet</surname>
+	<contrib>Contributed by </contrib>
       </author>
     </authorgroup>
   </chapterinfo>
@@ -49,33 +49,33 @@
 
     <itemizedlist>
       <listitem>
-        <para>Browsers (such as <application>Firefox</application>,
-          <application>Opera</application>,
+	<para>Browsers (such as <application>Firefox</application>,
+	  <application>Opera</application>,
 	  <application>Konqueror</application>,
 	  <application>Chromium</application>)</para>
       </listitem>
 
       <listitem>
-        <para>Productivity (such as
-          <application>KOffice</application>,
-          <application>AbiWord</application>,
-          <application>The GIMP</application>,
-          <application>OpenOffice.org</application>,
-          <application>LibreOffice</application>)</para>
+	<para>Productivity (such as
+	  <application>KOffice</application>,
+	  <application>AbiWord</application>,
+	  <application>The GIMP</application>,
+	  <application>OpenOffice.org</application>,
+	  <application>LibreOffice</application>)</para>
       </listitem>
 
       <listitem>
-        <para>Document Viewers (such as <application>&acrobat.reader;</application>,
-          <application>gv</application>,
-          <application>Xpdf</application>,
-          <application>GQview</application>)</para>
+	<para>Document Viewers (such as <application>&acrobat.reader;</application>,
+	  <application>gv</application>,
+	  <application>Xpdf</application>,
+	  <application>GQview</application>)</para>
       </listitem>
 
       <listitem>
-        <para>Finance (such as
-          <application>GnuCash</application>,
-          <application>Gnumeric</application>,
-          <application>Abacus</application>)</para>
+	<para>Finance (such as
+	  <application>GnuCash</application>,
+	  <application>Gnumeric</application>,
+	  <application>Abacus</application>)</para>
       </listitem>
     </itemizedlist>
 
@@ -83,12 +83,12 @@
 
     <itemizedlist>
       <listitem>
-        <para>Know how to install additional third-party software
-          (<xref linkend="ports">).</para>
+	<para>Know how to install additional third-party software
+	  (<xref linkend="ports">).</para>
       </listitem>
 
       <listitem>
-        <para>Know how to install additional Linux software
+	<para>Know how to install additional Linux software
 	  (<xref linkend="linuxemu">).</para>
       </listitem>
     </itemizedlist>
@@ -129,45 +129,45 @@
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
-        <thead>
-          <row>
-            <entry>Application Name</entry>
-            <entry>Resources Needed</entry>
-            <entry>Installation from Ports</entry>
-            <entry>Major Dependencies</entry>
-          </row>
-        </thead>
+	<thead>
+	  <row>
+	    <entry>Application Name</entry>
+	    <entry>Resources Needed</entry>
+	    <entry>Installation from Ports</entry>
+	    <entry>Major Dependencies</entry>
+	  </row>
+	</thead>
 
-        <tbody>
-          <row>
+	<tbody>
+	  <row>
 	    <entry><application>Firefox</application></entry>
 	    <entry>medium</entry>
 	    <entry>heavy</entry>
 	    <entry><application>Gtk+</application></entry>
-          </row>
+	  </row>
 
-          <row>
-            <entry><application>Opera</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
+	  <row>
+	    <entry><application>Opera</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
 	    <entry>FreeBSD and Linux versions available.  The Linux
 	      version depends on the Linux Binary Compatibility and
 	      <application>linux-openmotif</application>.</entry>
-          </row>
+	  </row>
 
 	  <row>
 	    <entry><application>Konqueror</application></entry>
 	    <entry>medium</entry>
 	    <entry>heavy</entry>
 	    <entry><application>KDE</application> Libraries</entry>
-          </row>
+	  </row>
 
-          <row>
+	  <row>
 	    <entry><application>Chromium</application></entry>
 	    <entry>medium</entry>
 	    <entry>medium</entry>
 	    <entry><application>Gtk+</application></entry>
-          </row>
+	  </row>
         </tbody>
       </tgroup>
     </informaltable>
@@ -179,31 +179,31 @@
       </indexterm>
 
       <para><application>Firefox</application> is a modern, free,
-        open-source stable browser that is fully ported to &os;: it
-        features a very standards-compliant HTML display engine,
-        tabbed browsing, popup blocking, extensions, improved
-        security, and more.  <application>Firefox</application> is
-        based on the <application>Mozilla</application> codebase.</para>
+	open-source stable browser that is fully ported to &os;: it
+	features a very standards-compliant HTML display engine,
+	tabbed browsing, popup blocking, extensions, improved
+	security, and more.  <application>Firefox</application> is
+	based on the <application>Mozilla</application> codebase.</para>
 
       <para>Install the package by typing:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
 
       <para>This will install <application>Firefox</application> 8.0,
-        if you want to run <application>Firefox</application> 3.6,
-        use instead:</para>
+	if you want to run <application>Firefox</application> 3.6,
+	use instead:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r firefox36</userinput></screen>
 
       <para>You can also use the Ports Collection if you
-        prefer to compile from source code:</para>
+	prefer to compile from source code:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>For <application>Firefox</application> 3.6, in the
-        previous command replace <literal>firefox</literal> with
-        <literal>firefox36</literal>.</para>
+	previous command replace <literal>firefox</literal> with
+	<literal>firefox36</literal>.</para>
     </sect2>
 
     <sect2 id="moz-java-plugin">
@@ -215,8 +215,8 @@
       </note>
 
       <para>Install <application>OpenJDK 6</application>
-        through the Ports Collection by typing:</para>
-        
+	through the Ports Collection by typing:</para>
+
       <screen>&prompt.root; <userinput>cd /usr/ports/java/openjdk6</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
@@ -245,9 +245,9 @@
 
     <sect2 id="moz-flash-plugin">
 
-      <title>Firefox and &adobe; &flash; Plugin</title>
+    <title>Firefox and &adobe; &flash; Plugin</title>
       <indexterm>
-        <primary>Flash</primary>
+	<primary>Flash</primary>
       </indexterm>
 
       <para>The &adobe; &flash; plugin is not available for &os;. However,
@@ -298,7 +298,7 @@
 	  <para>This version will require the following link to be
 	    created:</para>
 
-      <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
+	  <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
   /usr/local/lib/browser_plugins/</userinput></screen>
 
 	  <para>The <filename
@@ -340,17 +340,17 @@
       <title>Firefox and Swfdec &flash; Plugin</title>
 
       <para>Swfdec is the library for decoding and rendering &flash; animations.
-        And Swfdec-Mozilla is a plugin for <application>Firefox</application>
-        browsers that uses the Swfdec library for playing SWF files.
-        It is still in heavy development.</para>
+	And Swfdec-Mozilla is a plugin for <application>Firefox</application>
+	browsers that uses the Swfdec library for playing SWF files.
+	It is still in heavy development.</para>
 
       <para>If you cannot or do not want to compile it, just install
-        the package from the network:</para>
+	the package from the network:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen>
 
       <para>If the package is not available, you can compile and install it
-        from the Ports Collection:</para>
+	from the Ports Collection:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/swfdec-plugin</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -365,22 +365,22 @@
       </indexterm>
 
       <para><application>Opera</application> is a
-        full-featured and standards-compliant browser.  It also
-        comes with a built-in mail and news reader, an IRC client,
-        an RSS/Atom feeds reader and much more.  Despite this, 
-        <application>Opera</application> is relatively lightweight
-        and very fast. It comes in two flavors: a <quote>native</quote> 
-        FreeBSD version and a version that runs under Linux 
-        emulation.</para>
+	full-featured and standards-compliant browser.  It also
+	comes with a built-in mail and news reader, an IRC client,
+	an RSS/Atom feeds reader and much more.  Despite this,
+	<application>Opera</application> is relatively lightweight
+	and very fast. It comes in two flavors: a <quote>native</quote>
+	FreeBSD version and a version that runs under Linux
+	emulation.</para>
 
       <para>To browse the Web with the FreeBSD version of <application>Opera</application>,
-        install the package:</para>
+	install the package:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
 
       <para>Some FTP sites do not have all the packages, but
-        <application>Opera</application> can still be obtained
-        through the Ports Collection by typing:</para>
+	<application>Opera</application> can still be obtained
+	through the Ports Collection by typing:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/opera</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -415,18 +415,18 @@
     <sect2>
       <title>Konqueror</title>
       <indexterm>
-        <primary><application>Konqueror</application></primary>
+	<primary><application>Konqueror</application></primary>
       </indexterm>
 
       <para><application>Konqueror</application> is part of
 	<application>KDE</application> but it can also be used outside
-       	of <application>KDE</application> by installing
+	of <application>KDE</application> by installing
 	<filename role="package">x11/kdebase3</filename>.
 	<application>Konqueror</application> is much more than a browser,
 	it is also a file manager and a multimedia viewer.</para>
 
       <para>There is also a set of plugins available for
-        <application>Konqueror</application>,
+	<application>Konqueror</application>,
 	available in <filename role="package">misc/konq-plugins</filename>.</para>
 
       <para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
@@ -523,65 +523,65 @@
     <title>Productivity</title>
 
     <para>When it comes to productivity, new users often look for a
-       good office suite or a friendly word processor.  While some
-       <link linkend="x11-wm">desktop environments</link> like
-       <application>KDE</application> already provide an office suite,
-       there is no default productivity package.  FreeBSD can provide all that is
-       needed, regardless of your desktop environment.</para>
+      good office suite or a friendly word processor.  While some
+      <link linkend="x11-wm">desktop environments</link> like
+      <application>KDE</application> already provide an office suite,
+      there is no default productivity package.  FreeBSD can provide all that is
+      needed, regardless of your desktop environment.</para>
 
     <para>This section covers these applications:</para>
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
-        <thead>
-          <row>
-            <entry>Application Name</entry>
-            <entry>Resources Needed</entry>
-            <entry>Installation from Ports</entry>
-            <entry>Major Dependencies</entry>
-          </row>
-        </thead>
+	<thead>
+	  <row>
+	    <entry>Application Name</entry>
+	    <entry>Resources Needed</entry>
+	    <entry>Installation from Ports</entry>
+	    <entry>Major Dependencies</entry>
+	  </row>
+	</thead>
 
-        <tbody>
-          <row>
-            <entry><application>KOffice</application></entry>
-            <entry>light</entry>
-            <entry>heavy</entry>
-            <entry><application>KDE</application></entry>
-          </row>
+	<tbody>
+	  <row>
+	    <entry><application>KOffice</application></entry>
+	    <entry>light</entry>
+	    <entry>heavy</entry>
+	    <entry><application>KDE</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>AbiWord</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry><application>Gtk+</application> or <application>GNOME</application></entry>
-          </row>
+	  <row>
+	    <entry><application>AbiWord</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry><application>Gtk+</application> or <application>GNOME</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>The Gimp</application></entry>
-            <entry>light</entry>
-            <entry>heavy</entry>
-            <entry><application>Gtk+</application></entry>
-          </row>
+	  <row>
+	    <entry><application>The Gimp</application></entry>
+	    <entry>light</entry>
+	    <entry>heavy</entry>
+	    <entry><application>Gtk+</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>OpenOffice.org</application></entry>
-            <entry>heavy</entry>
-            <entry>huge</entry>
-            <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
-          </row>
+	  <row>
+	    <entry><application>OpenOffice.org</application></entry>
+	    <entry>heavy</entry>
+	    <entry>huge</entry>
+	    <entry><application>&jdk;</application>, <application>Mozilla</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>LibreOffice</application></entry>
-            <entry>somewhat heavy</entry>
-            <entry>huge</entry>
-            <entry><application>Gtk+</application>, or <application>KDE</application>/ 
+	  <row>
+	    <entry><application>LibreOffice</application></entry>
+	    <entry>somewhat heavy</entry>
+	    <entry>huge</entry>
+	    <entry><application>Gtk+</application>, or <application>KDE</application>/
 	    <application>GNOME</application>, or <application>&jdk;</application></entry>
-          </row>
-        </tbody>
+	  </row>
+	</tbody>
       </tgroup>
     </informaltable>
-   
+
     <sect2>
       <title>KOffice</title>
       <indexterm>
@@ -593,28 +593,28 @@
       </indexterm>
 
       <para>The KDE community has provided its desktop environment
-        with an office suite which can be used outside
-        <application>KDE</application>.  It includes the four standard
-        components that can be found in other office suites.
-        <application>KWord</application> is the word processor,
-        <application>KSpread</application> is the spreadsheet program,
-        <application>KPresenter</application> manages slide
-        presentations, and <application>Kontour</application> lets you
-        draw graphical documents.</para>
+	with an office suite which can be used outside
+	<application>KDE</application>.  It includes the four standard
+	components that can be found in other office suites.
+	<application>KWord</application> is the word processor,
+	<application>KSpread</application> is the spreadsheet program,
+	<application>KPresenter</application> manages slide
+	presentations, and <application>Kontour</application> lets you
+	draw graphical documents.</para>
 
       <para>Before installing the latest
-        <application>KOffice</application>, make sure you have an
-        up-to-date version of <application>KDE</application>.</para>
+	<application>KOffice</application>, make sure you have an
+	up-to-date version of <application>KDE</application>.</para>
 
       <para>To install <application>KOffice</application> as a
-        package, issue the following command:</para>
+	package, issue the following command:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r koffice</userinput></screen>
 
       <para>If the package is not available, you can use the Ports Collection.
 	For instance, to install
-        <application>KOffice</application> for
-        <application>KDE3</application>, do:</para>
+	<application>KOffice</application> for
+	<application>KDE3</application>, do:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde3</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -627,23 +627,23 @@
       </indexterm>
 
       <para><application>AbiWord</application> is a free word
-        processing program similar in look and feel to <application>&microsoft; Word</application>.
-        It is suitable for typing papers, letters, reports, memos, and
-        so forth.  It is very fast, contains many features, and is
-        very user-friendly.</para>
+	processing program similar in look and feel to <application>&microsoft; Word</application>.
+	It is suitable for typing papers, letters, reports, memos, and
+	so forth.  It is very fast, contains many features, and is
+	very user-friendly.</para>
 
       <para><application>AbiWord</application> can import or export
-        many file formats, including some proprietary ones like
-        &microsoft;'s <filename>.doc</filename>.</para>
+	many file formats, including some proprietary ones like
+	&microsoft;'s <filename>.doc</filename>.</para>
 
       <para><application>AbiWord</application> is available as a
-        package.  You can install it by:</para>
+	package.  You can install it by:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
 
       <para>If the package is not available, it can be compiled from
-        the Ports Collection.  The Ports Collection should be more
-        up to date.  It can be done as follows:</para>
+	the Ports Collection.  The Ports Collection should be more
+	up to date.  It can be done as follows:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/abiword</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -656,25 +656,25 @@
       </indexterm>
 
       <para>For image authoring or picture retouching,
-        <application>The GIMP</application> is a very sophisticated
-        image manipulation program.  It can be used as a simple paint
-        program or as a quality photo retouching suite.  It supports a
-        large number of plug-ins and features a scripting interface.
-        <application>The GIMP</application> can read and write a wide
-        range of file formats.  It supports interfaces with scanners
-        and tablets.</para>
+	<application>The GIMP</application> is a very sophisticated
+	image manipulation program.  It can be used as a simple paint
+	program or as a quality photo retouching suite.  It supports a
+	large number of plug-ins and features a scripting interface.
+	<application>The GIMP</application> can read and write a wide
+	range of file formats.  It supports interfaces with scanners
+	and tablets.</para>
 
       <para>You can install the package by issuing this
-        command:</para>
+	command:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
 
       <para>If your FTP site does not have this package, you can use
-        the Ports Collection.  The
-        <ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
-        directory of the Ports Collection also contains
-        <application>The Gimp Manual</application>.  Here is how to
-        get them installed:</para>
+	the Ports Collection.  The
+	<ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
+	directory of the Ports Collection also contains
+	<application>The Gimp Manual</application>.  Here is how to
+	get them installed:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput>
@@ -682,15 +682,15 @@
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
-        <para>The
-          <ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
-          directory of the Ports Collection holds the development
-          version of <application>The GIMP</application> in
-          <filename role="package">graphics/gimp-devel</filename>.
-          An HTML version of
-          <application>The Gimp Manual</application> is available from
-          <filename role="package">graphics/gimp-manual-html</filename>.</para>
-       </note>
+	<para>The
+	  <ulink url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
+	  directory of the Ports Collection holds the development
+	  version of <application>The GIMP</application> in
+	  <filename role="package">graphics/gimp-devel</filename>.
+	  An HTML version of
+	  <application>The Gimp Manual</application> is available from
+	  <filename role="package">graphics/gimp-manual-html</filename>.</para>
+      </note>
     </sect2>
 
     <sect2>
@@ -704,25 +704,25 @@
       </indexterm>
 
       <para><application>OpenOffice.org</application> includes all of the
-        mandatory applications in a complete office productivity
-        suite: a word processor, a spreadsheet, a presentation manager,
-        and a drawing program.  Its user interface is very similar
-        to other office suites, and it can import and export in various
-        popular file formats.  It is available in a number of
-        different languages &mdash; internationalization has been
-        extended to interfaces, spell checkers, and
-        dictionaries.</para>
+	mandatory applications in a complete office productivity
+	suite: a word processor, a spreadsheet, a presentation manager,
+	and a drawing program.  Its user interface is very similar
+	to other office suites, and it can import and export in various
+	popular file formats.  It is available in a number of
+	different languages &mdash; internationalization has been
+	extended to interfaces, spell checkers, and
+	dictionaries.</para>
 
       <para>The word processor of
-        <application>OpenOffice.org</application> uses a native XML
-        file format for increased portability and flexibility.  The
-        spreadsheet program features a macro language and it can be
-        interfaced with external databases.
-        <application>OpenOffice.org</application> is already stable
-        and runs natively on &windows;, &solaris;, Linux, FreeBSD,
-        and &macos;&nbsp;X.  More
-        information about <application>OpenOffice.org</application>
-        can be found on the
+	<application>OpenOffice.org</application> uses a native XML
+	file format for increased portability and flexibility.  The
+	spreadsheet program features a macro language and it can be
+	interfaced with external databases.
+	<application>OpenOffice.org</application> is already stable
+	and runs natively on &windows;, &solaris;, Linux, FreeBSD,
+	and &macos;&nbsp;X.  More
+	information about <application>OpenOffice.org</application>
+	can be found on the
 	<ulink url="http://www.openoffice.org/">OpenOffice.org web site</ulink>.
 	For FreeBSD specific information, and to directly
 	download packages, use the <ulink
@@ -730,7 +730,7 @@
 	Porting Team</ulink>'s web site.</para>
 
       <para>To install <application>OpenOffice.org</application>,
-        do:</para>
+	do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r openoffice.org</userinput></screen>
 
@@ -756,9 +756,9 @@
       </note>
 
       <para>If the <application>OpenOffice.org</application> packages
-        are not available, you still have the option to compile the
-        port.  However, you must bear in mind that it requires a lot of
-        disk space and a fairly long time to compile.</para>
+	are not available, you still have the option to compile the
+	port.  However, you must bear in mind that it requires a lot of
+	disk space and a fairly long time to compile.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-3</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -801,25 +801,24 @@
 	major office suites and available on a variety of platforms.
 	It is a rebranded fork of
 	<application>OpenOffice.org</application> which includes all of the
-        mandatory applications in a complete office productivity
-        suite: a word processor, a spreadsheet, a presentation manager,
-        a drawing program, a database management program, and a tool for
+	mandatory applications in a complete office productivity
+	suite: a word processor, a spreadsheet, a presentation manager,
+	a drawing program, a database management program, and a tool for
 	creating and editing mathematical formula.  It is available in a
 	number of different languages &mdash; internationalization has been
-        extended to interfaces, spell checkers, and dictionaries.</para>
+	extended to interfaces, spell checkers, and dictionaries.</para>
 
-      <para>The word processor of <application>LibreOffice</application> 
-	uses a native XML file format for increased portability and 
-	flexibility.  The spreadsheet program features a macro language 
+      <para>The word processor of <application>LibreOffice</application>
+	uses a native XML file format for increased portability and
+	flexibility.  The spreadsheet program features a macro language
 	and it can be interfaced with external databases.
-        <application>LibreOffice</application> is already stable
-        and runs natively on &windows;, Linux, FreeBSD, and 
+	<application>LibreOffice</application> is already stable
+	and runs natively on &windows;, Linux, FreeBSD, and
 	&macos;&nbsp;X.  More information about <application>LibreOffice
 	</application> can be found on the
-	<ulink url="http://www.libreoffice.org/">LibreOffice web site</ulink>.
-	</para>
+	<ulink url="http://www.libreoffice.org/">LibreOffice web site</ulink>.</para>
 
-      <para>To install <application>LibreOffice</application> as package, 
+      <para>To install <application>LibreOffice</application> as package,
 	do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
@@ -828,7 +827,7 @@
 	<para>When running a -RELEASE version of &os;, this should work.
       </note>
 
-      <para>Once the package is installed, you need to type the following 
+      <para>Once the package is installed, you need to type the following
 	command to run <application>LibreOffice</application>:
       </para>
 
@@ -841,9 +840,9 @@
       </note>
 
       <para>If the <application>LibreOffice</application> packages
-        are not available, you still have the option to compile the
-        port.  However, you must bear in mind that it requires a lot of
-        disk space and a fairly long time to compile.</para>
+	are not available, you still have the option to compile the
+	port.  However, you must bear in mind that it requires a lot of
+	disk space and a fairly long time to compile.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/editors/libreoffice</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -856,7 +855,7 @@
 
 	<para>You have to replace
 	  <replaceable>your_language</replaceable> with the correct
-	  language ISO-code.  A list of supported language codes are 
+	  language ISO-code.  A list of supported language codes are
 	  available in the <maketarget>pre-fetch</maketarget> target of
 	  the port <filename>Makefile</filename>.
 	</para>
@@ -883,44 +882,44 @@
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
-        <thead>
-          <row>
-            <entry>Application Name</entry>
-            <entry>Resources Needed</entry>
-            <entry>Installation from Ports</entry>
-            <entry>Major Dependencies</entry>
-          </row>
-        </thead>
+	<thead>
+	  <row>
+	    <entry>Application Name</entry>
+	    <entry>Resources Needed</entry>
+	    <entry>Installation from Ports</entry>
+	    <entry>Major Dependencies</entry>
+	  </row>
+	</thead>
 
-        <tbody>
-          <row>
-            <entry><application>&acrobat.reader;</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry>Linux Binary Compatibility</entry>
-          </row>
+	<tbody>
+	  <row>
+	    <entry><application>&acrobat.reader;</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry>Linux Binary Compatibility</entry>
+	  </row>
 
-          <row>
-            <entry><application>gv</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry><application>Xaw3d</application></entry>
-          </row>
+	  <row>
+	    <entry><application>gv</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry><application>Xaw3d</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>Xpdf</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry><application>FreeType</application></entry>
-          </row>
+	  <row>
+	    <entry><application>Xpdf</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry><application>FreeType</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>GQview</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry><application>Gtk+</application> or <application>GNOME</application></entry>
-          </row>
-        </tbody>
+	  <row>
+	    <entry><application>GQview</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry><application>Gtk+</application> or <application>GNOME</application></entry>
+	  </row>
+	</tbody>
       </tgroup>
     </informaltable>
 
@@ -935,11 +934,11 @@
       </indexterm>
 
       <para>Many documents are now distributed as PDF files,
-        which stands for <quote>Portable Document Format</quote>.  One
-        of the recommended viewers for these types of files is
-        <application>&acrobat.reader;</application>, released by Adobe
-        for Linux.  As FreeBSD can run Linux binaries, it is also
-        available for FreeBSD.</para>
+	which stands for <quote>Portable Document Format</quote>.  One
+	of the recommended viewers for these types of files is
+	<application>&acrobat.reader;</application>, released by Adobe
+	for Linux.  As FreeBSD can run Linux binaries, it is also
+	available for FreeBSD.</para>
 
       <para>To install <application>&acrobat.reader; 8</application> from
 	the Ports collection, do:</para>
@@ -966,16 +965,16 @@
       </indexterm>
 
       <para><application>gv</application> is a &postscript; and PDF
-        viewer.  It is originally based on
-        <application>ghostview</application> but it has a nicer look
-        thanks to the <application>Xaw3d</application> library.  It is fast and its interface is
-        clean.  <application>gv</application> has many features, such as
-        orientation, paper size, scale, and anti-aliasing.  Almost any
-        operation can be done with either the keyboard or the
-        mouse.</para>
+	viewer.  It is originally based on
+	<application>ghostview</application> but it has a nicer look
+	thanks to the <application>Xaw3d</application> library.  It is fast and its interface is
+	clean.  <application>gv</application> has many features, such as
+	orientation, paper size, scale, and anti-aliasing.  Almost any
+	operation can be done with either the keyboard or the
+	mouse.</para>
 
       <para>To install <application>gv</application> as a package,
-        do:</para>
+	do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
 
@@ -996,25 +995,25 @@
       </indexterm>
 
       <para>If you want a small FreeBSD PDF viewer,
-        <application>Xpdf</application> is a light-weight and
-        efficient viewer.  It requires very few resources and is
-        very stable.  It uses the standard X fonts and does not
-        require <application>&motif;</application> or any other X toolkit.</para>
+	<application>Xpdf</application> is a light-weight and
+	efficient viewer.  It requires very few resources and is
+	very stable.  It uses the standard X fonts and does not
+	require <application>&motif;</application> or any other X toolkit.</para>
 
       <para>To install the <application>Xpdf</application> package,
-        issue this command:</para>
+	issue this command:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen>
 
       <para>If the package is not available or you prefer to use the
-        Ports Collection, do:</para>
+	Ports Collection, do:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/xpdf</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>Once the installation is complete, you can launch
-        <application>Xpdf</application> and use the right mouse button
-        to activate the menu.</para>
+	<application>Xpdf</application> and use the right mouse button
+	to activate the menu.</para>
     </sect2>
 
     <sect2>
@@ -1024,20 +1023,20 @@
       </indexterm>
 
       <para><application>GQview</application> is an image manager.
-        You can view a file with a single click, launch an external
-        editor, get thumbnail previews, and much more.  It also
-        features a slideshow mode and some basic file operations.  You
-        can manage image collections and easily find duplicates.
-        <application>GQview</application> can do full screen viewing
-        and supports internationalization.</para>
+	You can view a file with a single click, launch an external
+	editor, get thumbnail previews, and much more.  It also
+	features a slideshow mode and some basic file operations.  You
+	can manage image collections and easily find duplicates.
+	<application>GQview</application> can do full screen viewing
+	and supports internationalization.</para>
 
       <para>If you want to install the
-        <application>GQview</application> package, do:</para>
+	<application>GQview</application> package, do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen>
 
       <para>If the package is not available or you prefer to use the
-        Ports Collection, do:</para>
+	Ports Collection, do:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gqview</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1051,42 +1050,43 @@
       finances on your FreeBSD Desktop, there are some powerful and
       easy-to-use applications ready to be installed.  Some of them
       are compatible with widespread file formats, such as the formats used by
-      <application><trademark class="registered">Quicken</trademark></application> and <application>Excel</application> to store documents.</para>
+      <application><trademark class="registered">Quicken</trademark></application>
+      and <application>Excel</application> to store documents.</para>
 
     <para>This section covers these programs:</para>
-     
+
     <informaltable frame="none" pgwide="1">
       <tgroup cols="4">
-        <thead>
-          <row>
-            <entry>Application Name</entry>
-            <entry>Resources Needed</entry>
-            <entry>Installation from Ports</entry>
-            <entry>Major Dependencies</entry>
-          </row>
-        </thead>
+	<thead>
+	  <row>
+	    <entry>Application Name</entry>
+	    <entry>Resources Needed</entry>
+	    <entry>Installation from Ports</entry>
+	    <entry>Major Dependencies</entry>
+	  </row>
+	</thead>
 
-        <tbody>
-          <row>
-            <entry><application>GnuCash</application></entry>
-            <entry>light</entry>
-            <entry>heavy</entry>
-            <entry><application>GNOME</application></entry>
-          </row>
+	<tbody>
+	  <row>
+	    <entry><application>GnuCash</application></entry>
+	    <entry>light</entry>
+	    <entry>heavy</entry>
+	    <entry><application>GNOME</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>Gnumeric</application></entry>
-            <entry>light</entry>
-            <entry>heavy</entry>
-            <entry><application>GNOME</application></entry>
-          </row>
+	  <row>
+	    <entry><application>Gnumeric</application></entry>
+	    <entry>light</entry>
+	    <entry>heavy</entry>
+	    <entry><application>GNOME</application></entry>
+	  </row>
 
-          <row>
-            <entry><application>Abacus</application></entry>
-            <entry>light</entry>
-            <entry>light</entry>
-            <entry><application>Tcl/Tk</application></entry>
-          </row>
+	  <row>
+	    <entry><application>Abacus</application></entry>
+	    <entry>light</entry>
+	    <entry>light</entry>
+	    <entry><application>Tcl/Tk</application></entry>
+	  </row>
 
 	  <row>
 	    <entry><application>KMyMoney</application></entry>
@@ -1094,10 +1094,10 @@
 	    <entry>heavy</entry>
 	    <entry><application>KDE</application></entry>
 	  </row>
-        </tbody>
+	</tbody>
       </tgroup>
     </informaltable>
-   
+
     <sect2>
       <title>GnuCash</title>
       <indexterm>
@@ -1105,23 +1105,23 @@
       </indexterm>
 
       <para><application>GnuCash</application> is part of the
-        <application>GNOME</application> effort to provide
-        user-friendly, yet powerful, applications to end-users.  With
-        <application>GnuCash</application>, you can keep track of your
-        income and expenses, your bank accounts, and your stocks.  It
-        features an intuitive interface while remaining very
-        professional.</para>
+	<application>GNOME</application> effort to provide
+	user-friendly, yet powerful, applications to end-users.  With
+	<application>GnuCash</application>, you can keep track of your
+	income and expenses, your bank accounts, and your stocks.  It
+	features an intuitive interface while remaining very
+	professional.</para>
 
       <para><application>GnuCash</application> provides a smart
-        register, a hierarchical system of accounts, and many keyboard
-        accelerators and auto-completion methods.  It can split a
-        single transaction into several more detailed pieces.
-        <application>GnuCash</application> can import and merge
-        <application>Quicken</application> QIF files.  It also handles most international date
-        and currency formats.</para>
+	register, a hierarchical system of accounts, and many keyboard
+	accelerators and auto-completion methods.  It can split a
+	single transaction into several more detailed pieces.
+	<application>GnuCash</application> can import and merge
+	<application>Quicken</application> QIF files.  It also handles
+	most international date and currency formats.</para>
 
       <para>To install <application>GnuCash</application> on your
-        system, do:</para>
+	system, do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
 
@@ -1142,19 +1142,20 @@
       </indexterm>
 
       <para><application>Gnumeric</application> is a spreadsheet program, part
-        of the <application>GNOME</application> desktop environment.
-        It features convenient automatic <quote>guessing</quote> of user
-        input according to the cell format with an autofill system for
-        many sequences.  It can import files in a number of popular
-        formats like those of <application>Excel</application>, <application>Lotus 1-2-3</application>, or <application>Quattro Pro</application>.
-        <application>Gnumeric</application> supports graphs through
-        the <filename role="package">math/guppi</filename> graphing
-        program.  It has a large number of built-in functions and
-        allows all of the usual cell formats such as number, currency,
-        date, time, and much more.</para>
+	of the <application>GNOME</application> desktop environment.
+	It features convenient automatic <quote>guessing</quote> of user
+	input according to the cell format with an autofill system for
+	many sequences.  It can import files in a number of popular
+	formats like those of <application>Excel</application>,
+	<application>Lotus 1-2-3</application>, or <application>Quattro Pro</application>.
+	<application>Gnumeric</application> supports graphs through
+	the <filename role="package">math/guppi</filename> graphing
+	program.  It has a large number of built-in functions and
+	allows all of the usual cell formats such as number, currency,
+	date, time, and much more.</para>
 
       <para>To install <application>Gnumeric</application> as a
-        package, do:</para>
+	package, do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen>
 
@@ -1176,14 +1177,14 @@
       </indexterm>
 
       <para><application>Abacus</application> is a small and easy to
-        use spreadsheet program.  It includes many built-in functions useful
-        in several domains such as statistics, finances, and
-        mathematics.  It can import and export the <application>Excel</application> file format.
-        <application>Abacus</application> can produce &postscript;
-        output.</para>
+	use spreadsheet program.  It includes many built-in functions useful
+	in several domains such as statistics, finances, and
+	mathematics.  It can import and export the <application>Excel</application> file format.
+	<application>Abacus</application> can produce &postscript;
+	output.</para>
 
       <para>To install <application>Abacus</application> as a
-        package, do:</para>
+	package, do:</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r abacus</userinput></screen>
 
@@ -1242,9 +1243,9 @@
 
     <informaltable frame="none" pgwide="1">
       <tgroup cols="3">
-        <thead>
-          <row>
-            <entry>Application Name</entry>
+	<thead>
+	  <row>
+	    <entry>Application Name</entry>
 	    <entry>Package Name</entry>
 	    <entry>Ports Name</entry>
 	  </row>
@@ -1252,13 +1253,13 @@
 
 	<tbody>
 	  <row>
-            <entry><application>Opera</application></entry>
+	    <entry><application>Opera</application></entry>
 	    <entry><literal>opera</literal></entry>
 	    <entry><filename role="package">www/opera</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>Firefox</application></entry>
+	    <entry><application>Firefox</application></entry>
 	    <entry><literal>firefox</literal></entry>
 	    <entry><filename role="package">www/firefox</filename></entry>
 	  </row>
@@ -1270,84 +1271,84 @@
 	  </row>
 
 	  <row>
-            <entry><application>KOffice</application></entry>
+	    <entry><application>KOffice</application></entry>
 	    <entry><literal>koffice</literal></entry>
 	    <entry><filename role="package">editors/koffice-kde3</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>AbiWord</application></entry>
+	    <entry><application>AbiWord</application></entry>
 	    <entry><literal>abiword</literal></entry>
 	    <entry><filename role="package">editors/abiword</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>The GIMP</application></entry>
+	    <entry><application>The GIMP</application></entry>
 	    <entry><literal>gimp</literal></entry>
 	    <entry><filename role="package">graphics/gimp</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>OpenOffice.org</application></entry>
+	    <entry><application>OpenOffice.org</application></entry>
 	    <entry><literal>openoffice</literal></entry>
 	    <entry><filename role="package">editors/openoffice.org-3</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>LibreOffice</application></entry>
+	    <entry><application>LibreOffice</application></entry>
 	    <entry><literal>libreoffice</literal></entry>
 	    <entry><filename role="package">editors/libreoffice</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>&acrobat.reader;</application></entry>
+	    <entry><application>&acrobat.reader;</application></entry>
 	    <entry><literal>acroread</literal></entry>
 	    <entry><filename role="package">print/acroread8</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>gv</application></entry>
+	    <entry><application>gv</application></entry>
 	    <entry><literal>gv</literal></entry>
 	    <entry><filename role="package">print/gv</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>Xpdf</application></entry>
+	    <entry><application>Xpdf</application></entry>
 	    <entry><literal>xpdf</literal></entry>
 	    <entry><filename role="package">graphics/xpdf</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>GQview</application></entry>
+	    <entry><application>GQview</application></entry>
 	    <entry><literal>gqview</literal></entry>
 	    <entry><filename role="package">graphics/gqview</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>GnuCash</application></entry>
+	    <entry><application>GnuCash</application></entry>
 	    <entry><literal>gnucash</literal></entry>
 	    <entry><filename role="package">finance/gnucash</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>Gnumeric</application></entry>
+	    <entry><application>Gnumeric</application></entry>
 	    <entry><literal>gnumeric</literal></entry>
 	    <entry><filename role="package">math/gnumeric</filename></entry>
 	  </row>
 
 	  <row>
-            <entry><application>Abacus</application></entry>
+	    <entry><application>Abacus</application></entry>
 	    <entry><literal>abacus</literal></entry>
 	    <entry><filename role="package">deskutils/abacus</filename></entry>
 	  </row>
 
-	    <row>
-	      <entry><application>KMyMoney</application></entry>
-	      <entry><literal>kmymoney2</literal></entry>
-	      <entry><filename role="package">finance/kmymoney2</filename></entry>
-	      </row>
+	  <row>
+	    <entry><application>KMyMoney</application></entry>
+	    <entry><literal>kmymoney2</literal></entry>
+	    <entry><filename role="package">finance/kmymoney2</filename></entry>
+	  </row>
 
-        </tbody>
+	</tbody>
       </tgroup>
     </informaltable>
   </sect1>