Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 54c019b281cefb8914170f90974da2a5e70ff193)
+++ general/prog/git.xml	(revision 1b2d41b7889fd426ff2473797f89358d8efeddae)
@@ -71,12 +71,13 @@
       <listitem>
         <para><ulink
-        url="http://git-core.googlecode.com/files/git-manpages-&git-version;.2.tar.gz">Man
-        Pages</ulink> (only needed if you've not installed asciidoc)</para>
+        url="http://git-core.googlecode.com/files/git-manpages-&git-version;.2.tar.gz">
+        http://git-core.googlecode.com/files/git-manpages-&git-version;.2.tar.gz</ulink> 
+        (only needed if you've not installed asciidoc)</para>
       </listitem>
       <listitem>
         <para><ulink
-        url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.2.tar.gz">Html
-        version of the Man Pages</ulink> and other docs (only needed if you've
-        not installed asciidoc and xmlto).</para>
+        url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.2.tar.gz">
+        http://git-core.googlecode.com/files/git-htmldocs-&git-version;.2.tar.gz</ulink> 
+        and other docs (only needed if you've not installed asciidoc and xmlto).</para>
       </listitem>
     </itemizedlist>
@@ -85,19 +86,27 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python2"/></para>
+    <para role="required">
+      <xref linkend="python2"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="curl"/> (needed to use
-    <application>Git</application> over http, https, ftp or ftps)</para>
+    <para role="recommended">
+      <xref linkend="curl"/> (needed to use <application>Git</application> over http, 
+      https, ftp or ftps)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>, <xref linkend="expat"/>
-    and <xref linkend="tk"/> (gitk, a simple <application>Git</application>
-    repository viewer, uses <application>Tk</application> at runtime)</para>
-
-    <bridgehead renderas="sect4">Optional (to create the man
-    pages and html docs)</bridgehead>
-    <para><ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
-    <xref linkend="xmlto"/>.</para>
+    <para role="optional">
+      <xref linkend="openssl"/>, 
+      <xref linkend="expat"/>, and 
+      <xref linkend="tk"/> (gitk, a simple <application>Git</application>
+      repository viewer, uses <application>Tk</application> at runtime)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (to create the man pages and html docs)</bridgehead>
+    <para>
+      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink> and
+      <xref linkend="xmlto"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: xsoft/other/rox-filer.xml
===================================================================
--- xsoft/other/rox-filer.xml	(revision 54c019b281cefb8914170f90974da2a5e70ff193)
+++ xsoft/other/rox-filer.xml	(revision 1b2d41b7889fd426ff2473797f89358d8efeddae)
@@ -29,7 +29,7 @@
 
   <sect2 role="package">
-    <title>Introduction to Rox</title>
-
-    <para><application>Rox</application> is a fast, lightweight, gtk2 file 
+    <title>Introduction to rox-filer</title>
+
+    <para><application>rox-filer</application> is a fast, lightweight, gtk2 file 
     manager.</para>
 
@@ -62,6 +62,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="libglade"/> and
-    <xref linkend="shared-mime-info"/></para>
+      <xref linkend="libglade"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -72,5 +73,5 @@
     <title>Kernel Configuration</title>
 
-      <para>If you want <application>Rox</application> to be able to update the
+      <para>If you want <application>rox-filer</application> 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
@@ -89,7 +90,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Rox</title>
-
-    <para>Compile <application>Rox</application> with the following
+    <title>Installation of rox-filer</title>
+
+    <para>Compile <application>rox-filer</application> with the following
     commands:</para>
 
@@ -130,10 +131,10 @@
     <para><command>sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":'
     src/main.c</command>: This command hard codes /usr/share/rox as the
-    directory for <application>Rox</application>'s private files. Without
+    directory for <application>rox-filer</application>'s private files. Without
     this sed rox needs the environment variable ${APP_DIR} to be set.</para>
 
     <para><command>ln -sv application-...</command>: These commands duplicate 
     the icons for some common mime types. Without these links 
-    <application>Rox</application> would just display the default "unknown 
+    <application>rox-filer</application> would just display the default "unknown 
     binary blob" icon.</para>
   </sect2>
@@ -144,12 +145,12 @@
     <sect3><title>Configuration Information</title>
 
-      <para>Most of the configuration of <application>Rox</application> is
-      achieved by right clicking on a <application>Rox</application> window
+      <para>Most of the configuration of <application>rox-filer</application> is
+      achieved by right clicking on a <application>rox-filer</application> window
       and choosing "Options" from the menu. It stores its settings in <filename
       class="directory">~/.config/rox.sourceforge.net</filename>.</para>
 
-      <para>A <application>Rox</application> feature is that if there is an
+      <para>A <application>rox-filer</application> feature is that if there is an
       executable file called <filename>AppRun</filename> in a directory
-      <application>Rox</application> will first run <command>AppRun</command>
+      <application>rox-filer</application> will first run <command>AppRun</command>
       before it opens the folder.</para>
 
@@ -177,5 +178,5 @@
       <application>Gnome</application> or <application>KDE</application> you may
       like to create a <filename>rox.desktop</filename> file so that
-      <application>Rox</application> appears in the panel's menus. As the
+      <application>rox-filer</application> appears in the panel's menus. As the
       <systemitem class="username">root</systemitem> user:</para>
 
