r3276 - in trunk/BOOK: content/web gnome/add x/installing

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Jan 12 21:20:17 PST 2005


Author: randy
Date: 2005-01-12 22:20:16 -0700 (Wed, 12 Jan 2005)
New Revision: 3276

Modified:
   trunk/BOOK/content/web/apache.xml
   trunk/BOOK/content/web/proftpd.xml
   trunk/BOOK/gnome/add/gnome-games.xml
   trunk/BOOK/gnome/add/java-access-bridge.xml
   trunk/BOOK/x/installing/xfree86.xml
   trunk/BOOK/x/installing/xorg.xml
Log:
Shortened line lengths in instructions through Chapter 32 (700 pages)

Modified: trunk/BOOK/content/web/apache.xml
===================================================================
--- trunk/BOOK/content/web/apache.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/content/web/apache.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -24,9 +24,8 @@
 <title>Introduction to <application>Apache</application></title>
 
 <para>The <application>Apache</application> package contains an
-open-source <acronym>HTTP</acronym> server. It is
-useful for creating local intranet web sites or running huge web serving
-operations.</para>
+open-source <acronym>HTTP</acronym> server. It is useful for creating local 
+intranet web sites or running huge web serving operations.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -87,7 +86,8 @@
 chown root:root /usr/sbin/{apxs,apachectl,dbmmanage,envvars-std,envvars} \
     /usr/include/apache/* /usr/lib/apache/httpd.exp \
     /usr/share/man/man1/{dbmmanage,htdigest,htpasswd}.1 \
-    /usr/share/man/man8/{ab,apachectl,apxs,httpd,logresolve,rotatelogs,suexec}.8 &&
+    /usr/share/man/man8/{ab,apachectl,apxs,httpd}.8 &&
+    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &&
 chown -R apache:apache /srv/www</command></userinput></screen>
 
 </sect2>

Modified: trunk/BOOK/content/web/proftpd.xml
===================================================================
--- trunk/BOOK/content/web/proftpd.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/content/web/proftpd.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -60,7 +60,8 @@
 <screen><userinput><command>groupadd proftpd &&
 ln -s false /usr/lib/proftpd/proftpdshell &&
 echo /usr/lib/proftpd/proftpdshell >> /etc/shells &&
-useradd -c proftpd -d /home/ftp -g proftpd -s /usr/lib/proftpd/proftpdshell proftpd</command>
+useradd -c proftpd -d /home/ftp -g proftpd \
+        -s /usr/lib/proftpd/proftpdshell proftpd</command>
 </userinput></screen>
 
 <para>Install <application>Pro<acronym>FTP</acronym>D</application> by running 

Modified: trunk/BOOK/gnome/add/gnome-games.xml
===================================================================
--- trunk/BOOK/gnome/add/gnome-games.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/gnome/add/gnome-games.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -74,7 +74,8 @@
 
 <screen><userinput><command>install -d /var/lib/games &&
 groupadd games &&
-useradd -c 'Games High Score Owner' -d /var/lib/games -g games -s /bin/false games &&
+useradd -c 'Games High Score Owner' -d /var/lib/games \
+        -g games -s /bin/false games &&
 chown games:games /var/lib/games</command></userinput></screen>
 
 <para>Install <application><acronym>GNOME</acronym> Games</application> by 

Modified: trunk/BOOK/gnome/add/java-access-bridge.xml
===================================================================
--- trunk/BOOK/gnome/add/java-access-bridge.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/gnome/add/java-access-bridge.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -63,10 +63,12 @@
 <screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &&
 make &&
 make install &&
-cat `pkg-config --variable=prefix ORBit-2.0`/share/jar/accessibility.properties \
+cat `pkg-config --variable=prefix \
+    ORBit-2.0`/share/jar/accessibility.properties \
     >> $JAVA_HOME/jre/lib/accessibility.properties &&
 chmod 444 $JAVA_HOME/jre/lib/accessibility.properties &&
-ln -sf `pkg-config --variable=prefix ORBit-2.0`/share/jar/gnome-java-bridge.jar \
+ln -sf `pkg-config --variable=prefix \
+    ORBit-2.0`/share/jar/gnome-java-bridge.jar \
     $JAVA_HOME/jre/lib/ext</command></userinput></screen>
 
 </sect2>

Modified: trunk/BOOK/x/installing/xfree86.xml
===================================================================
--- trunk/BOOK/x/installing/xfree86.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/x/installing/xfree86.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -31,11 +31,16 @@
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&xfree86-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&xfree86-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &xfree86-size;</para></listitem>
-<listitem><para>Estimated disk space required: &xfree86-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &xfree86-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): 
+<ulink url="&xfree86-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&xfree86-download-ftp;"/></para></listitem>
+<listitem><para>Download size: 
+&xfree86-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&xfree86-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&xfree86-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title>Additional downloads</title>
@@ -181,34 +186,36 @@
 /* Begin XFree86 host.def file */
 
 /* System Related Information.  If you read and configure only one
- * section then it should be this one.  The Intel architecture defaults are 
- * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is  
- * for the Power PC.  Note that there have been reports that the Ppc 
- * optimization line causes segmentation faults during build.  If that 
- * happens, try building without the DefaultGcc2PpcOpt line.  **************/
+ * section then it should be this one.  The Intel architecture defaults 
+ * are set for a i686 and higher.  Axp is for the Alpha architecture 
+ * and Ppc is for the Power PC.  Note that there have been reports that 
+ * the Ppc optimization line causes segmentation faults during build.
+ * If that happens, try building without the DefaultGcc2PpcOpt line. */
 
 /* #define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686 */
 /* #define DefaultGcc2AxpOpt   -O2 -mcpu=ev6 */
 /* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
 
-/* The following definitions are normally set properly by XFree86's scripts.
- * You can uncomment them if you want to make sure. ************************/
+/* The following definitions are normally set properly by XFree86's 
+ * scripts. You can uncomment them if you want to make sure. *********/
  
