docs-common/bin xmlformat-fdp.conf,1.7,1.8
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23529
Modified Files:
xmlformat-fdp.conf
Log Message:
Add some nicety for OMF files
Index: xmlformat-fdp.conf
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmlformat-fdp.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmlformat-fdp.conf 9 Nov 2005 23:42:29 -0000 1.7
+++ xmlformat-fdp.conf 30 Nov 2005 12:57:25 -0000 1.8
@@ -35,6 +35,7 @@
revnumber date authorinitials
entry-break = 0
exit-break = 0
+ normalize = yes
revremark
normalize = yes
@@ -100,3 +101,10 @@
ulink xref
format = inline
+# Cover OMF files
+creator description format identifier language maintainer omf relation rights subject type version
+ format = block
+ normalize = yes
+ entry-break = 1
+ exit-break = 1
+
18 years, 4 months
docs-common/bin bulkbuild,1.3,1.4
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23504
Modified Files:
bulkbuild
Log Message:
Update bulkbuild for more flexibility
Index: bulkbuild
===================================================================
RCS file: /cvs/docs/docs-common/bin/bulkbuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bulkbuild 29 Nov 2005 21:23:54 -0000 1.3
+++ bulkbuild 30 Nov 2005 12:56:30 -0000 1.4
@@ -1,7 +1,9 @@
#!/bin/bash
#
+# Written by stickster :)
+#
# Pull all active FDP docs from CVS, build and install HTML in
-# folder $HOME/fdpdocs-html.
+# TARGETDIR folder.
#
# This script is not designed to be run inside a local CVS repository;
# it is only stored here for convenience and upkeep. It may be used
@@ -9,47 +11,158 @@
# hand, it may be vaporized.
#
+MYSELF="$(basename "$0")"
NOW="$(date +%Y%m%d%H%M%S)"
-FDPDIR="${HOME}/fdpdocs-cvs${NOW}"
-HTMLDIR="${HOME}/fdpdocs-html"
-# Do this anonymously for now
-ANONCVS=":pserver:anonymous@cvs.fedora.redhat.com:2401/cvs/docs"
-#INTERACT=no #default
+print_usage() {
+ echo "$MYSELF: Usage: $MYSELF [options...]"
+ echo " -m WORKDIR : set home directory, default $HOME"
+ echo " -f FDPDIR : set d/l dir for CVS, default $FDPDIR"
+ echo " -D TARGETDIR : set target dir for built files, default $TARGETDIR"
+ echo " -a ANONCVS : set CVS repo location (cvs -d), default $ANONCVS"
+ echo " -r REV : checkout REV from CVS (global), default $REV"
+ echo " -Q : make CVS checkout less quiet"
+ echo " -c : build chunked HTML"
+ echo " -n : build HTML nochunks"
+ echo " -p : build PDF (not working currently)"
+ echo " -t : build tarball"
+ echo " -h : print usage (this message)"
+}
+
+
+set_vars() {
+ [ -z "$WORKDIR" ] && WORKDIR="${HOME}"
+ [ -z "$FDPDIR" ] && FDPDIR="${WORKDIR}/fdpdocs-cvs${NOW}"
+ [ -z "$TARGETDIR" ] && TARGETDIR="/var/www/webtest/docs"
+ # Do this anonymously for now
+ [ -z "$ANONCVS" ] && ANONCVS=":pserver:anonymous@cvs.fedora.redhat.com:/cvs/docs"
+ [ -z "$REV" ] && REV="HEAD"
+ [ -z "$REDIR" ] && REDIR="/dev/null"
+ [ -z "$QUIET" ] && QUIET="-Q"
+}
+
+
+# just to make sure defaults are read
+unset FDPDIR HTMLDIR ANONCVS TAG CHUNKS NOCHUNKS PDF TARBALL VERBOSE
+BUILDS=0
+
+while getopts "m:f:D:a:r:Qcnpthv" OPT; do
+ case $OPT in
+ m )
+ WORKDIR="$OPTARG"
+ ;;
+ f )
+ FDPDIR="$OPTARG"
+ ;;
+ D )
+ TARGETDIR="$OPTARG"
+ ;;
+ a )
+ ANONCVS="$OPTARG"
+ ;;
+ r )
+ REV="$OPTARG"
+ ;;
+ Q )
+ QUIET="-q"
+ ;;
+ c )
+ CHUNKS="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
+ n )
+ NOCHUNKS="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
+ p )
+ PDF="yes" # But PDF doesn't work yet, don't do this!
+ BUILDS=$(($BUILDS+1))
+ ;;
+ t )
+ TARBALL="yes"
+ BUILDS=$(($BUILDS+1))
+ ;;
+ h )
+ set_vars
+ print_usage
+ exit 0
+ ;;
+ v )
+ REDIR="/dev/stdout"
+ ;;
+ * )
+ echo "$MYSELF: invalid option: $OPT"
+ print_usage
+ exit 10
+ ;;
+ esac
+done
+shift $(($OPTIND - 1))
+
+
+if [ $BUILDS -lt 1 ]; then
+ echo "$MYSELF: nothing to do, try selecting one of [-c|-n|-p|-t]"
+ exit 20
+fi
+
+
+set_vars
mkdir "${FDPDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
-mkdir "${HTMLDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
+mkdir -p "${TARGETDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
pushd "${FDPDIR}" >/dev/null || ( echo "Could not pushd ${FDPDIR}" ; exit 253 )
-cvs -d $ANONCVS login
-cvs -qz3 -d $ANONCVS co docs-common
+
+echo "Checking out docs-common from Fedora Docs CVS"
+#cvs -d $ANONCVS login
+cvs "$QUIET" -z3 -d $ANONCVS co docs-common
+
for DOC in `cat docs-common/bin/active`; do
- cvs -qz3 -d $ANONCVS co $DOC
+ DONE=""
+ echo "Checking out module $DOC from Fedora Docs CVS"
+ cvs "$QUIET" -z3 -d $ANONCVS co $DOC 2>&1 > $REDIR
pushd "$DOC" >/dev/null || (echo "Couldn't cd to $DOCDIR" ; exit 252 )
make showvars > tmpvars
. tmpvars
rm -f tmpvars
- make html
- for LANG in $LANGUAGES ; do
- DESTDIR="${HTMLDIR}/${DOCBASE}/${LANG}"
- mkdir -p "${DESTDIR}"
- cp -a "${DOCBASE}-${LANG}"/* "${DESTDIR}"
- done
+ if [ "$CHUNKS" = "yes" ]; then
+ echo "Making chunked HTML for ${DOCBASE}"
+ make html 2>&1 > $REDIR || ( echo "$MYSELF: CHUNKS failed" ;\
+ exit 251 )
+ for LANG in $LANGUAGES ; do
+ DESTDIR="${TARGETDIR}/${DOCBASE}/${LANG}"
+ [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+ cp -r "${DOCBASE}-${LANG}/"* "${DESTDIR}"
+ done
+ fi
+ if [ "$NOCHUNKS" = "yes" ]; then
+ echo "Making nochunks HTML for ${DOCBASE}"
+ mak html-nochunks 2>&1 > $REDIR || ( echo "$MYSELF: NOCHUNKS failed" ;\
+ exit 251 )
+ for LANG in $LANGUAGES ; do
+ DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
+ [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+ cp -r "${DOCBASE}-${LANG}.html" "${DESTDIR}"
+ done
+ fi
+ if [ "$TARBALL" = "yes" ]; then
+ echo "Making tarball for ${DOCBASE}"
+ make tarball 2>&1 > $REDIR || ( echo "$MYSELF: TARBALL failed" ;\
+ exit 251 )
+ for LANG in $LANGUAGES ; do
+ DESTDIR="${TARGETDIR}/${DOCBASE}/" # add $LANG if desired
+ [ ! -d "$DESTDIR" ] && mkdir -p $DESTDIR
+ cp -r "${DOCBASE}-${LANG}.tar.gz" "${DESTDIR}"
+ done
+ fi
+
popd >/dev/null
+
done
popd >/dev/null
-if [ ! -z "$INTERACT" ]; then
- echo -n "OK to remove temp dir ${FDPDIR} [y/n]? "
- read -sn1 REPLY
- case $REPLY in
- y|Y )
- rm -rf "${FDPDIR}"
- echo
- ;;
- * )
- echo "... not removed."
- ;;
- esac
-fi
+[ "$FDPDIR" != "/" ] && [ "$FDPDIR" != "$HOME" ] && rm -rf "${FDPDIR}"
+exit 0
+
+
18 years, 4 months
docs-common/xsl html-common-relnotes.xsl, 1.1, 1.2 html-common.xsl, 1.9, 1.10
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/xsl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28240/xsl
Modified Files:
html-common-relnotes.xsl html-common.xsl
Log Message:
Change default to the HTML "fedora-draft.css" stylesheet to reinforce
that the rendering here is not meant to be the final production rendering.
Provided the "bin/use-prod-css" to locally change HTML files to minic
production-quality rendering. NOTE: draft watermarking does NOT PRINT
unless the browser preferences enable background image printing.
Index: html-common-relnotes.xsl
===================================================================
RCS file: /cvs/docs/docs-common/xsl/html-common-relnotes.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- html-common-relnotes.xsl 2 Jun 2005 18:23:47 -0000 1.1
+++ html-common-relnotes.xsl 29 Nov 2005 21:42:39 -0000 1.2
@@ -30,7 +30,7 @@
<xsl:param name="generate.legalnotice.link" select="1"></xsl:param>
-->
-<xsl:param name="html.stylesheet" select="'fedora.css'"></xsl:param>
+<xsl:param name="html.stylesheet" select="'fedora-draft.css'"></xsl:param>
<xsl:param name="html.stylesheet.type">text/css</xsl:param>
<xsl:param name="html.cleanup" select="1"></xsl:param>
Index: html-common.xsl
===================================================================
RCS file: /cvs/docs/docs-common/xsl/html-common.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- html-common.xsl 29 Jun 2005 14:32:49 -0000 1.9
+++ html-common.xsl 29 Nov 2005 21:42:39 -0000 1.10
@@ -25,7 +25,7 @@
<xsl:output method="html" indent="no"/>
-<xsl:param name="html.stylesheet" select="'fedora.css'"></xsl:param>
+<xsl:param name="html.stylesheet" select="'fedora-draft.css'"></xsl:param>
<xsl:param name="html.stylesheet.type">text/css</xsl:param>
<xsl:param name="html.cleanup" select="1"></xsl:param>
18 years, 4 months
docs-common/bin use-prod-css,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-serv28240/bin
Added Files:
use-prod-css
Log Message:
Change default to the HTML "fedora-draft.css" stylesheet to reinforce
that the rendering here is not meant to be the final production rendering.
Provided the "bin/use-prod-css" to locally change HTML files to minic
production-quality rendering. NOTE: draft watermarking does NOT PRINT
unless the browser preferences enable background image printing.
--- NEW FILE use-prod-css ---
#!/bin/bash
########################################################################
# Tommy.Reynolds <Tommy.Reynolds(a)MegaCoder.com>
# International copyright secured (C) 2005, All rights reserved.
# This software is licensed under the GPL.
########################################################################
# Do surgery on the *.html files to reference the production CSS stylesheet
#
# Use like this:
#
# use-prod-css /path/to/docdir
#
########################################################################
USAGE="usage: $(basename $0) /path/to/docdir"
SILENT=yes
while getopts v c
do
case "${c}" in
v ) SILENT="";;
* ) echo "${USAGE}" >&2; exit 1;;
esac
done
shift $(expr ${OPTIND} - 1)
if [ $# -gt 1 ]; then
echo "${USAGE}" >&2
exit 1
fi
find ${1:-.} -iname '*.html' -print |
while read f; do
[ "${SILENT}" ] || echo ${f}
sed 's/href="fedora-draft.css"/href="fedora.css"/' ${f} >${f}.tmp
mv ${f}.tmp ${f}
done
18 years, 4 months
docs-common Makefile.common,1.14,1.15
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28240
Modified Files:
Makefile.common
Log Message:
Change default to the HTML "fedora-draft.css" stylesheet to reinforce
that the rendering here is not meant to be the final production rendering.
Provided the "bin/use-prod-css" to locally change HTML files to minic
production-quality rendering. NOTE: draft watermarking does NOT PRINT
unless the browser preferences enable background image printing.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.common 29 Nov 2005 15:52:49 -0000 1.14
+++ Makefile.common 29 Nov 2005 21:42:28 -0000 1.15
@@ -64,7 +64,8 @@
# LANG=en.UTF-8 ${XMLTO} html -x $(XSLHTML) -o mydoc-en mydoc-en.xml
# mkdir -p mydoc-en/stylesheet-images
# cp ${FDPDIR}/docs-common/stylesheet-images/*.png mydoc-en/stylesheet-images/
-# cp ${FDPDIR}/docs-common/css/fedora.css mydoc-en/
+# cp ${FDPDIR}/docs-common/css/fedora*.css mydoc-en/
+# cp ${FDPDIR}/docs-common/images/watermark.png mydoc-en/
# mkdir -p mydoc-en/figs
# cp -p figs/*-${LANG}.* mydoc-en/figs
# but we do avoid copying EPS files since they are nonsense to the HTML world.
@@ -76,7 +77,8 @@
LANG=$(1).UTF-8 ${XMLTO} html -x $(XSLHTML) -o $(DOCBASE)-$(1) $(DOCBASE)-$(1).xml
mkdir -p $(DOCBASE)-$(1)/stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png $(DOCBASE)-$(1)/stylesheet-images
- cp ${FDPDIR}/docs-common/css/fedora.css $$(DOCBASE)-$(1)/
+ cp ${FDPDIR}/docs-common/css/fedora*.css $$(DOCBASE)-$(1)/
+ cp ${FDPDIR}/docs-common/images/watermark.png $${DOCBASE}-$(1)/
[ ! -d figs ] || ( \
mkdir -p ${DOCBASE}-$(1)/figs; \
find figs -type f -iname '*.*' -print | \
@@ -97,7 +99,8 @@
${XMLTO} html-nochunks -x $(XSLHTMLNOCHUNKS) $(DOCBASE)-$(1).xml
mkdir -p stylesheet-images/
cp ${FDPDIR}/docs-common/stylesheet-images/*.png stylesheet-images/
- cp ${FDPDIR}/docs-common/css/fedora.css .
+ cp ${FDPDIR}/docs-common/css/fedora*.css .
+ cp ${FDPDIR}/docs-common/images/watermark.png .
endef
#
html-nochunks:: $(foreach LANG,${LANGUAGES},$(DOCBASE)-$(LANG).html)
@@ -133,9 +136,10 @@
define CLEAN_template
${DOCBASE}-$(1)-clean::
${RM} -r ${DOCBASE}-$(1)
- ${RM} -r ${DOCBASE}-$(1).html stylesheet-images fedora.css
+ ${RM} -r ${DOCBASE}-$(1).html stylesheet-images
${RM} -r ${DOCBASE}-$(1).pdf
${RM} -r ${DOCBASE}-$(1).tar.gz
+ ${RM} fedora*.css watermark.png
endef
#
distclean clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
18 years, 4 months
docs-common/bin bulkbuild,1.2,1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28145
Modified Files:
bulkbuild
Log Message:
Remove interaction
Index: bulkbuild
===================================================================
RCS file: /cvs/docs/docs-common/bin/bulkbuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bulkbuild 16 Nov 2005 02:02:10 -0000 1.2
+++ bulkbuild 29 Nov 2005 21:23:54 -0000 1.3
@@ -14,6 +14,7 @@
HTMLDIR="${HOME}/fdpdocs-html"
# Do this anonymously for now
ANONCVS=":pserver:anonymous@cvs.fedora.redhat.com:2401/cvs/docs"
+#INTERACT=no #default
mkdir "${FDPDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
mkdir "${HTMLDIR}" || ( echo "Could not mkdir ${FDPDIR}" ; exit 254 )
@@ -39,14 +40,16 @@
popd >/dev/null
-echo -n "OK to remove temp dir ${FDPDIR} [y/n]? "
-read -sn1 REPLY
-case $REPLY in
- y|Y )
- rm -rf "${FDPDIR}"
- echo
- ;;
- * )
- echo "... not removed."
- ;;
-esac
+if [ ! -z "$INTERACT" ]; then
+ echo -n "OK to remove temp dir ${FDPDIR} [y/n]? "
+ read -sn1 REPLY
+ case $REPLY in
+ y|Y )
+ rm -rf "${FDPDIR}"
+ echo
+ ;;
+ * )
+ echo "... not removed."
+ ;;
+ esac
+fi
18 years, 4 months
docs-common/packaging desktop.xsl,1.2,1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19904
Modified Files:
desktop.xsl
Log Message:
Oops, didn't watch fill... fixed
Index: desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/desktop.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- desktop.xsl 28 Nov 2005 22:49:46 -0000 1.2
+++ desktop.xsl 29 Nov 2005 17:41:14 -0000 1.3
@@ -19,10 +19,7 @@
<xsl:for-each select="/rpm-info/titles/translation">
Name[<xsl:value-of select="@lang"/>]=<xsl:value-of select="title"/>
Comment[<xsl:value-of select="@lang"/>]=<xsl:value-of select="desc"/>
-Exec[<xsl:value-of select="@lang"/>]=gnome-help
- file://usr/share/doc/fedora-doc-<xsl:value-of
- select="$docbase"/>/<xsl:value-of select="@lang"/>/<xsl:value-of
- select="$docbase"/>-<xsl:value-of select="@lang"/>.xml
+Exec[<xsl:value-of select="@lang"/>]=gnome-help file://usr/share/doc/fedora-doc-<xsl:value-of select="$docbase"/>/<xsl:value-of select="@lang"/>/<xsl:value-of select="$docbase"/>-<xsl:value-of select="@lang"/>.xml
OnlyShownIn=GNOME;
</xsl:for-each>
18 years, 4 months
docs-common Makefile.common,1.13,1.14
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14011
Modified Files:
Makefile.common
Log Message:
Corrected bug #174469 - Typo prevents over-ride of the ${XSLHTMLNOCHUNKS}
value.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.common 15 Nov 2005 23:10:46 -0000 1.13
+++ Makefile.common 29 Nov 2005 15:52:49 -0000 1.14
@@ -40,7 +40,7 @@
ifeq (${XSLHTML},)
XSLHTML = ${FDPDIR}/docs-common/xsl/main-html.xsl
endif
-ifeq (${XSHTMLNOCHUNKS},)
+ifeq (${XSLHTMLNOCHUNKS},)
XSLHTMLNOCHUNKS = ${FDPDIR}/docs-common/xsl/main-html-nochunks.xsl
endif
#########################################################################
18 years, 4 months
yum-software-management yum-software-management-en.xml,1.49,1.50
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21199
Modified Files:
yum-software-management-en.xml
Log Message:
Changed &FED; entity to &FC; where a version is used, since FC itself is the only thing which can carry a version number.
Index: yum-software-management-en.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/yum-software-management-en.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- yum-software-management-en.xml 15 Nov 2005 00:13:03 -0000 1.49
+++ yum-software-management-en.xml 29 Nov 2005 02:59:54 -0000 1.50
@@ -4,10 +4,13 @@
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
-<!ENTITY BOOKID "yum-software-management-1.0.4 (2005-11-15)"> <!-- change version of manual and date here -->
+<!ENTITY DOCNAME "yum-software-management">
+<!ENTITY DOCVERSION "1.0.5">
+<!ENTITY DOCDATE "2005-11-28">
+<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
+<!-- this will soon vanish -->
+<!ENTITY BOOKID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
-<!-- Bugzilla bug number for the draft notice -->
-<!ENTITY BUG-NUM "155190">
<!ENTITY FCLOCALVER "4">
]>
@@ -108,6 +111,16 @@
</para>
</revdescription>
</revision>
+ <revision>
+ <revnumber>1.0.5</revnumber>
+ <date>2005-11-28</date>
+ <authorinitials>PaulWFrields</authorinitials>
+ <revdescription>
+ <para>
+ Fixed some uses of "&FED;" to read "&FC;" where appropriate.
+ </para>
+ </revdescription>
+ </revision>
</revhistory>
</articleinfo>
@@ -149,14 +162,14 @@
</para>
<note>
- <title>Previous Versions of &FED;</title>
+ <title>Previous Versions of &FC;</title>
<para>
This document describes the configuration of
- <command>yum</command> on &FED; &FCLOCALVER; systems. You must
+ <command>yum</command> on &FC; &FCLOCALVER; systems. You must
perform the additional step noted in
<xref linkend="sn-authorizing-package-sources" /> to enable
- <command>yum</command> on &FED; 3.
+ <command>yum</command> on &FC; 3.
</para>
</note>
@@ -331,7 +344,7 @@
<para>
A network of servers provide several repositories for each
- version of &FED;. The package management utilities in &FC; are
+ version of &FC;. The package management utilities in &FC; are
already configured to use three of these repositories:
</para>
@@ -371,11 +384,11 @@
</variablelist>
<note>
- <title>Previous Versions of &FED;</title>
+ <title>Previous Versions of &FC;</title>
<para>
- &FED; &FCLOCALVER; automatically supports the three
- repositories listed above. You must manually configure &FED; 3
+ &FC; &FCLOCALVER; automatically supports the three
+ repositories listed above. You must manually configure &FC; 3
systems to use &FEX;, as noted in
<xref linkend="sn-using-repositories"/>.
</para>
@@ -1250,11 +1263,11 @@
<title>&FEX; Repositories for Previous Versions of &FC;</title>
<para>
- You must manually configure &FED; 3 systems to use &FEX;, using
+ You must manually configure &FC; 3 systems to use &FEX;, using
the instructions at
<ulink
url="http://fedora.redhat.com/projects/extras/"/>. For
- additional packages for &FED; 1 and &FED; 2, refer to
+ additional packages for &FC; 1 and &FC; 2, refer to
<ulink
url="http://www.fedora.us/"/>.
</para>
@@ -1317,9 +1330,9 @@
<title>Repositories and <application>up2date</application> Channels</title>
<para>
- Starting with &FED; 4, <command>yum</command> repositories are
+ Starting with &FC; 4, <command>yum</command> repositories are
automatically used as <application>up2date</application>
- channels. On &FED; 3 and earlier systems, you must manually
+ channels. On &FC; 3 and earlier systems, you must manually
configure <application>up2date</application> to use these
channels. To do so, edit the
<filename>/etc/sysconfig/rhn/sources</filename> file.
@@ -1364,11 +1377,11 @@
</para>
<important>
- <title>Importing the &FED; Key on &FED; 3</title>
+ <title>Importing the &FED; Key on &FC; 3</title>
<para>
To add the &FED; public key to the <command>rpm</command>
- keyring on &FED; 3 systems, run the command <command>su -c
+ keyring on &FC; 3 systems, run the command <command>su -c
'rpm --import /usr/share/rhn/RPM-GPG-KEY-fedora'</command>.
</para>
</important>
@@ -1426,8 +1439,8 @@
<para>
The data format for repository indexes changed with version
2.1 of <command>yum</command>. This was the version supplied
- with &FED; 3. Repository providers should specify the versions
- of &FED; that they support. To confirm that an unlabeled
+ with &FC; 3. Repository providers should specify the versions
+ of &FC; that they support. To confirm that an unlabeled
repository is compatible with current versions of
<command>yum</command>, check that it has a sub-directory
called <filename>repodata/</filename>.
18 years, 4 months
docs-common/packaging desktop.xsl,1.1,1.2
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14319
Modified Files:
desktop.xsl
Log Message:
Put some good advice to use; we'll figure out a khelpcenter version as we go
Index: desktop.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/desktop.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- desktop.xsl 25 Nov 2005 20:52:52 -0000 1.1
+++ desktop.xsl 28 Nov 2005 22:49:46 -0000 1.2
@@ -19,7 +19,11 @@
<xsl:for-each select="/rpm-info/titles/translation">
Name[<xsl:value-of select="@lang"/>]=<xsl:value-of select="title"/>
Comment[<xsl:value-of select="@lang"/>]=<xsl:value-of select="desc"/>
-Exec[<xsl:value-of select="@lang"/>]=gnome-help file://usr/share/doc/fedora-doc-<xsl:value-of select="$docbase"/>/<xsl:value-of select="@lang"/>/<xsl:value-of select="$docbase"/>-<xsl:value-of select="@lang"/>.xml
+Exec[<xsl:value-of select="@lang"/>]=gnome-help
+ file://usr/share/doc/fedora-doc-<xsl:value-of
+ select="$docbase"/>/<xsl:value-of select="@lang"/>/<xsl:value-of
+ select="$docbase"/>-<xsl:value-of select="@lang"/>.xml
+OnlyShownIn=GNOME;
</xsl:for-each>
</xsl:template>
18 years, 4 months