release-notes rpm-info.xml,NONE,1.1
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923
Added Files:
rpm-info.xml
Log Message:
Built tonight in a hurry; this needs to have translations added for the desc elements, plus a real colophon built from the wiki
--- NEW FILE rpm-info.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE rpm-info SYSTEM "../docs-common/packaging/rpm-info.dtd">
<rpm-info>
<colophon>
<worker id="quaid" wholename="Karsten Wade" email="kwade(a)redhat.com"
surname="Wade" firstname="Karsten" initials="quaid"/>
</colophon>
<license>
<rights>GNU FDL</rights>
<version>1.0</version>
</license>
<copyright>
<year>2006</year>
<holder>Red Hat, Inc.</holder>
</copyright>
<titles>
<translation lang="en">
<title>Fedora Core 5 test2 Release Notes</title>
<desc>Important information about this release of Fedora Core</desc>
</translation>
<!--PLEASE ADD A TRANSLATION FOR EACH ADDITIONAL LANGUAGE.-->
<translation lang="zh_CN">
<title>Fedora Core 5 test2 ������������</title>
<desc></desc>
</translation>
<translation lang="it">
<title>Note di rilascio per Fedora Core 5 test2</title>
<desc></desc>
</translation>
<translation lang="ru">
<title>Fedora Core 5 test2 ������������������ �� ��������������</title>
<desc></desc>
</translation>
<translation lang="ja_JP">
<title>Fedora core 5 test2 ���������������������������������</title>
<desc></desc>
</translation>
</titles>
<changelog/>
</rpm-info>
18 years, 3 months
docs-common/bin move-if-change,1.1,1.2
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22901/bin
Modified Files:
move-if-change
Log Message:
Automatically create a backup, similar to "mv -b", if we replace
a file.
Index: move-if-change
===================================================================
RCS file: /cvs/docs/docs-common/bin/move-if-change,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- move-if-change 17 Jan 2006 02:02:13 -0000 1.1
+++ move-if-change 17 Jan 2006 02:12:00 -0000 1.2
@@ -16,6 +16,9 @@
# along with this program; if not, write to the Free Software
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Modified by <Tommy.Reynolds(a)MegaCoder.com>, for the Fedora Documentation
+# Project, to automatically create a backup of any file we touch.
+
if
test -r $2
then
@@ -25,8 +28,8 @@
echo $2 is unchanged
rm -f $1
else
-mv -f $1 $2
+mv -f -b $1 $2
fi
else
-mv -f $1 $2
+mv -f -b $1 $2
fi
18 years, 3 months
docs-common/bin move-if-change,NONE,1.1
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22813
Added Files:
move-if-change
Log Message:
Conditionally move source file to target if, and only if, their
content differs. This can help avoid unnecessary rebuilds when
working with derived files.
--- NEW FILE move-if-change ---
#!/bin/sh
# Copyright (C) 1996 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
if
test -r $2
then
if
cmp $1 $2 > /dev/null
then
echo $2 is unchanged
rm -f $1
else
mv -f $1 $2
fi
else
mv -f $1 $2
fi
18 years, 3 months
install-guide fedora-install-guide-intro-en.xml,1.24.2.6,1.24.2.7
by fedora-docs-commits@redhat.com
Author: sonarguy
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20803
Modified Files:
Tag: FC5_SAG
fedora-install-guide-intro-en.xml
Log Message:
Updated Section 8 Getting the Installation Media with the preliminary text
Index: fedora-install-guide-intro-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v
retrieving revision 1.24.2.6
retrieving revision 1.24.2.7
diff -u -r1.24.2.6 -r1.24.2.7
--- fedora-install-guide-intro-en.xml 16 Jan 2006 20:33:03 -0000 1.24.2.6
+++ fedora-install-guide-intro-en.xml 17 Jan 2006 01:12:33 -0000 1.24.2.7
@@ -344,7 +344,7 @@
You are downloading an entire operating system, and in most cases,
you are then going to install the operating system on your computer.
If you are connected to the Internet via a slow connection, like a
- modem, then downloading Fedora Core will be an extremely
+ modem, then downloading &FC; will be an extremely
time-consuming process. The time it takes to download the installation
files for &FC; depends greatly upon your connection speed to the Internet.
For example, if you are downloading the installation disk images (called ISOs),
@@ -613,7 +613,7 @@
<para>
<emphasis>CD Installation Media: </emphasis>Below is a list of the images
required for CD installation method based on architecture. The images are
- available at <ulink url="http://fedora.redhat.com/download">fedora.redhat.com</ulink>.
+ available at <ulink url="http://fedora.redhat.com/download">http://fedora.redhat.com/download/</ulink>.
Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
Once you have downloaded the images specific to your architecture proceed to
<xref linkend="sn-prep-cd-installation-media" />.
@@ -655,7 +655,7 @@
<para>
<emphasis>DVD Installation Media: </emphasis>Below is a list of the images
required for the DVD installation method based on architecture. The images are
- available at <ulink url="http://fedora.redhat.com/download/mirrors.html">Fedora Mirrors</ulink>.
+ available at <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
Once you have downloaded the images specific to your architecture proceed to
<xref linkend="sn-prep-dvd-installation-media" />.
@@ -689,37 +689,209 @@
<listitem>
<para>
- <emphasis>USB Installation Media:</emphasis>
+ <emphasis>USB Installation Media: </emphasis>Below is a list of the images
+ required for the USB installation method based on architecture. The images are
+ available at <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
+ Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
+ Once you have downloaded the images specific to your architecture proceed to
+ <xref linkend="sn-prep-usb-installation-media" />.
</para>
- </listitem>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>i386 Media - </emphasis>The following images will needed to complete
+ a USB installation: FC5-i386-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-i386.torrent.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>x86_64 Media - </emphasis>The following images will needed to complete
+ a USB installation: FC5-x86_64-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-x86_64.torrent.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>ppc Media- </emphasis>The following images will needed to complete
+ a USB installation: FC5-ppc-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-ppc.torrent.
+ </para>
+ </listitem>
+ </orderedlist>
+ </listitem>
<listitem>
<para>
- <emphasis>Hard Drive Installation Media:</emphasis>
+ <emphasis>Hard Drive Installation Media: </emphasis>Below is a list of the images
+ required for the Hard Drive installation method based on architecture. The images are
+ available at <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
+ Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
+ Once you have downloaded the images specific to your architecture proceed to
+ <xref linkend="sn-prep-hard-drive-installation-media" />.
</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>i386 Media - </emphasis>The following images will needed to complete
+ a Hard Drive installation: FC5-i386-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-i386.torrent.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>x86_64 Media - </emphasis>The following images will needed to complete
+ a Hard Drive installation: FC5-x86_64-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-x86_64.torrent.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>ppc Media- </emphasis>The following images will needed to complete
+ a Hard Drive installation: FC5-ppc-DVD.iso and SHA1SUM, of if you are utilizing
+ bittorrent the image would be FC5-binary-ppc.torrent.
+ </para>
+ </listitem>
+ </orderedlist>
+
</listitem>
- </orderedlist>
- </listitem>
+ </orderedlist>
+ </listitem>
<listitem>
<para>Network Installation Media</para>
<orderedlist>
<listitem>
<para>
- <emphasis>HTTP Installation Media:</emphasis>
+ <emphasis>HTTP Installation Media: </emphasis>Below is a list of the images
+ required for the HTTP installation method based on architecture. The images are
+ available at <ulink url="http://fedora.redhat.com/download/">http://fedora.redhat.com/download/</ulink>
+ or <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
+ Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
+ Once you have downloaded the images specific to your architecture proceed to
+ <xref linkend="sn-prep-http-installation-media" />.
</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>i386 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/i386/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>x86_64 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/x86_64/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>ppc Media- </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/ppc/os/images/
+ </para>
+ </listitem>
+ </orderedlist>
</listitem>
<listitem>
<para>
- <emphasis>FTP Installation Media:</emphasis>
+ <emphasis>FTP Installation Media: </emphasis>Below is a list of the images
+ required for the FTP installation method based on architecture. The images are
+ available at <ulink url="http://fedora.redhat.com/download/">http://fedora.redhat.com/download/</ulink>
+ or <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
+ Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
+ Once you have downloaded the images specific to your architecture proceed to
+ <xref linkend="sn-prep-ftp-installation-media" />.
</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>i386 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/i386/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>x86_64 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/x86_64/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>ppc Media- </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/ppc/os/images/
+ </para>
+ </listitem>
+ </orderedlist>
</listitem>
<listitem>
<para>
- <emphasis>NFS Installation Media:</emphasis>
+ <emphasis>NFS Installation Media: </emphasis>Below is a list of the images
+ required for the NFS installation method based on architecture. The images are
+ available at <ulink url="http://fedora.redhat.com/download/">http://fedora.redhat.com/download/</ulink>
+ or <ulink url="http://fedora.redhat.com/download/mirrors.html">http://fedora.redhat.com/download/mirrors.html</ulink>.
+ Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
+ Once you have downloaded the images specific to your architecture proceed to
+ <xref linkend="sn-prep-nfs-installation-media" />.
</para>
+ <orderedlist>
+ <listitem>
+ <para>
+ <emphasis>i386 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/i386/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>x86_64 Media - </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/x86_64/os/images/
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>ppc Media- </emphasis>Depending on the method with which you boot for
+ your installation you will either need the boot.iso for booting from a CD, or you
+ will need the diskboot.img if you plan on booting from a USB device. Both
+ images are located in the following location at both the Fedora Servers or
+ the Mirror Servers: /pub/fedora/linux/core/5/ppc/os/images/
+ </para>
+ </listitem>
+ </orderedlist>
</listitem>
</orderedlist>
</listitem>
@@ -730,7 +902,19 @@
<title>Purchased Media</title>
<para>
- Insert text about Purchased Media.
+ Just because we are discussing purchased media, does not mean one needs to purchase
+ the media. It is just a reference that covers purchase or prepared media that you
+ the user does not need to download. The purchased media can come from numerous
+ sources, one option is your local Linux Users Group or LUG as they are known in
+ the community. A quick search on <ulink url="http://google.com">Google</ulink>
+ will usually reveal a multitude of groups. These groups typically are more than
+ willing to provide a set of &FC; disks at little or no cost. Another option
+ would be your local Book Store, several publishers produce books about the latest
+ release of &FC; that are very informative and typically includes installation
+ media as part of the purchase. These books are are well written and include loads
+ of information about the &FC; operating system. The ultimate choice of
+ which media you go is up to you the user and what you wish to do to get the Fedora
+ Core operating system.
</para>
</section>
</section>
@@ -799,7 +983,7 @@
</para>
</section>
- <section id="sn-prep-ftp-installation-meida">
+ <section id="sn-prep-ftp-installation-media">
<title>Preparing FTP Installation Media</title>
<para>
18 years, 3 months
docs-common/bin insert-changelog,1.4,1.5
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16670/docs-common/bin
Modified Files:
insert-changelog
Log Message:
clog target and XSL stylesheet should be able to figure out if this is the first package for a document revision
Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- insert-changelog 15 Jan 2006 23:26:25 -0000 1.4
+++ insert-changelog 16 Jan 2006 23:07:33 -0000 1.5
@@ -22,6 +22,7 @@
if test $ROLE = "rpm"; then
REVDATE=`date +"%a %b %d %Y"`
ZEROREV=0
+ NUMBER=1
REVDESC="an integer release number"
elif test $ROLE = "doc"; then
REVDATE=`date +"%Y-%M-%d"`
18 years, 3 months
docs-common/packaging doc-version.xsl,1.3,1.4
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16670/docs-common/packaging
Modified Files:
doc-version.xsl
Log Message:
clog target and XSL stylesheet should be able to figure out if this is the first package for a document revision
Index: doc-version.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/doc-version.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- doc-version.xsl 15 Jan 2006 17:43:20 -0000 1.3
+++ doc-version.xsl 16 Jan 2006 23:07:06 -0000 1.4
@@ -11,6 +11,22 @@
<xsl:param name="role" select="'doc'"/>
<xsl:template match="/">
- <xsl:value-of select="/rpm-info/changelog/revision[@role=$role][1]/@number"/>
+ <xsl:choose>
+ <xsl:when test="$role='rpm'">
+ <xsl:choose>
+ <xsl:when test="/rpm-info/changelog/revision[1]/@role='doc'">
+ <xsl:text>0</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
+ select="/rpm-info/changelog/revision[@role=$role][1]/@number"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
+ select="/rpm-info/changelog/revision[@role=$role][1]/@number"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
</xsl:stylesheet>
18 years, 3 months
release-notes Makefile,1.15,1.16
by fedora-docs-commits@redhat.com
Author: andrmart
Update of /cvs/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13797
Modified Files:
Makefile
Log Message:
add RU to build. Content is completed yet but suitable to test2
Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 13 Jan 2006 15:33:03 -0000 1.15
+++ Makefile 16 Jan 2006 22:01:39 -0000 1.16
@@ -10,7 +10,7 @@
#
# Document-specific definitions.
#
-LANGUAGES = en it ja_JP zh_CN #ja_JP ru
+LANGUAGES = en it ja_JP zh_CN ru #ja_JP
# uncomment languages when you have all the same
# fies localized as are listed in XMLEXTRAFILES
DOCBASE = RELEASE-NOTES
18 years, 3 months
install-guide rpm-info.xml, NONE, 1.1.2.1 fedora-install-guide-intro-en.xml, 1.24.2.5, 1.24.2.6
by fedora-docs-commits@redhat.com
Author: sonarguy
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8538
Modified Files:
Tag: FC5_SAG
fedora-install-guide-intro-en.xml
Added Files:
Tag: FC5_SAG
rpm-info.xml
Log Message:
Updated to include rpm-info.xml
--- NEW FILE rpm-info.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!DOCTYPE rpm-info SYSTEM "../docs-common/packaging/rpm-info.dtd">
<rpm-info>
<colophon>
<!--PLEASE ADD EMAIL ADDRESSES AND ENSURE-->
<!--"id" ATTRIBUTES MATCH "worker" ATTRIBUTES-->
<!--IN "changelog/author ELEMENTS.-->
<!--Only author|editor|othercredit processed.-->
<!--You may remove these comments after editing.-->
<worker surname="Ellis" firstname="Stuart" othername="" id="StuartEllis" email="" wholename="Stuart Ellis" initials="StuartEllis"/>
<worker surname="Frields" firstname="Paul" othername="W." id="PaulFrields" email="" wholename="Paul W. Frields" initials="PaulFrields"/>
</colophon>
<!--CHECK LICENSING BELOW-->
<license>
<rights>GNU FDL</rights>
<version>1.0</version>
</license>
<copyright>
<year>2005</year>
<holder>Red Hat, Inc.</holder>
<holder>Stuart Ellis</holder>
<holder>Paul W. Frields</holder>
</copyright>
<titles>
<translation lang="en">
<title>Fedora Core 5 Installation Guide - BETA</title>
<desc>
<!--PLEASE ADD BOOK/ARTICLE DESCRIPTION TO RPM-INFO-->
</desc>
</translation>
<!--PLEASE ADD A TRANSLATION FOR EACH ADDITIONAL LANGUAGE.-->
</titles>
<changelog>
<revision date="2006-01-04" number="1.1.1">
<author worker="ScottGlaser"/>
<details lang="en">Edited Install Guide per RFE 173735 to include new flow.</details>
</revision>
<revision date="2005-12-22" number="1.1">
<author worker="StuartEllis"/>
<details lang="en">Amended Management Options section.</details>
</revision>
<revision date="2005-12-22" number="1.0.9">
<author worker="StuartEllis"/>
<details lang="en">Updated Management Options section.</details>
</revision>
<revision date="2005-12-14" number="1.0.8">
<author worker="StuartEllis"/>
<details lang="en">Added Technical References section.</details>
</revision>
<revision date="2005-12-12" number="1.0.7">
<author worker="StuartEllis"/>
<details lang="en">Added Management Options section.</details>
</revision>
<revision date="2005-12-10" number="1.0.6">
<author worker="StuartEllis"/>
<details lang="en">Updated sections on installation methods.</details>
</revision>
<revision date="2005-12-08" number="1.0.5">
<author worker="StuartEllis"/>
<details lang="en">Updated partitioning section.</details>
</revision>
<revision date="2005-12-06" number="1.0.4">
<author worker="StuartEllis"/>
<details lang="en">Added material on updating the new installation.</details>
</revision>
<revision date="2005-12-04" number="1.0.3">
<author worker="StuartEllis"/>
<details lang="en">Reorganized to match anaconda screens.</details>
</revision>
<revision date="2005-11-25" number="1.0.2">
<author worker="PaulWFrields"/>
<details lang="en">Additional reorganization for clarity; information on /home partition</details>
</revision>
<revision date="2005-11-20" number="1.0.1rc1">
<author worker="PaulWFrields"/>
<details lang="en">Reorganization of introductory material</details>
</revision>
<revision date="2005-06-10" number="1.0">
<author worker="KarstenWade"/>
<details lang="en">Release version</details>
</revision>
<revision date="2005-06-08" number="1.0rc1">
<author worker="KarstenWade"/>
<details lang="en">Publication edit and declaration of release candidate</details>
</revision>
<revision date="2005-05-15" number="0.7">
<author worker="StuartEllis"/>
<details lang="en">Additional style editing and indexing</details>
</revision>
<revision date="2005-05-10" number="0.6.3">
<author worker="PaulWFrields"/>
<details lang="en">Style editing, removed "nextsteps" from build</details>
</revision>
<revision date="2005-04-30" number="0.6.2">
<author worker="StuartEllis"/>
<details lang="en">First commission to CVS, plus very minor parent file edits</details>
</revision>
</changelog>
</rpm-info>
Index: fedora-install-guide-intro-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-intro-en.xml,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -r1.24.2.5 -r1.24.2.6
--- fedora-install-guide-intro-en.xml 15 Jan 2006 13:47:26 -0000 1.24.2.5
+++ fedora-install-guide-intro-en.xml 16 Jan 2006 20:33:03 -0000 1.24.2.6
@@ -655,7 +655,7 @@
<para>
<emphasis>DVD Installation Media: </emphasis>Below is a list of the images
required for the DVD installation method based on architecture. The images are
- available at <ulink url="http://fedora.redhat.com/download">fedora.redhat.com</ulink>.
+ available at <ulink url="http://fedora.redhat.com/download/mirrors.html">Fedora Mirrors</ulink>.
Alternatively, you can <ulink url="http://torrent.fedoraproject.org/">Join the Torrent</ulink>.
Once you have downloaded the images specific to your architecture proceed to
<xref linkend="sn-prep-dvd-installation-media" />.
18 years, 3 months
docs-common Makefile.common,1.30,1.31
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8295/docs-common
Modified Files:
Makefile.common
Log Message:
Use new fdpsh, 'cause it's kewl
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.common 15 Jan 2006 23:25:37 -0000 1.30
+++ Makefile.common 16 Jan 2006 20:05:43 -0000 1.31
@@ -214,8 +214,7 @@
# Make a new changelog entry for an existing rpm-info.xml file.
clog:: $(RPMINFO)
- @XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
- ${FDPBIN}/insert-changelog $(RPMINFO).clog
+ @${FDPBIN}/fdpsh -c insert-changelog $(RPMINFO).clog
mv -b $(RPMINFO).clog $(RPMINFO)
#
@@ -223,8 +222,7 @@
# Make a new colophon entry for an existing rpm-info.xml file.
colophon:: $(RPMINFO)
- @XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
- ${FDPBIN}/insert-colophon $(RPMINFO).worker
+ @${FDPBIN}/fdpsh -c insert-colophon $(RPMINFO).worker
mv -b $(RPMINFO).worker $(RPMINFO)
#
18 years, 3 months
docs-common/packaging bookinfo.xsl,1.12,1.13
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31267/docs-common/packaging
Modified Files:
bookinfo.xsl
Log Message:
Allow proper choice of OPL for license... probably need additional checks
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bookinfo.xsl 14 Jan 2006 23:16:42 -0000 1.12
+++ bookinfo.xsl 16 Jan 2006 16:05:13 -0000 1.13
@@ -41,7 +41,6 @@
select="@worker"/></xsl:call-template>
</othercredit>
</xsl:for-each>
- <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
<xsl:element name="revhistory">
<xsl:for-each select="/rpm-info/changelog/revision[@role != 'rpm']">
<xsl:element name="revision">
@@ -64,7 +63,14 @@
</xsl:element>
</xsl:for-each>
</xsl:element>
- <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
+ <xsl:choose>
+ <xsl:when test="/rpm-info/license/rights='OPL'">
+ <xsl:text disable-output-escaping="yes">&LEGALNOTICE-OPL;</xsl:text>
+ </xsl:when>
+ <xsl:otherwise> <!-- assume FDL for now -->
+ <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:element>
</xsl:template>
18 years, 3 months