-/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
+/* #define HasMTRRSupport      YES  */ /* Enabled in kernel; */
+                                       /* see kernel docs */
 /* #define HasMMXSupport        NO  */ /* Any i586 or above */
 /* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
 /* #define Has3DNowSupport      NO  */ /* AMD instructions */
 
 
-/* This setting reduces compile time a little by omitting rarely used input 
- * devices.  You can find the complete list in config/cf/xfree86.cf ********/
+/* This setting reduces compile time a little by omitting rarely used 
+ * input devices.  You can find the complete list in 
+ * config/cf/xfree86.cf *********************************************/
  
 #define XInputDrivers                 mouse void
 
-/* VIDEO DRIVERS ***********************************************************/
+/* VIDEO DRIVERS ****************************************************/
 
-/* If you are sure you only want the drivers for one or a few video cards,
- * you can delete the drivers you do not want. *****************************/ 
+/* If you are sure you only want the drivers for one or a few video 
+ * cards, you can delete the drivers you do not want. ***************/ 
 
 
 #define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
@@ -221,41 +228,42 @@
                          dummy XF86OSCardDrivers XF86ExtraCardDrivers
 
 
-/* USER AND SYSTEM DEFAULT PATHS *******************************************/
+/* USER AND SYSTEM DEFAULT PATHS *************************************/
 
-/* These settings set the PATH variables used by xdm. See README for *******/
-/* detailed description and modify the following as per your need. *********/
+/* These settings set the PATH variables used by xdm. See README for */
+/* detailed description and modify the following as per your need. ***/
 
-/* #define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
+/* #define DefaultSystemPath \
+       /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
 /* #define DefaultUserPath /usr/bin:/bin:/usr/X11R6/bin */
 
-/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
+/* FONT SERVER AND LIBRARY SETTINGS **********************************/
 
-/* These settings are the defaults   ***************************************/
+/* These settings are the defaults  **********************************/
 
-/* #define BuildFontServer          YES  */ /* For Ghostscript Print Server*/
-/* #define SharedLibFont            YES  */
-/* #define CompressAllFonts         YES  */
-/* #define GzipFontCompression      YES  */
+/* #define BuildFontServer       YES  */ /*For Ghostscript Print Server*/
+/* #define SharedLibFont         YES  */
+/* #define CompressAllFonts      YES  */
+/* #define GzipFontCompression   YES  */
 
-/* These settings ensure we use our libraries ******************************/
+/* These settings ensure we use our libraries ************************/
 #define HasFreetype2             YES
 #define HasFontconfig            YES
 #define HasExpat                 YES
 #define HasLibpng                YES
 #define HasZlib                  YES
 
-/* The font path can be redefined in the XF86Config file *******************/
+/* The font path can be redefined in the XF86Config file *************/
 
 /*
-#define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
+#define DefaultFontPath          $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
 $(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
 $(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
 */
 
 
-/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
- * the defaults. ***********************************************************/
+/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These
+ * are the defaults. **************************************************/
 
 /* #define BuildCyrillicFonts            NO  */
 /* #define BuildArabicFonts              NO  */
@@ -270,17 +278,17 @@
 /* #define BuildKoreanFonts              NO  */
 /* #define BuildChineseFonts             NO  */
 
