(no commit message)

diff --git a/docs/handbook/handbook-desktop-productivity.mdwn b/docs/handbook/handbook-desktop-productivity.mdwn
index 97bd50c..84054d9 100644 (file)
--- a/docs/handbook/handbook-desktop-productivity.mdwn
+++ b/docs/handbook/handbook-desktop-productivity.mdwn
@@ -31,27 +31,15 @@ Before installing the latest  **KOffice** , make sure you have an up-to-date ver
 
 
 
-To install  **KOffice**  as a package, issue the following command:
+To install  **KOffice**  as a package, you can use the ports collection. For instance, to install  **KOffice**  for ***'KDE3***', do:
 
 
 
     
 
-    # pkg_add koffice
+    # cd /usr/ports/misc/koffice
 
-
-
-
-
-If the package is not available, you can use the ports collection. For instance, to install  **KOffice**  for ***'KDE3***', do:
-
-
-
-    
-
-    # cd /usr/ports/editors/koffice-kde3
-
-    # make install clean
+    # bmake install clean
 
 
 
@@ -75,9 +63,11 @@ If the package is not available, you can use the ports collection. For instance,
 
     
 
-    # pkg_add AbiWord
+    # pkg_radd abiword
 
+or
 
+    # pkgin in abiword
 
 
 
@@ -89,7 +79,7 @@ If the package is not available, it can be compiled from the ports collection. T
 
     # cd /usr/ports/editors/AbiWord
 
-    # make install clean
+    # bmake install clean
 
 
 
@@ -105,14 +95,13 @@ For image authoring or picture retouching,  **The GIMP**  is a very sophisticate
 
 You can install the package by issuing this command:
 
-
-
     
 
-    # pkg_add -r gimp
-
+    # pkg_radd gimp-2.6
 
+or 
 
+    # pkgin in gimp-2.6
 
 
 If your FTP site does not have this package, you can use the ports collection. The [graphics](http://www.FreeBSD.org/ports/graphics.html) directory of the ports collection also contains  **The Gimp Manual** . Here is how to get them installed:
@@ -121,21 +110,11 @@ If your FTP site does not have this package, you can use the ports collection. T
 
     
 
-    # cd /usr/ports/graphics/gimp1
-
-    # make install clean
-
-    # cd /usr/ports/graphics/gimp-manual-pdf
-
-    # make install clean
-
-
-
-
-
- **Note:** The [graphics](http://www.FreeBSD.org/ports/graphics.html) directory of the ports collection holds the development version of  **The GIMP**  in [`graphics/gimp-devel`](http://pkgsrc.se/graphics/gimp-devel). HTML and PostScript® versions of  **The Gimp Manual**  are in [`graphics/gimp-manual-html`](http://pkgsrc.se/graphics/gimp-manual-html) and [`graphics/gimp-manual-ps`](http://pkgsrc.se/graphics/gimp-manual-ps).
+    # cd /usr/ports/graphics/gimp
 
+    # bmake install clean
 
+    
 
 ### 15.3.4 OpenOffice.org 
 
@@ -149,85 +128,9 @@ The word processor of  **OpenOffice.org**  uses a native XML file format for inc
 
 
 
-To install  **OpenOffice.org** , do:
-
-
-
-    
-
-    # pkg_add openoffice
-
-
-
-
-
-Once the package is installed, you must run the setup program and choose a `standard workstation installation`. Run this command as the user who will use  **OpenOffice.org** :
-
-
-
-    
-
-    % openoffice-setup
-
-
-
-
-
-If the  **OpenOffice.org**  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.
-
-
-
-    
-
-    # cd /usr/ports/editors/openoffice
-
-    # make install clean
-
-
-
-
-
-Once this is done, run the setup as the user who will use  **OpenOffice.org**  and choose a `standard workstation installation` by:
-
-
-
-    
-
-    % cd /usr/ports/editors/openoffice
-
-    % make install-user
-
-
-
-
-
-If you want to use a localized version, here are the available ports:
-
-
-
-[[!table  data="""
-| Language | Port 
- Arabic | [`editors/openoffice-ar`](http://pkgsrc.se/editors/openoffice-ar) 
- Danish | [`editors/openoffice-dk`](http://pkgsrc.se/editors/openoffice-dk) 
- Spanish | [`editors/openoffice-es`](http://pkgsrc.se/editors/openoffice-es) 
- Greek | [`editors/openoffice-gr`](http://pkgsrc.se/editors/openoffice-gr) 
- Italian | [`editors/openoffice-it`](http://pkgsrc.se/editors/openoffice-it) 
- Dutch | [`editors/openoffice-nl`](http://pkgsrc.se/editors/openoffice-nl) 
- Swedish | [`editors/openoffice-se`](http://pkgsrc.se/editors/openoffice-se) 
- Turkish | [`editors/openoffice-tr`](http://pkgsrc.se/editors/openoffice-tr) 
- French | [`french/openoffice`](http://pkgsrc.se/french/openoffice) 
- German | [`german/openoffice`](http://pkgsrc.se/german/openoffice) 
- Japanese | [`japanese/openoffice`](http://pkgsrc.se/japanese/openoffice) 
- Korean | [`korean/openoffice`](http://pkgsrc.se/korean/openoffice) 
- Polish | [`polish/openoffice`](http://pkgsrc.se/polish/openoffice) 
- Portuguese | [`portuguese/openoffice`](http://pkgsrc.se/portuguese/openoffice) 
- Russian | [`russian/openoffice`](http://pkgsrc.se/russian/openoffice) |
-
-"""]]
-
-
-If all above fails:
+To install  **OpenOffice.org**:
 
+  
 Load linux module into kernel 
 
     #kldload linux
@@ -243,11 +146,9 @@ Then
 
 Install  OpenOffice:
 
-    #pkg_radd -v openoffice3-bin 
-or
+    #cd /usr/ports/misc/openoffice3-bin
+    #bmake install clean
 
-    #pkgin install openoffice3-bin
-    
 Use: 
 
     %soffice