release-notes/FC4 Makefile,1.15,1.16 RELEASE-NOTES-en.xml,1.9,1.10
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/release-notes/FC4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3323
Modified Files:
Makefile RELEASE-NOTES-en.xml
Log Message:
Fixed entities and Makefile definitions to use docs-common folder
Index: Makefile
===================================================================
RCS file: /cvs/docs/release-notes/FC4/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile 7 Jun 2005 19:48:30 -0000 1.15
+++ Makefile 17 Jun 2005 14:38:34 -0000 1.16
@@ -1,5 +1,5 @@
LANG = en
-DOCS_SETUP_PATH= ../..
+DOCS_SETUP_PATH= ../../docs-common
XSLPDF = $(DOCS_SETUP_PATH)/xsl/main-pdf.xsl
XSLHTML = $(DOCS_SETUP_PATH)/xsl/main-html-nochunks-relnotes.xsl
@@ -68,7 +68,7 @@
distclean clobber: clean
${RM} ChangeLog-${LANG}.html ChangeLog.txt
- ${RM} -r README-${LANG}.pdf README-${LANG}.html README-${LANG}
+ ${RM} -r README-${LANG}.pdf README-${LANG}.html README-${LANG}.txt
${RM} -r RELEASE-NOTES-${LANG}.pdf RELEASE-NOTES-${LANG}.html \
RELEASE-NOTES-${LANG} RELEASE-NOTES-${LANG}.txt
Index: RELEASE-NOTES-en.xml
===================================================================
RCS file: /cvs/docs/release-notes/FC4/RELEASE-NOTES-en.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RELEASE-NOTES-en.xml 7 Jun 2005 19:48:30 -0000 1.9
+++ RELEASE-NOTES-en.xml 17 Jun 2005 14:38:34 -0000 1.10
@@ -31,9 +31,9 @@
<!-- *************** COMMON FDP entities *************** -->
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../../common/fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY LEGALNOTICE SYSTEM "../../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml">
<!-- *************** Local entities *************** -->
18 years, 11 months
yum-software-management Makefile, 1.1.1.1, 1.2 yum-software-management-en.xml, 1.3, 1.4
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16841
Modified Files:
Makefile yum-software-management-en.xml
Log Message:
- Updated to use docs-common/
- Split Search section into two for clarity
- Moved admonition on valid package id/names to Searching by Package Name section
- Minor edits and fixes
Index: Makefile
===================================================================
RCS file: /cvs/docs/yum-software-management/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 1 Jun 2005 21:31:25 -0000 1.1.1.1
+++ Makefile 14 Jun 2005 22:45:38 -0000 1.2
@@ -7,8 +7,8 @@
# Copyright 2003 Tammy Fox, Red Hat, Inc.
###############################################################################
-XSLPDF = ../xsl/main-pdf.xsl
-XSLHTML = ../xsl/main-html.xsl
+XSLPDF = ../docs-common/xsl/main-pdf.xsl
+XSLHTML = ../docs-common/xsl/main-html.xsl
LANG = en
DOCNAME = yum-software-management-$(LANG)
XMLFILE = $(DOCNAME).xml
@@ -17,8 +17,8 @@
html:
@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
@mkdir -p $(DOCNAME)/stylesheet-images
- @cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
- @cp ../css/fedora.css $(DOCNAME)
+ @cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+ @cp ../docs-common/css/fedora.css $(DOCNAME)
pdf:
Index: yum-software-management-en.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/yum-software-management-en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- yum-software-management-en.xml 12 Jun 2005 21:18:18 -0000 1.3
+++ yum-software-management-en.xml 14 Jun 2005 22:45:38 -0000 1.4
@@ -1,17 +1,17 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY BOOKID "yum-software-management-0.4.3 (2005-06-12)"> <!-- change version of manual and date here -->
+<!ENTITY BOOKID "yum-software-management-0.4.4 (2005-06-14)"> <!-- change version of manual and date here -->
-<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
<!-- Bugzilla bug number for the draft notice -->
<!ENTITY BUG-NUM "155190">
<!ENTITY FCLOCALVER "3">
-<!ENTITY DRAFTNOTICE SYSTEM "../common/draftnotice-en.xml">
+<!ENTITY DRAFTNOTICE SYSTEM "../docs-common/common/draftnotice-en.xml">
]>
@@ -250,40 +250,46 @@
</indexterm>
<para>
Each package file has a long name that indicates several key pieces of
- information. The <command>yum</command> utility may use just the name
- of the package itself, but you may also use other attributes in the file
- name to make queries more specific.
- </para>
- <para>
- For example, this is the full name of a package supplied with &FC;:
+ information. For example, this is the full name of a package supplied with &FC;:
</para>
<screen>
<filename>tsclient-0.132-4.i386.rpm</filename>
</screen>
<para>
- You should use the short name <filename>tsclient</filename> in most
- cases. To specify the exact version of the application, use
- <filename>tsclient-0.132</filename>. Add the hardware architecture to
- the short name and use <filename>tsclient.i386</filename> to specify
- packages for your type of computer. The package listings provided by
- <command>yum</command> itself use the format
- <filename>name.architecture</filename>.
+ Use just the name of the package itself with <command>yum</command>, except when it is
+ necessary to specify the exact version or type. To specify the exact
+ version of the application, use <filename>name-version</filename>.
+ The package listings provided by <command>yum</command> itself use the format
+ <filename>name.architecture</filename>, to specify the type of computer
+ that the package is intended for.
</para>
- <tip>
- <title>Specifying Packages</title>
- <para>
- You may use any of the following formats for
- specifying a package in a <command>yum</command> query: <filename>name</filename>,
- <filename>name.architecture</filename>, <filename>name-version</filename>, <filename>name-version-release</filename>,
- <filename>name-version-release.architecture</filename>, and <filename>epoch:name-version-release.architecture</filename>.
- </para>
- </tip>
+ <para>
+ These are valid for the file shown above:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Package name: <filename>tsclient</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Package name with version number: <filename>tsclient-0.132</filename>
+ </para>
+ </listitem>
+ <listitem>
<para>
- The hardware architecture included in each package name is the
- minimum type of machine required for that specific package. Packages
- with <option>i386</option> run on any current Intel-compatible computer. Packages
- for PowerPC machines, such as Apple Macs, are indicated with <option>ppc</option>.
- Packages with <option>noarch</option> have no architecture requirement.
+ Package name with hardware architecture: <filename>tsclient.i386</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ The hardware architecture is the <emphasis>minimum</emphasis> type of
+ machine required for that specific package. Packages with
+ <option>i386</option> run on any current Intel-compatible computer.
+ Packages for PowerPC machines, such as Apple Macs, are indicated with
+ <option>ppc</option>. Packages with <option>noarch</option> have no
+ architecture requirement.
</para>
<para>
Some software can be optimized for particular types of Intel-compatible
@@ -292,9 +298,15 @@
and <option>x86_64</option>. A
computer with at least an Intel Pentium, VIA C3 or compatible chip is
an <option>i586</option>. Computers with an Intel Pentium II and above, or a current
- model of AMD chip, are <option>i686</option> machines. 64-bit PCs can
- use <option>x86_64</option> packages for full 64-bit support.
+ model of AMD chip, are <option>i686</option> machines. 64-bit PCs use <option>x86_64</option> packages for full 64-bit support.
</para>
+ <note>
+ <title>Other Naming Conventions are Supported</title>
+ <para>
+ Refer to <xref linkend="sn-searching-packages-byname"></xref> for
+ more information on specifying packages by name or type.
+ </para>
+ </note>
</section>
</section>
@@ -475,7 +487,7 @@
<section id="sn-searching-packages">
- <title>Searching for Software Packages with <command>yum</command></title>
+ <title>Searching for Software with <command>yum</command></title>
<indexterm>
<primary>packages, locating</primary>
</indexterm>
@@ -496,11 +508,14 @@
<filename>PalmPilot</filename> packages.
</para>
</note>
-<para>
+
+ <section id="sn-searching-packages-byname">
+ <title>Searching by Package Name and Attributes</title>
+ <para>
To search for a specific package by name, use the <option>list</option>
function. For example, to search for the package
<filename>tsclient</filename> the command would be:
- </para>
+ </para>
<screen>
<userinput>yum list <replaceable>tsclient</replaceable></userinput>
</screen>
@@ -511,13 +526,22 @@
<screen>
<userinput>yum list <replaceable>tsclient-0.132</replaceable></userinput>
</screen>
- <note>
+ <tip>
<title>Package Attributes</title>
<para>
- See <xref linkend="sn-package-names"></xref> for information on
- package attributes.
+ You may use any of the following formats for
+ specifying a package in a <command>yum</command> query: <filename>name</filename>,
+ <filename>name.architecture</filename>, <filename>name-version</filename>, <filename>name-version-release</filename>,
+ <filename>name-version-release.architecture</filename>, and
+ <filename>epoch:name-version-release.architecture</filename>.
</para>
- </note>
+ </tip>
+ </section>
+
+
+ <section id="sn-searching-packages-advanced">
+ <title>Advanced Searches</title>
+
<para>
If you do not know the name of the package, use either the
<option>search</option> or <option>provides</option> options.
@@ -559,6 +583,7 @@
</para>
</tip>
+ </section>
<section id="sn-package-matches">
<title>Understanding Matches</title>
18 years, 11 months
install-guide Makefile, 1.7, 1.8 fedora-install-guide-en.xml, 1.18, 1.19
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16816
Modified Files:
Makefile fedora-install-guide-en.xml
Log Message:
Updated to use docs-common/
Index: Makefile
===================================================================
RCS file: /cvs/docs/install-guide/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 1 May 2005 19:10:15 -0000 1.7
+++ Makefile 14 Jun 2005 22:36:46 -0000 1.8
@@ -7,8 +7,8 @@
# Copyright 2003 Tammy Fox, Red Hat, Inc.
###############################################################################
-XSLPDF = ../xsl/main-pdf.xsl
-XSLHTML = ../xsl/main-html.xsl
+XSLPDF = ../docs-common/xsl/main-pdf.xsl
+XSLHTML = ../docs-common/xsl/main-html.xsl
LANG = en
DOCNAME = fedora-install-guide-$(LANG)
XMLFILE = $(DOCNAME).xml
@@ -17,10 +17,10 @@
html:
@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
@mkdir -p $(DOCNAME)/stylesheet-images
- @cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+ @cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
@mkdir -p $(DOCNAME)/figs
@cp figs/*.png figs/*.eps $(DOCNAME)/figs
- @cp ../css/fedora.css $(DOCNAME)
+ @cp ../docs-common/css/fedora.css $(DOCNAME)
pdf:
Index: fedora-install-guide-en.xml
===================================================================
RCS file: /cvs/docs/install-guide/fedora-install-guide-en.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fedora-install-guide-en.xml 10 Jun 2005 19:06:08 -0000 1.18
+++ fedora-install-guide-en.xml 14 Jun 2005 22:36:46 -0000 1.19
@@ -1,20 +1,20 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
<!ENTITY VERSION "1.0"> <!-- version for this document -->
<!ENTITY BOOKID "fedora-install-guide-en-&VERSION; (2005-06-10-T16:20-0700)"> <!-- change date here and VERSION entity everytime a change is made-->
-<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
<!-- Bugzilla bug number for the draft notice -->
<!ENTITY BUG-NUM "129911">
<!ENTITY FCLOCALVER "4">
<!ENTITY DOCLOCALVER "1.0">
-<!ENTITY DRAFTNOTICE SYSTEM "../common/draftnotice-en.xml">
+<!ENTITY DRAFTNOTICE SYSTEM "../docs-common/common/draftnotice-en.xml">
<!ENTITY INTRODUCTION SYSTEM "fedora-install-guide-intro-en.xml">
18 years, 11 months
desktop-up2date Makefile, 1.1.1.1, 1.2 desktop-up2date-en.xml, 1.3, 1.4
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/desktop-up2date
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16791
Modified Files:
Makefile desktop-up2date-en.xml
Log Message:
Updated to use docs-common/.
Index: Makefile
===================================================================
RCS file: /cvs/docs/desktop-up2date/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 5 Jun 2005 13:19:40 -0000 1.1.1.1
+++ Makefile 14 Jun 2005 22:30:42 -0000 1.2
@@ -7,8 +7,8 @@
# Copyright 2003 Tammy Fox, Red Hat, Inc.
###############################################################################
-XSLPDF = ../xsl/main-pdf.xsl
-XSLHTML = ../xsl/main-html.xsl
+XSLPDF = ../docs-common/xsl/main-pdf.xsl
+XSLHTML = ../docs-common/xsl/main-html.xsl
LANG = en
DOCNAME = desktop-up2date-$(LANG)
XMLFILE = $(DOCNAME).xml
@@ -17,8 +17,8 @@
html:
@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
@mkdir -p $(DOCNAME)/stylesheet-images
- @cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
- @cp ../css/fedora.css $(DOCNAME)
+ @cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+ @cp ../docs-common/css/fedora.css $(DOCNAME)
pdf:
Index: desktop-up2date-en.xml
===================================================================
RCS file: /cvs/docs/desktop-up2date/desktop-up2date-en.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- desktop-up2date-en.xml 12 Jun 2005 18:56:11 -0000 1.3
+++ desktop-up2date-en.xml 14 Jun 2005 22:30:42 -0000 1.4
@@ -1,17 +1,17 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.ent">
+<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
<!ENTITY BOOKID "desktop-up2date-0.3 (2005-06-05)"> <!-- change version of manual and date here -->
-<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
<!-- Bugzilla bug number for the draft notice -->
<!ENTITY BUG-NUM "155180">
<!ENTITY FCLOCALVER "3">
-<!ENTITY DRAFTNOTICE SYSTEM "../common/draftnotice-en.xml">
+<!ENTITY DRAFTNOTICE SYSTEM "../docs-common/common/draftnotice-en.xml">
]>
18 years, 11 months
example-tutorial example-tutorial-en.xml,1.12,1.13
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14112
Modified Files:
example-tutorial-en.xml
Log Message:
Changed relative paths for the "docs-common" components.
Reference the ".ent" include file.
Index: example-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- example-tutorial-en.xml 17 May 2005 15:51:17 -0000 1.12
+++ example-tutorial-en.xml 14 Jun 2005 20:53:21 -0000 1.13
@@ -2,12 +2,12 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.xml">
+ <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
<!ENTITY BOOKID "example-tutorial-0.12 (2003-08-20)"> <!-- change version of manual and date here -->
-<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
+<!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml">
]>
18 years, 11 months
example-tutorial Makefile,1.6,1.7
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13999
Modified Files:
Makefile
Log Message:
Change relative paths to "docs-common" component directories.
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 24 Feb 2004 19:14:37 -0000 1.6
+++ Makefile 14 Jun 2005 20:40:36 -0000 1.7
@@ -7,8 +7,8 @@
# Copyright 2003 Tammy Fox, Red Hat, Inc.
###############################################################################
-XSLPDF = ../xsl/main-pdf.xsl
-XSLHTML = ../xsl/main-html.xsl
+XSLPDF = ../docs-common/xsl/main-pdf.xsl
+XSLHTML = ../docs-common/xsl/main-html.xsl
LANG = en
DOCNAME = example-tutorial-$(LANG)
XMLFILE = $(DOCNAME).xml
@@ -17,7 +17,7 @@
html:
@xmlto html -x $(XSLHTML) -o $(DOCNAME) $(XMLFILE)
@mkdir -p $(DOCNAME)/stylesheet-images
- @cp ../stylesheet-images/*.png $(DOCNAME)/stylesheet-images
+ @cp ../docs-common/stylesheet-images/*.png $(DOCNAME)/stylesheet-images
@cp ../css/fedora.css $(DOCNAME)
18 years, 11 months
docs-common README,NONE,1.1
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13670
Added Files:
README
Log Message:
Information about this directory of boilerplate.
--- NEW FILE README ---
Behold in this directory all the overhead files needed for any FDP document.
You need all the stuff in here.
Cheers
18 years, 11 months
docs-common - New directory
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13643/docs-common
Log Message:
Directory /cvs/docs/docs-common added to the repository
18 years, 11 months
yum-software-management yum-software-management-en.xml,1.2,1.3
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13692
Modified Files:
yum-software-management-en.xml
Log Message:
- Split section on .repo files between "Using Software Repositories" (for installing them) and "Managing Software Repositories" (for creating and editing them)
Index: yum-software-management-en.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/yum-software-management-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-software-management-en.xml 12 Jun 2005 10:48:11 -0000 1.2
+++ yum-software-management-en.xml 12 Jun 2005 21:18:18 -0000 1.3
@@ -4,7 +4,7 @@
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY BOOKID "yum-software-management-0.4.2 (2005-06-12)"> <!-- change version of manual and date here -->
+<!ENTITY BOOKID "yum-software-management-0.4.3 (2005-06-12)"> <!-- change version of manual and date here -->
<!ENTITY LEGALNOTICE SYSTEM "../common/legalnotice-en.xml">
@@ -589,7 +589,7 @@
<primary>yum, package management</primary>
</indexterm>
<para>
- <command>Yum</command> has three basic management functions:
+ The <command>yum</command> utility has three basic management functions:
</para>
<para>
<itemizedlist>
@@ -679,7 +679,7 @@
<primary>packages, updating</primary>
</indexterm>
<para>
- Updating a software package is essentially the same as installing a new
+ Updating a software package follows the same process as installing a new
package. For example, to update the <filename>tsclient</filename>
package to the latest version, type:
</para>
@@ -720,8 +720,8 @@
</section>
- <section id="sn-finding-repositories">
- <title>Finding Other Public Software Repositories</title>
+ <section id="sn-using-repositories">
+ <title>Using Other Software Repositories</title>
<indexterm>
<primary>&FEX;</primary>
</indexterm>
@@ -752,12 +752,55 @@
</para>
</note>
<para>
- You should use these sites for RPM packages of software not
- included with &FC;. If these sites do not provide packages for a
- specific piece of software, the manufacturer of the software may provide
- or recommend a repository.
+ You should use these sites for software that is not included with &FC;.
+ If these sites do not provide packages for a specific piece of software,
+ the manufacturer of the software may provide or recommend a repository.
</para>
+ <section id="sn-adding-repositories">
+ <title>Adding a Repository as a Package Source</title>
+ <indexterm>
+ <primary>repositories, adding to yum</primary>
+ </indexterm>
+ <indexterm>
+ <primary>repository definition files, installing</primary>
+ </indexterm>
+ <para>
+ &FC; includes a <filename>yum</filename> package that has &FED;
+ repositories in the configuration. To add an extra repository, place a
+ definition file in the <filename>/etc/yum.repos.d/</filename> directory
+ on your system. Package providers make the definition files for their
+ repositories available on their Websites.
+ </para>
+ <tip>
+ <title>Definition File Extension</title>
+ <para>
+ The names of repository definition files end with <filename>.repo</filename>.
+ </para>
+ </tip>
+ <para>
+ Adding a file to the definitions directory requires root access. To
+ copy the definition file <filename>example.repo</filename>, type the command:
+ </para>
+<screen>
+<userinput>su -c 'cp example.repo /etc/yum.repos.d/'</userinput>
+</screen>
+ <para>
+ Enter the root password when prompted.
+ </para>
+ <para>
+ You must also add the public key of the package provider, if you have
+ not not already imported it. The process is described in <xref linkend="sn-authorizing-package-sources"></xref>.
+ </para>
+ <note>
+ <title>Repositories and <application>Up2date</application> Channels</title>
+ <para>
+ You should also add new package repositories as
+ <application>up2date</application> channels to ensure consistency between
+ the behavior of the two applications.
+ </para>
+ </note>
+ </section>
<section id="sn-compat-repositories">
<title>Understanding Repository Compatibility</title>
@@ -803,150 +846,6 @@
</section>
- <section id="sn-adding-repositories">
- <title>Adding Repositories as Package Sources</title>
- <indexterm>
- <primary>repositories, adding to yum</primary>
- </indexterm>
- <para>
- The file <filename>/etc/yum.conf</filename> holds the main settings for
- <command>yum</command>. Each repository is defined with a plain-text
- file in the <filename>/etc/yum.repos.d/</filename> directory.
- </para>
- <para>
- &FC; includes a <filename>yum</filename> package that has &FED;
- repositories in the configuration. These are defined to use a
- <command>mirrorlist</command> from the master &FED; servers.
- </para>
- <para>
- Each time that you run <command>yum</command> a server is selected from
- the list, and another server will automatically be used if the selected
- server fails to respond.
- </para>
- <para>
- To add other repositories, place a configuration file for them in the
- <filename>/etc/yum.repos.d/</filename> directory on your system.
- </para>
- <para>
- Files defining yum repositories should have the extension
- <filename>.repo</filename>. They use the following format:
- </para>
- <example id="yum-repo-format">
- <title>Format of <command>Yum</command> Repository Definition Files</title>
- <programlisting>
- <![CDATA[
- [serverid]
- name=Some longer name and description for this repository
- baseurl=url://path/to/repository-copy-1/
- url://path/to/repository-copy-2/
- enable=(0 or 1)
- gpgcheck=(0 or 1)
- ]]>
- </programlisting>
- </example>
- <para>
- The <command>baseurl</command> must specify the complete URL for the root
- directory of the repository, including the <command>http://</command>,
- <command>https://</command> or <command>ftp://</command> prefix. You
- can specify a directory on your system by using the prefix
- <command>file://</command> in the <command>baseurl</command>.
- </para>
- <tip>
- <title>Logging in to Protected Repositories</title>
- <para>
- <command>Yum</command> can use password-protected directories if the
- correct username and password is included in the
- <command>baseurl</command>. For
- example, <wordasword>ftp://user:password@myrepository.com/$releasever/mypackages/</wordasword>.
- </para>
- </tip>
- <para>
- If possible, list more than one directory or server that holds a copy of the
- repository. This enables <command>yum</command> to use another repository if the first is
- unavailable. By default <command>yum</command> randomly selects repositories from the
- <command>baseurl</command> list. To force <command>yum</command> to use them in sequence,
- add the option <command>failovermethod=priority</command>.
- </para>
- <para>
- It is also good practice to use variables like <command>$releasever</command> in
- the URL, rather than setting these to a specific value. The available
- variables are listed on the <command>man</command> page for
- <filename>yum.conf</filename>. Using variables enables the same
- definition to function when your system is upgraded to a later version,
- or if the configuration is copied to another machine.
- </para>
- <para>
- An example of a definition file is shown below. In this example, copies of the
- repository are held in the directory
- <filename>/srv/software/&FED;/&FCVER;/mypackages/</filename> on the
- system itself, in the directory
- <filename>software/&FED;/&FCVER;/mypackages/</filename> on the Web
- server <wordasword>www.my-repository.com/</wordasword>, and in the
- directory <filename>pub/software/&FED;/&FCVER;/mypackages/</filename> on
- the FTP server <wordasword>server.another-repository.org</wordasword>.
- Here, <command>yum</command> will access the FTP server with the
- username <command>yum-user</command> and the password <command>qwerty</command>.
- The <command>failovermethod</command> ensures that
- <command>yum</command> will check the copy on the local machine, before
- trying the servers in sequence.
- </para>
- <example id="yum-repo-example">
- <title>Example <command>yum</command> Repository Definition File</title>
- <programlisting>
- <![CDATA[
- [MyPackages]
- name=Some packages for Fedora $releasever
- baseurl=file:///srv/software/fedora/$releasever/mypackages/
- http://www.my-repository.com/software/fedora/$releasever/mypackages/
- ftp://yum-user:qwerty@anotherserver.another-repository.org/pub/software/fedora/$releasever/mypackages/
- failovermethod=priority
- enable=1
- gpgcheck=1
- ]]>
- </programlisting>
- </example>
- <para>
- To use a list of servers, substitute <command>mirrorlist</command> for
- <command>baseurl</command>.
- </para>
- <para>
- Set <command>gpgcheck=0</command> if it is necessary to disable signature
- checking for the packages provided by this repository. It is not
- recommended that you install unsigned packages.
- </para>
- <para>
- Any <filename>.repo</filename> file that includes the setting
- <command>enable=0</command> is ignored by yum.
- </para>
- <note>
- <title>Repositories and <application>Up2date</application> Channels</title>
- <para>
- You should also add new package repositories as
- <application>up2date</application> channels to ensure consistency between
- the behavior of the two applications.
- </para>
- </note>
- <para>
- If possible you should create your own private repository for the base operating
- system packages. You can then add a definition file for your repository
- and disable <filename>fedora.repo</filename>. This reduces your use of
- the public repositories. See <xref
- linkend="sn-creating-repository"></xref> for details.
- </para>
- <note>
- <title>Older Versions of <command>yum</command></title>
- <para>
- This tutorial documents the version of <command>yum</command>
- included with &FC; &FCVER;. Before version 2.11 of
- <command>yum</command> all repositories were defined in
- <filename>/etc/yum.conf</filename>, rather than in separate
- <filename>.repo</filename> files. Earlier versions also did not have
- the ability to use a <command>mirrorlist</command>.
- </para>
- </note>
- </section>
-
-
<section id="sn-yum-maintenance">
<title>Maintaining <command>yum</command></title>
<para>
@@ -966,9 +865,13 @@
<indexterm>
<primary>repositories, removing from yum</primary>
</indexterm>
+ <indexterm>
+ <primary>repository definition files, removing</primary>
+ </indexterm>
<para>
Set <command>enable=0</command> in a definition file to
- prevent <command>yum</command> using that repository.
+ prevent <command>yum</command> using that repository. Any
+ definition file with this setting is ignored.
</para>
<para>
To completely remove access to a repository:
@@ -1069,7 +972,7 @@
<command>yum</command>. Other types of files can be held in the
main directory without interfering with use of the repository. The
<filename>data/</filename> sub-directory and the XML files it
- contains are created and updated with the <command>createrepo</command> utility.
+ contains are created and updated with the <command>createrepo</command> utility
</para>
<note>
<title>Creating Repositories Requires an Extra Package</title>
@@ -1109,22 +1012,22 @@
</listitem>
</orderedlist>
</para>
-
<para>
The repository is now ready for use.
</para>
<para>
- If you are distributing packages that you have created yourself then you
- also need to make the GPG public key for your signature available, so
- that others can verify the packages. The simplest way to do this is
- to put the public key file on the same Website or FTP site as the repository.
+ Create a definition file for this new repository. If you are
+ distributing packages that you have created yourself then you also
+ need to make the GPG public key for your signature available, so that
+ others can verify the packages. The simplest way to make these files
+ available is to put the public key and repository definition files on
+ the same Website or FTP site as the repository.
</para>
<para>
- To create a repository of all the packages supplied with &FC;, copy all of the
- files from the <filename>RPMS/</filename> directories on the
- installation discs into a single directory. The
- <filename>TRANS.TBL</filename> files on the discs may be discarded.
- </para>
+ Creating a definition file is described in <xref
+ linkend="sn-writing-repodefs"></xref>. Packaging building is beyond the
+ scope of this document.
+ </para>
<tip>
<title>Repositories and Management Utilities</title>
<para>
@@ -1137,6 +1040,101 @@
</section>
+ <section id="sn-writing-repodefs">
+ <title>Repository Definition Files</title>
+ <indexterm>
+ <primary>repository definition files, creating</primary>
+ </indexterm>
+ <indexterm>
+ <primary>repository definition files, editing</primary>
+ </indexterm>
+ <para>
+ Create and edit repository definition files with a text editor.
+ Definition files are plain-text with a standard format:
+ </para>
+ <example id="yum-repo-format">
+ <title>Format of <command>yum</command> Repository Definition Files</title>
+ <programlisting>
+ <![CDATA[
+ [serverid]
+ name=Some longer name and description for this repository
+ baseurl=url://path/to/repository-copy-1/
+ url://path/to/repository-copy-2/
+ enable=(0 or 1)
+ gpgcheck=(0 or 1)
+ ]]>
+ </programlisting>
+ </example>
+ <para>
+ The <command>baseurl</command> must specify the complete URL for the root
+ directory of the repository, including the <command>http://</command>,
+ <command>https://</command> or <command>ftp://</command> prefix. You
+ may also specify a directory on your system, by using the prefix
+ <command>file://</command> in the <command>baseurl</command>.
+ </para>
+ <tip>
+ <title>Logging in to Protected Repositories</title>
+ <para>
+ To use a password-protected repository, include the correct username and
+ password in the <command>baseurl</command>. For example, <wordasword>ftp://user:password@myrepository.com/$releasever/mypackages/</wordasword>.
+ </para>
+ </tip>
+ <para>
+ If possible, list more than one directory or server that holds a copy of the
+ repository. This enables <command>yum</command> to use another repository if the first is
+ unavailable. By default <command>yum</command> randomly selects repositories from the
+ <command>baseurl</command> list. To force <command>yum</command> to use them in sequence,
+ add the option <command>failovermethod=priority</command>.
+ </para>
+ <para>
+ It is also good practice to use variables like <command>$releasever</command> in
+ the URL, rather than setting these to a specific value. The available
+ variables are listed on the <command>man</command> page for
+ <filename>yum.conf</filename>. Using variables enables the same
+ definition to function when your system is upgraded to a later version,
+ or if the configuration is copied to another machine.
+ </para>
+ <para>
+ A definition file is shown below that uses all of these features. In this example, copies of the
+ repository are held in the directory
+ <filename>/srv/software/&FED;/&FCVER;/mypackages/</filename> on the
+ system itself, in the directory
+ <filename>software/&FED;/&FCVER;/mypackages/</filename> on the Web
+ server <wordasword>www.my-repository.com/</wordasword>, and in the
+ directory <filename>pub/software/&FED;/&FCVER;/mypackages/</filename> on
+ the FTP server <wordasword>server.another-repository.org</wordasword>.
+ Here, <command>yum</command> will access the FTP server with the
+ username <command>yum-user</command> and the password <command>qwerty</command>.
+ The <command>failovermethod</command> ensures that
+ <command>yum</command> will check the copy on the local machine, before
+ trying the servers in sequence.
+ </para>
+ <example id="yum-repo-multidir-example">
+ <title>A <command>yum</command> Repository Definition File with Failover</title>
+ <programlisting>
+ <![CDATA[
+ [MyPackages]
+ name=Some packages for Fedora $releasever
+ baseurl=file:///srv/software/fedora/$releasever/mypackages/
+ http://www.my-repository.com/software/fedora/$releasever/mypackages/
+ ftp://yum-user:qwerty@anotherserver.another-repository.org/pub/software/fedora/$releasever/mypackages/
+ failovermethod=priority
+ enable=1
+ gpgcheck=1
+ ]]>
+ </programlisting>
+ </example>
+ <para>
+ To use a list of servers, substitute <command>mirrorlist</command> for
+ <command>baseurl</command>.
+ </para>
+ <para>
+ Set <command>gpgcheck=0</command> if it is necessary to disable signature
+ checking for the packages provided by this repository. Avoid
+ distributing or installing unsigned packages.
+ </para>
+ </section>
+
<section id="sn-updating-repository">
<title>Updating a Repository</title>
<indexterm>
@@ -1209,7 +1207,7 @@
use the proxy server <command>mycache.mydomain.com</command>, connecting to port <command>3128</command>.
</para>
<example id="profile-script-httpproxy">
- <title>Profile Settings for Using A Proxy Server</title>
+ <title>Profile Settings for Using a Proxy Server</title>
<programlisting>
<![CDATA[
# The Web proxy server used by this account
@@ -1225,7 +1223,7 @@
<command>yum-user</command> and the password <command>qwerty</command>:
</para>
<example id="profile-script-httpproxy-withpassword">
- <title>Profile Settings for A Secured Proxy Server</title>
+ <title>Profile Settings for a Secured Proxy Server</title>
<programlisting>
<![CDATA[
# The Web proxy server, with the username and password for this account
18 years, 11 months
desktop-up2date desktop-up2date-en.xml,1.2,1.3
by fedora-docs-commits@redhat.com
Author: elliss
Update of /cvs/docs/desktop-up2date
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9610
Modified Files:
desktop-up2date-en.xml
Log Message:
Fixed colons.
Index: desktop-up2date-en.xml
===================================================================
RCS file: /cvs/docs/desktop-up2date/desktop-up2date-en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- desktop-up2date-en.xml 11 Jun 2005 17:12:20 -0000 1.2
+++ desktop-up2date-en.xml 12 Jun 2005 18:56:11 -0000 1.3
@@ -210,11 +210,11 @@
The icon displays the status of your system by showing one of four states:
<itemizedlist>
<listitem>
- <para>Grey with a check mark — The first check is in progress.
+ <para>Grey with a check mark: the first check is in progress.
</para>
</listitem>
<listitem>
- <para>Blue with a check mark &mdash: your system is up to date.
+ <para>Blue with a check mark: your system is up to date.
</para>
</listitem>
<listitem>
18 years, 11 months