-/* DOCUMENTATION SETTINGS **************************************************/
+/* DOCUMENTATION SETTINGS ********************************************/
 
-/* These setting are the defaults. *****************************************/
+/* These setting are the defaults. ***********************************/
 
-/* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
-/* #define BuildLinuxDocPS               NO  */  /* PostScript format */
-/* #define BuildAllSpecsDocs             NO  */  /* Various docs */
-/* #define BuildHtmlManPages             NO  */
+/* #define BuildLinuxDocHtml        NO  */  /* X Docs in Html format */
+/* #define BuildLinuxDocPS          NO  */  /* PostScript format */
+/* #define BuildAllSpecsDocs        NO  */  /* Various docs */
+/* #define BuildHtmlManPages        NO  */
 
 /* GENERAL SETTINGS: You generally want to leave these alone when
- * building X on an LFS system *********************************************/
+ * building X on an LFS system ***************************************/
 
 #define GccWarningOptions         -pipe /* Speed up compiles */
 #define TermcapLibrary            -lncurses
@@ -292,7 +300,7 @@
 #define FSUseSyslog               YES
 #define ThreadedX                 YES
 #define HasPam                     NO        
-#define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
+#define SystemManDirectory        /usr/share/man /*Instead of /usr/man*/
 #define HasLibCrypt               YES
 #define InstallXinitConfig        YES
 #define InstallXdmConfig          YES
@@ -323,7 +331,8 @@
 
 <screen><userinput><command>sed -i -e "s@#include <linux/config.h>@/* & */@" \
     `grep -lr linux/config.h *` &&
-( make WORLDOPTS="" World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS ) &&
+( make WORLDOPTS="" World 2>&1 | \
+    tee xfree-compile.log && exit $PIPESTATUS ) &&
 make install &&
 make install.man &&
 ln -sf ../X11R6/bin /usr/bin/X11 &&

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2005-01-13 02:55:38 UTC (rev 3275)
+++ trunk/BOOK/x/installing/xorg.xml	2005-01-13 05:20:16 UTC (rev 3276)
@@ -58,11 +58,16 @@
  
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&xorg-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&xorg-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &xorg-size;</para></listitem>
-<listitem><para>Estimated disk space required: &xorg-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &xorg-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): 
+<ulink url="&xorg-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&xorg-download-ftp;"/></para></listitem>
+<listitem><para>Download size: 
+&xorg-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&xorg-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&xorg-time;</para></listitem></itemizedlist>
 </sect3>
  
 <sect3><title><application>Xorg</application> Dependencies</title>
@@ -200,14 +205,17 @@
 /* Begin Xorg host.def file */
  
 /* System Related Information.  If you read and configure only one
- * section then it should be this one.  The Intel architecture defaults are
- * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
- * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
- * been reports that the Ppc optimization line causes segmentation faults during 
- * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
+ * section then it should be this one.  The Intel architecture defaults 
+ * are set for a i686 and higher.  Axp is for the Alpha architecture 
+ * and Ppc is for the Power PC.  AMD64 is for the Opteron processor. 
+ * Note that there have been reports that the Ppc optimization line 
+ * causes segmentation faults during build.  If that happens, try 
+ * building without the DefaultGcc2PpcOpt line.  ***********/
  
-/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
-/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
+/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce \
+                              -fno-strict-aliasing -march=i686 */
+/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce \
+                              -fno-strict-aliasing */
 /* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
 /* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
 
@@ -218,17 +226,17 @@
 #define HasZlib                 YES
 
 /*
- * Which drivers to build.  When building a static server, each of these
- * will be included in it.  When building the loadable server each of these
- * modules will be built.
+ * Which drivers to build.  When building a static server, each of 
+ * these will be included in it.  When building the loadable server 
+ * each of these modules will be built.
  *
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
                                 neomagic i740 tdfx savage \
                                 cirrus vmware tseng trident chips apm \
                                 GlideDriver fbdev i128 \
-                                ati AgpGartDrivers DevelDrivers ark cyrix \
-                                siliconmotion \
-                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+                                ati AgpGartDrivers DevelDrivers ark \
+                                cyrix siliconmotion vesa vga \
+                                XF86OSCardDrivers XF86ExtraCardDrivers
 */
 
 /*
@@ -236,8 +244,8 @@
  *
 #define XInputDrivers           mouse keyboard acecad calcomp citron \
                                 digitaledge dmc dynapro elographics \
-                                microtouch mutouch penmount spaceorb summa \
-                                wacom void magictouch aiptek
+                                microtouch mutouch penmount spaceorb \
+                                summa wacom void magictouch aiptek
  */
 
 /* Most installs will only need this */




More information about the blfs-book mailing list