diff --git a/book/bookinfo.xml b/book/bookinfo.xml index 09a16855cb..7d99144f4b 100644 --- a/book/bookinfo.xml +++ b/book/bookinfo.xml @@ -43,20 +43,14 @@ Linus Torvalds. - &version; - &pubdate; - Development Release - - - - &version; - 2005-03-17 - Fourth release (Candidate 1) + 6.0 + 2005-04-02 + Fourth release 5.1 - 2004-6-05 + 2004-06-05 Third release diff --git a/general.ent b/general.ent index 3f32aaadb3..d7897b1ba8 100644 --- a/general.ent +++ b/general.ent @@ -1,10 +1,10 @@ - + - + @@ -12,16 +12,16 @@ - + - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index e450d74f02..93a9c5c0b7 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -22,11 +22,27 @@ who wrote what. +April 2nd, 2005 [bdubbs]: 6.0 Release. + +April 2nd, 2005 [bdubbs]: Updated emacs to 21.4a. + +April 2nd, 2005 [bdubbs]: Updated iptables to add +bootscript installation. + +April 2nd, 2005 [bdubbs]: Updated 6.0 branch with +vim security patch from SVN (randy). + April 2nd, 2005 [randy]: Added which as a required dependency of DocBook-utils, reported by Andrew Benton. +March 17th, 2005 [randy]: Changed cracklib from a required +dependency to recommended in the Linux-Pam instructions; updated to Zip-2.31 +and CUPS-1.1.23; added the creation of an 'lp' user to the CUPS +instructions. +======= April 1st, 2005 [randy]: Updated to DocBook XML DTD-4.4 and DocBook XSL Stylesheets-1.68.1. +>>>>>>> .r3640 March 31st, 2005 [bdubbs]: Updated the install instructions for xinetd to use /etc/xinetd.d/ directory structure. Patch by John Gnew. diff --git a/postlfs/editors/emacs.xml b/postlfs/editors/emacs.xml index 79730e2a33..5b4de870aa 100644 --- a/postlfs/editors/emacs.xml +++ b/postlfs/editors/emacs.xml @@ -6,7 +6,7 @@ - + @@ -14,13 +14,16 @@ -$LastChangedBy$ -$Date$ + $LastChangedBy$ + $Date$ + Emacs-&emacs-version; -Emacs + + + Emacs + Introduction to <application>Emacs</application> @@ -30,25 +33,26 @@ customizable, self-documenting real-time display editor. Package information -Download (HTTP): -Download (FTP): -Download MD5 sum: &emacs-md5sum; -Download size: &emacs-size; -Estimated disk space required: -&emacs-buildsize; -Estimated build time: -&emacs-time; + Download (HTTP): + Download (FTP): + Download MD5 sum: &emacs-md5sum; + Download size: &emacs-size; + Estimated disk space required: &emacs-buildsize; + Estimated build time: &emacs-time; + -<application>Emacs</application> dependencies -Optional + +<application>Emacs</application> dependencies + + +Optional + X ( or ), -, -, - and - or + , + , + and + or @@ -60,8 +64,7 @@ url="&emacs-download-ftp;"/> Install Emacs by running the following commands: -./configure --prefix=/usr \ - --libexecdir=/usr/sbin && +./configure --prefix=/usr --libexecdir=/usr/sbin && make bootstrap Now, as the root user: