Changeset 47603ac1


Ignore:
Timestamp:
01/13/2005 05:20:16 AM (19 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/inkscape-core-mods, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
5d34b74
Parents:
7ee9849
Message:

Shortened line lengths in instructions through Chapter 32 (700 pages)

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3276 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • content/web/apache.xml

    r7ee9849 r47603ac1  
    2525
    2626<para>The <application>Apache</application> package contains an
    27 open-source <acronym>HTTP</acronym> server. It is
    28 useful for creating local intranet web sites or running huge web serving
    29 operations.</para>
     27open-source <acronym>HTTP</acronym> server. It is useful for creating local
     28intranet web sites or running huge web serving operations.</para>
    3029
    3130<sect3><title>Package information</title>
    … …  
    8887    /usr/include/apache/* /usr/lib/apache/httpd.exp \
    8988    /usr/share/man/man1/{dbmmanage,htdigest,htpasswd}.1 \
    90     /usr/share/man/man8/{ab,apachectl,apxs,httpd,logresolve,rotatelogs,suexec}.8 &amp;&amp;
     89    /usr/share/man/man8/{ab,apachectl,apxs,httpd}.8 &amp;&amp;
     90    /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &amp;&amp;
    9191chown -R apache:apache /srv/www</command></userinput></screen>
    9292

  • content/web/proftpd.xml

    r7ee9849 r47603ac1  
    6161ln -s false /usr/lib/proftpd/proftpdshell &amp;&amp;
    6262echo /usr/lib/proftpd/proftpdshell &gt;&gt; /etc/shells &amp;&amp;
    63 useradd -c proftpd -d /home/ftp -g proftpd -s /usr/lib/proftpd/proftpdshell proftpd</command>
     63useradd -c proftpd -d /home/ftp -g proftpd \
     64        -s /usr/lib/proftpd/proftpdshell proftpd</command>
    6465</userinput></screen>
    6566

  • gnome/add/gnome-games.xml

    r7ee9849 r47603ac1  
    7575<screen><userinput><command>install -d /var/lib/games &amp;&amp;
    7676groupadd games &amp;&amp;
    77 useradd -c 'Games High Score Owner' -d /var/lib/games -g games -s /bin/false games &amp;&amp;
     77useradd -c 'Games High Score Owner' -d /var/lib/games \
     78        -g games -s /bin/false games &amp;&amp;
    7879chown games:games /var/lib/games</command></userinput></screen>
    7980

  • gnome/add/java-access-bridge.xml

    r7ee9849 r47603ac1  
    6464make &amp;&amp;
    6565make install &amp;&amp;
    66 cat `pkg-config --variable=prefix ORBit-2.0`/share/jar/accessibility.properties \
     66cat `pkg-config --variable=prefix \
     67    ORBit-2.0`/share/jar/accessibility.properties \
    6768    &gt;&gt; $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
    6869chmod 444 $JAVA_HOME/jre/lib/accessibility.properties &amp;&amp;
    69 ln -sf `pkg-config --variable=prefix ORBit-2.0`/share/jar/gnome-java-bridge.jar \
     70ln -sf `pkg-config --variable=prefix \
     71    ORBit-2.0`/share/jar/gnome-java-bridge.jar \
    7072    $JAVA_HOME/jre/lib/ext</command></userinput></screen>
    7173

  • x/installing/xfree86.xml

    r7ee9849 r47603ac1  
    3232<sect3><title>Package information</title>
    3333<itemizedlist spacing='compact'>
    34 <listitem><para>Download (HTTP): <ulink url="&xfree86-download-http;"/></para></listitem>
    35 <listitem><para>Download (FTP): <ulink url="&xfree86-download-ftp;"/></para></listitem>
    36 <listitem><para>Download size: &xfree86-size;</para></listitem>
    37 <listitem><para>Estimated disk space required: &xfree86-buildsize;</para></listitem>
    38 <listitem><para>Estimated build time: &xfree86-time;</para></listitem></itemizedlist>
     34<listitem><para>Download (HTTP):
     35<ulink url="&xfree86-download-http;"/></para></listitem>
     36<listitem><para>Download (FTP):
     37<ulink url="&xfree86-download-ftp;"/></para></listitem>
     38<listitem><para>Download size:
     39&xfree86-size;</para></listitem>
     40<listitem><para>Estimated disk space required:
     41&xfree86-buildsize;</para></listitem>
     42<listitem><para>Estimated build time:
     43&xfree86-time;</para></listitem></itemizedlist>
    3944</sect3>
    4045
    … …  
    182187
    183188/* System Related Information.  If you read and configure only one
    184  * section then it should be this one.  The Intel architecture defaults are
    185  * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
    186  * for the Power PC.  Note that there have been reports that the Ppc
    187  * optimization line causes segmentation faults during build.  If that
    188  * happens, try building without the DefaultGcc2PpcOpt line.  **************/
     189 * section then it should be this one.  The Intel architecture defaults
     190 * are set for a i686 and higher.  Axp is for the Alpha architecture
     191 * and Ppc is for the Power PC.  Note that there have been reports that
     192 * the Ppc optimization line causes segmentation faults during build.
     193 * If that happens, try building without the DefaultGcc2PpcOpt line. */
    189194
    190195/* #define DefaultGcc2i386Opt  -O2 -fomit-frame-pointer -march=i686 */
    … …  
    192197/* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
    193198
    194 /* The following definitions are normally set properly by XFree86's scripts.
    195  * You can uncomment them if you want to make sure. ************************/
     199/* The following definitions are normally set properly by XFree86's
     200 * scripts. You can uncomment them if you want to make sure. *********/
    196201 
    197 /* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
     202/* #define HasMTRRSupport      YES  */ /* Enabled in kernel; */
     203                                       /* see kernel docs */
    198204/* #define HasMMXSupport        NO  */ /* Any i586 or above */
    199205/* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
    … …  
    201207
    202208
    203 /* This setting reduces compile time a little by omitting rarely used input
    204  * devices.  You can find the complete list in config/cf/xfree86.cf ********/
     209/* This setting reduces compile time a little by omitting rarely used
     210 * input devices.  You can find the complete list in
     211 * config/cf/xfree86.cf *********************************************/
    205212 
    206213#define XInputDrivers                 mouse void
    207214
    208 /* VIDEO DRIVERS ***********************************************************/
    209 
    210 /* If you are sure you only want the drivers for one or a few video cards,
    211  * you can delete the drivers you do not want. *****************************/
     215/* VIDEO DRIVERS ****************************************************/
     216
     217/* If you are sure you only want the drivers for one or a few video
     218 * cards, you can delete the drivers you do not want. ***************/
    212219
    213220
    … …  
    222229
    223230
    224 /* USER AND SYSTEM DEFAULT PATHS *******************************************/
    225 
    226 /* These settings set the PATH variables used by xdm. See README for *******/
    227 /* detailed description and modify the following as per your need. *********/
    228 
    229 /* #define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
     231/* USER AND SYSTEM DEFAULT PATHS *************************************/
     232
     233/* These settings set the PATH variables used by xdm. See README for */
     234/* detailed description and modify the following as per your need. ***/
     235
     236/* #define DefaultSystemPath \
     237       /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
    230238/* #define DefaultUserPath /usr/bin:/bin:/usr/X11R6/bin */
    231239
    232 /* FONT SERVER AND LIBRARY SETTINGS ****************************************/
    233 
    234 /* These settings are the defaults   ***************************************/
    235 
    236 /* #define BuildFontServer          YES  */ /* For Ghostscript Print Server*/
    237 /* #define SharedLibFont            YES  */
    238 /* #define CompressAllFonts         YES  */
    239 /* #define GzipFontCompression      YES  */
    240 
    241 /* These settings ensure we use our libraries ******************************/
     240/* FONT SERVER AND LIBRARY SETTINGS **********************************/
     241
     242/* These settings are the defaults  **********************************/
     243
     244/* #define BuildFontServer       YES  */ /*For Ghostscript Print Server*/
     245/* #define SharedLibFont         YES  */
     246/* #define CompressAllFonts      YES  */
     247/* #define GzipFontCompression   YES  */
     248
     249/* These settings ensure we use our libraries ************************/
    242250#define HasFreetype2             YES
    243251#define HasFontconfig            YES
    … …  
    246254#define HasZlib                  YES
    247255
    248 /* The font path can be redefined in the XF86Config file *******************/
     256/* The font path can be redefined in the XF86Config file *************/
    249257
    250258/*
    251 #define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
     259#define DefaultFontPath          $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
    252260$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
    253261$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
    … …  
    255263
    256264
    257 /* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
    258  * the defaults. ***********************************************************/
     265/* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These
     266 * are the defaults. **************************************************/
    259267
    260268/* #define BuildCyrillicFonts            NO  */
    … …  
    271279/* #define BuildChineseFonts             NO  */
    272280
    273 /* DOCUMENTATION SETTINGS **************************************************/
    274 
    275 /* These setting are the defaults. *****************************************/
    276 
    277 /* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
    278 /* #define BuildLinuxDocPS               NO  */  /* PostScript format */
    279 /* #define BuildAllSpecsDocs             NO  */  /* Various docs */
    280 /* #define BuildHtmlManPages             NO  */
     281/* DOCUMENTATION SETTINGS ********************************************/
     282
     283/* These setting are the defaults. ***********************************/
     284
     285/* #define BuildLinuxDocHtml        NO  */  /* X Docs in Html format */
     286/* #define BuildLinuxDocPS          NO  */  /* PostScript format */
     287/* #define BuildAllSpecsDocs        NO  */  /* Various docs */
     288/* #define BuildHtmlManPages        NO  */
    281289
    282290/* GENERAL SETTINGS: You generally want to leave these alone when
    283  * building X on an LFS system *********************************************/
     291 * building X on an LFS system ***************************************/
    284292
    285293#define GccWarningOptions         -pipe /* Speed up compiles */
    … …  
    293301#define ThreadedX                 YES
    294302#define HasPam                     NO       
    295 #define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
     303#define SystemManDirectory        /usr/share/man /*Instead of /usr/man*/
    296304#define HasLibCrypt               YES
    297305#define InstallXinitConfig        YES
    … …  
    324332<screen><userinput><command>sed -i -e "s@#include &lt;linux/config.h&gt;@/* &amp; */@" \
    325333    `grep -lr linux/config.h *` &amp;&amp;
    326 ( make WORLDOPTS="" World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS ) &amp;&amp;
     334( make WORLDOPTS="" World 2&gt;&amp;1 | \
     335    tee xfree-compile.log &amp;&amp; exit $PIPESTATUS ) &amp;&amp;
    327336make install &amp;&amp;
    328337make install.man &amp;&amp;

  • x/installing/xorg.xml

    r7ee9849 r47603ac1  
    5959<sect3><title>Package information</title>
    6060<itemizedlist spacing='compact'>
    61 <listitem><para>Download (HTTP): <ulink url="&xorg-download-http;"/></para></listitem>
    62 <listitem><para>Download (FTP): <ulink url="&xorg-download-ftp;"/></para></listitem>
    63 <listitem><para>Download size: &xorg-size;</para></listitem>
    64 <listitem><para>Estimated disk space required: &xorg-buildsize;</para></listitem>
    65 <listitem><para>Estimated build time: &xorg-time;</para></listitem></itemizedlist>
     61<listitem><para>Download (HTTP):
     62<ulink url="&xorg-download-http;"/></para></listitem>
     63<listitem><para>Download (FTP):
     64<ulink url="&xorg-download-ftp;"/></para></listitem>
     65<listitem><para>Download size:
     66&xorg-size;</para></listitem>
     67<listitem><para>Estimated disk space required:
     68&xorg-buildsize;</para></listitem>
     69<listitem><para>Estimated build time:
     70&xorg-time;</para></listitem></itemizedlist>
    6671</sect3>
    6772 
    … …  
    201206 
    202207/* System Related Information.  If you read and configure only one
    203  * section then it should be this one.  The Intel architecture defaults are
    204  * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
    205  * for the Power PC.  AMD64 is for the Opteron processor. Note that there have
    206  * been reports that the Ppc optimization line causes segmentation faults during
    207  * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
    208  
    209 /* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
    210 /* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
     208 * section then it should be this one.  The Intel architecture defaults
     209 * are set for a i686 and higher.  Axp is for the Alpha architecture
     210 * and Ppc is for the Power PC.  AMD64 is for the Opteron processor.
     211 * Note that there have been reports that the Ppc optimization line
     212 * causes segmentation faults during build.  If that happens, try
     213 * building without the DefaultGcc2PpcOpt line.  ***********/
     214 
     215/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce \
     216                              -fno-strict-aliasing -march=i686 */
     217/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce \
     218                              -fno-strict-aliasing */
    211219/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
    212220/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
    … …  
    219227
    220228/*
    221  * Which drivers to build.  When building a static server, each of these
    222  * will be included in it.  When building the loadable server each of these
    223  * modules will be built.
     229 * Which drivers to build.  When building a static server, each of
     230 * these will be included in it.  When building the loadable server
     231 * each of these modules will be built.
    224232 *
    225233#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
    … …  
    227235                                cirrus vmware tseng trident chips apm \
    228236                                GlideDriver fbdev i128 \
    229                                 ati AgpGartDrivers DevelDrivers ark cyrix \
    230                                 siliconmotion \
    231                                 vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
     237                                ati AgpGartDrivers DevelDrivers ark \
     238                                cyrix siliconmotion vesa vga \
     239                                XF86OSCardDrivers XF86ExtraCardDrivers
    232240*/
    233241
    … …  
    237245#define XInputDrivers           mouse keyboard acecad calcomp citron \
    238246                                digitaledge dmc dynapro elographics \
    239                                 microtouch mutouch penmount spaceorb summa \
    240                                 wacom void magictouch aiptek
     247                                microtouch mutouch penmount spaceorb \
     248                                summa wacom void magictouch aiptek
    241249 */
    242250
Note: See TracChangeset for help on using the changeset viewer.