Author: bdubbs
Date: 2012-02-26 09:56:20 -0700 (Sun, 26 Feb 2012)
New Revision: 9522
Modified:
trunk/BOOK/general/prog/git.xml
trunk/BOOK/xsoft/other/rox-filer.xml
Log:
Editorial changes
Modified: trunk/BOOK/general/prog/git.xml
===================================================================
--- trunk/BOOK/general/prog/git.xml 2012-02-26 15:05:56 UTC (rev 9521)
+++ trunk/BOOK/general/prog/git.xml 2012-02-26 16:56:20 UTC (rev 9522)
@@ -70,35 +70,44 @@
<itemizedlist spacing="compact">
<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>
<bridgehead renderas="sect3">Git Dependencies</bridgehead>
<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>
+ <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>
+ <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:
<ulink url="&blfs-wiki;/git"/></para>
Modified: trunk/BOOK/xsoft/other/rox-filer.xml
===================================================================
--- trunk/BOOK/xsoft/other/rox-filer.xml 2012-02-26 15:05:56 UTC (rev
9521)
+++ trunk/BOOK/xsoft/other/rox-filer.xml 2012-02-26 16:56:20 UTC (rev
9522)
@@ -28,9 +28,9 @@
</indexterm>
<sect2 role="package">
- <title>Introduction to Rox</title>
+ <title>Introduction to rox-filer</title>
- <para><application>Rox</application> is a fast, lightweight, gtk2 file
+ <para><application>rox-filer</application> is a fast, lightweight, gtk2
file
manager.</para>
&lfs70_checked;
@@ -61,8 +61,9 @@
<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:
<ulink url="&blfs-wiki;/rox-filer"/></para>
@@ -71,7 +72,7 @@
<sect2 role="kernel" id="rox-filer-kernel">
<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
support in your kernel. In <command>make menuconfig</command>:</para>
@@ -88,9 +89,9 @@
</sect2>
<sect2 role="installation">
- <title>Installation of Rox</title>
+ <title>Installation of rox-filer</title>
- <para>Compile <application>Rox</application> with the following
+ <para>Compile <application>rox-filer</application> with the following
commands:</para>
<screen><userinput>cd ROX-Filer &&
@@ -129,12 +130,12 @@
<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>
@@ -143,14 +144,14 @@
<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>
<!-- <para>As an example of how this may be used, if you have
@@ -176,7 +177,7 @@
<para>If you use a desktop environment like
<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>
<screen role="root"><userinput>ln -s ../rox/.DirIcon
/usr/share/pixmaps/rox.png &&
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
