cvs commit: BLFS/BOOK/x/xorg xorg.xml

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sat Apr 24 23:16:58 PDT 2004


bdubbs      04/04/25 00:16:58

  Modified:    BOOK     index.xml
               BOOK/introduction/welcome changelog.xml
               BOOK/x/xorg xorg.xml
  Log:
  Minor fixes to X.org
  
  Revision  Changes    Path
  1.441     +3 -3      BLFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/index.xml,v
  retrieving revision 1.440
  retrieving revision 1.441
  diff -u -r1.440 -r1.441
  --- index.xml	24 Apr 2004 18:38:52 -0000	1.440
  +++ index.xml	25 Apr 2004 06:16:57 -0000	1.441
  @@ -2,9 +2,9 @@
   <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
   			"/usr/share/docbook/docbookx.dtd" [
   
  -<!ENTITY version "CVS-20040424">
  -<!ENTITY releasedate "April 24th, 2004">
  -<!ENTITY pubdate "2004-04-24">
  +<!ENTITY version "CVS-20040425">
  +<!ENTITY releasedate "April 25th, 2004">
  +<!ENTITY pubdate "2004-04-25">
   <!ENTITY blfs-version "cvs">
   
   <!ENTITY % book SYSTEM "book/book.ent">
  
  
  
  1.1089    +2 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.1088
  retrieving revision 1.1089
  diff -u -r1.1088 -r1.1089
  --- changelog.xml	24 Apr 2004 22:28:31 -0000	1.1088
  +++ changelog.xml	25 Apr 2004 06:16:58 -0000	1.1089
  @@ -11,6 +11,8 @@
   
   <itemizedlist>
   
  +<listitem><para>April 25th, 2004 [bdubbs]: Fixes to X.org</para></listitem>
  +
   <listitem><para>April 24th, 2003 [igor]: Updated to FreeType-2.1.8,
   ATK-1.6.1, ORBit2-2.10.1, GConf-2.6.1, GNOME Virtual File
   System-2.6.1.1, libgnome-2.6.1.1, libgnomecanvas-2.6.1.1, GNOME
  
  
  
  1.3       +11 -12    BLFS/BOOK/x/xorg/xorg.xml
  
  Index: xorg.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/xorg/xorg.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xorg.xml	23 Apr 2004 07:36:51 -0000	1.2
  +++ xorg.xml	25 Apr 2004 06:16:58 -0000	1.3
  @@ -52,7 +52,7 @@
   <para><xref linkend="libpng"/>, <xref linkend="expat"/>, <xref linkend="freetype2"/> 
   and <xref linkend="fontconfig"/>.</para>
   </sect4>
  - 
  +
   </sect3>
    
    
  @@ -69,7 +69,7 @@
   <listitem><para><filename>X11R6.7.0-src7.tar.gz</filename></para></listitem>
   </itemizedlist>
   
  -<para>The first package contains the <application>Xorg</application> libraries amd 
  +<para>The first package contains the <application>Xorg</application> libraries and 
   support programs,  the second contains standard X programs, the third contains the 
   X server, the fourth and fifth are fonts, the sixth is normal documentation, and the seventh
   is hardcopy documentation.</para> 
  @@ -121,12 +121,11 @@
    
   <para>If you made any changes to the kernel configuration, recompile the kernel.</para>
    
  -<para>Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
  -<filename>/usr/src/linux/System.map</filename> to
  -<filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
  -appropriately and run <filename>lilo</filename>. If you use
  -<filename>grub</filename>, edit <filename>/boot/grub/grub.conf</filename>
  -and add the new kernel to the boot menu.
  +<para>Copy the <filename>arch/i386/boot/bzImage</filename> and <filename>System.map</filename> 
  +from the kernel build directory to <filename class='directory'>/boot</filename>.
  +Edit <filename>/boot/grub/grub.conf</filename> and add the new kernel to the
  +boot menu.
  +(If you use lilo, edit <filename>/etc/lilo.conf</filename> and run <filename>lilo</filename>.)
   </para>
    
   <note><para>If you build <application>Xorg</application> in a chroot environment, 
  @@ -243,7 +242,7 @@
   above, you now need to update the kernel modules to ensure they are compatible with the
   current version of <application>Xorg</application>.  To do this, perform the following:</para>
    
  -<screen><userinput><command>cd programs/Xserver/hw/xorg/os-support/linux/drm/kernel &&
  +<screen><userinput><command>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &&
   make  CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux  &&
   mkdir -p /lib/modules/`uname -r`/kernel/drivers/char/drm/  &&
   cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o \
  @@ -337,10 +336,10 @@
   <screen><userinput><command>cd ~
   Xorg -configure</command></userinput></screen>
   The screen will go black and you may hear some clicking of the monitor.  This
  -command will create a file, <filename>xorg.new</filename> in your home
  +command will create a file, <filename>xorg.conf.new</filename> in your home
   directory.</para>
    
  -<para>Edit <filename>xorg.new</filename> to suit your system.  The
  +<para>Edit <filename>xorg.conf.new</filename> to suit your system.  The
   details of the file are located in the man
   page <command>man xorg.conf</command>.  Some things you may want to
   do are:</para>
  @@ -381,7 +380,7 @@
   wrong.</para>
    
   <para>Move the configuration file to its final location</para>
  -<screen><userinput><command>mv ~/xorg.new /etc/X11/xorg.conf</command></userinput></screen>
  +<screen><userinput><command>mv ~/xorg.conf.new /etc/X11/xorg.conf</command></userinput></screen>
    
   <para>Create <filename>.xinitrc</filename>
   <screen><userinput><command>cat > ~/.xinitrc << "EOF"</command>
  
  
  



More information about the blfs-book mailing list