diff --git a/general.ent b/general.ent
index ef1ecf777f..22ed6cdcde 100644
--- a/general.ent
+++ b/general.ent
@@ -864,9 +864,7 @@ $Date$
-
-
@@ -883,10 +881,13 @@ $Date$
-->
-
-
+
+
+
+
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 691368d803..c2d8550235 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -74,6 +74,9 @@
[ken] - merge gedit-3.2.3 from Wayne.
+
+ [abenton] - add Rox filer 2.10.
+
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index c48d708045..259dbb4367 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -258,10 +258,11 @@ chown -R -v root:root /usr/lib/firefox-&firefox-version;
and click on 'Join the HTML5 Trial' (needs cookies enabled).
If you use a desktop environment like Gnome
- or KDE you may like to create a firefox.desktop
- file so that Firefox appears in the panel's
- menus. If you didn't enable startup-notification in your mozconfig
- change the StartupNotify line to false. As the
+ or KDE you may like to create a
+ firefox.desktop file so that
+ Firefox appears in the panel's menus. If you
+ didn't enable startup-notification in your mozconfig change the
+ StartupNotify line to false. As the
root user:
cat > /usr/share/applications/firefox.desktop << "EOF"
diff --git a/xsoft/office/office.xml b/xsoft/office/office.xml
index ad97452ec6..28a63ac9ac 100644
--- a/xsoft/office/office.xml
+++ b/xsoft/office/office.xml
@@ -23,7 +23,6 @@ $Date$
-
diff --git a/xsoft/office/gimp.xml b/xsoft/other/gimp.xml
similarity index 100%
rename from xsoft/office/gimp.xml
rename to xsoft/other/gimp.xml
diff --git a/xsoft/other/other.xml b/xsoft/other/other.xml
index 3be5992a85..ba6670774b 100644
--- a/xsoft/other/other.xml
+++ b/xsoft/other/other.xml
@@ -13,16 +13,18 @@ $Date$
- Other X-based Internet Programs
+ Other X-based Programs
- The Internet isn't just about browsing. Here are more graphical
- applications that utilize other areas of the Internet.
+ These programs use the X window system and don't fit easily into any
+ of the other chapters.
-
-
-
-
+
+
+
+
+
+
diff --git a/xsoft/other/rox-filer.xml b/xsoft/other/rox-filer.xml
new file mode 100644
index 0000000000..ea53539043
--- /dev/null
+++ b/xsoft/other/rox-filer.xml
@@ -0,0 +1,227 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ $LastChangedBy$
+
+
+
+ Rox-&rox-filer-version;
+
+
+ rox-filer
+
+
+
+ Introduction to Rox
+
+ Rox is a fast, lightweight, gtk2 file
+ manager.
+
+ &lfs70_checked;
+
+ Package Information
+
+
+ Download (HTTP):
+
+
+ Download (FTP):
+
+
+ Download MD5 sum: &rox-filer-md5sum;
+
+
+ Download size: &rox-filer-size;
+
+
+ Estimated disk space required: &rox-filer-buildsize;
+
+
+ Estimated build time: &rox-filer-time;
+
+
+
+ rox-filer Dependencies
+
+ Required
+
+ and
+
+
+ User Notes:
+
+
+
+
+ Kernel Configuration
+
+ If you want Rox to be able to update the
+ contents of a directory when changes are made to the files by other
+ applications (eg, if a script is running) you will need to enable dnotify
+ support in your kernel. In make menuconfig:
+
+Filesystems --->
+ [*] Dnotify support
+
+ Save the new .config and then compile the
+ kernel.
+
+
+ rox-filer
+
+
+
+
+ Installation of Rox
+
+ Compile Rox with the following
+ commands:
+
+cd ROX-Filer &&
+sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &&
+mkdir build &&
+cd build &&
+../src/configure &&
+make
+
+ Now install it as the root
+ user:
+
+mkdir /usr/share/rox &&
+mv ../{Help,images,Messages,Options.xml,ROX,style.css,.DirIcon} /usr/share/rox &&
+mv ../../rox.1 /usr/share/man/man1 &&
+mv ../ROX-Filer /usr/bin/rox &&
+chown -R root:root /usr/{bin,share}/rox &&
+cd /usr/share/rox/ROX/MIME &&
+ln -sv text-x-{diff,patch}.png &&
+ln -sv application-x-font-{afm,type1}.png &&
+ln -sv application-xml{,-dtd}.png &&
+ln -sv application-xml{,-external-parsed-entity}.png &&
+ln -sv application-{,rdf+}xml.png &&
+ln -sv application-x{ml,-xbel}.png &&
+ln -sv application-{x-shell,java}script.png &&
+ln -sv application-x-{bzip,xz}-compressed-tar.png &&
+ln -sv application-x-{bzip,lzma}-compressed-tar.png &&
+ln -sv application-x-{bzip-compressed-tar,lzo}.png &&
+ln -sv application-x-{bzip,xz}.png &&
+ln -sv application-x-{gzip,lzma}.png &&
+ln -sv application-{msword,rtf}.png
+
+
+
+ Command Explanations
+
+ sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":'
+ src/main.c: This command hard codes /usr/share/rox as the
+ directory for Rox's private files. Without
+ this sed rox needs the environment variable ${APP_DIR} to be set.
+
+ ln -sv application-...: These commands duplicate
+ the icons for some common mime types. Without these links
+ Rox would just display the default "unknown
+ binary blob" icon.
+
+
+
+ Configuring Rox
+
+ Configuration Information
+
+ Most of the configuration of Rox is
+ achieved by right clicking on a Rox window
+ and choosing "Options" from the menu. It stores its settings in ~/.config/rox.sourceforge.net.
+
+ A Rox feature is that if there is an
+ executable file called AppRun in a directory
+ Rox will first run AppRun
+ before it opens the folder.
+
+
+
+ If you use a desktop environment like
+ Gnome or KDE you may
+ like to create a rox.desktop file so that
+ Rox appears in the panel's menus. As the
+ root user:
+
+ln -s ../rox/.DirIcon /usr/share/pixmaps/rox.png &&
+cat > /usr/share/applications/rox.desktop << "HERE_DOC"
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Rox
+Comment=The Rox File Manager
+Icon=rox
+Exec=rox
+Categories=GTK;Utility;Application;System;Core;
+StartupNotify=true
+Terminal=false
+HERE_DOC
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Directories
+
+
+ rox
+ /usr/share/rox
+
+
+
+
+ Short Descriptions
+
+
+
+
+ rox
+
+ is the rox file manager.
+
+ rox-filer
+
+
+
+
+
+