[jargon-buster] fix build
Rüdiger Landmann
rlandmann at fedoraproject.org
Sun Jun 20 23:56:38 UTC 2010
commit e2d2ad1db5687af46c7e5aa4646e5dab71eeb5dd
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Mon Jun 21 09:56:11 2010 +1000
fix build
en-US/Article_Info.xml | 4 +-
en-US/Author_Group.xml | 12 +--
en-US/Jargon_Buster.ent | 4 +
en-US/Jargon_Buster.xml | 14 +++
en-US/Revision_History.xml | 7 +-
en-US/{glossery.xml => glossary.xml} | 173 ++++++++++++++--------------------
en-US/jargon-buster.ent | 4 -
en-US/jargon-buster.xml | 7 --
publican.cfg | 2 -
9 files changed, 97 insertions(+), 130 deletions(-)
---
diff --git a/en-US/Article_Info.xml b/en-US/Article_Info.xml
index 15e259a..0dabaec 100644
--- a/en-US/Article_Info.xml
+++ b/en-US/Article_Info.xml
@@ -2,9 +2,9 @@
<!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<articleinfo>
- <title>jargon-buster</title>
+ <title>Jargon Buster</title>
<subtitle>short description</subtitle>
- <productname>Documentation</productname>
+ <productname>Fedora Draft Documentation</productname>
<productnumber>1.9.6</productnumber>
<edition>2</edition>
<pubsnumber>0</pubsnumber>
diff --git a/en-US/Author_Group.xml b/en-US/Author_Group.xml
index 189efe1..e7834bd 100644
--- a/en-US/Author_Group.xml
+++ b/en-US/Author_Group.xml
@@ -3,14 +3,8 @@
]>
<authorgroup>
<author>
-<!-- No name
- <firstname>Dude</firstname>
- <surname>McPants</surname>
--->
- <affiliation>
- <!--<orgname>Fedora Project</orgname> -->
- <orgdiv>Documentation Project</orgdiv>
- </affiliation>
- <!--<email>Dude.McPants at example.com</email>-->
+
+ <firstname>Fedora</firstname>
+ <surname>Documentation Project</surname>
</author>
</authorgroup>
diff --git a/en-US/Jargon_Buster.ent b/en-US/Jargon_Buster.ent
new file mode 100644
index 0000000..ca096b5
--- /dev/null
+++ b/en-US/Jargon_Buster.ent
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "Documentation">
+<!ENTITY BOOKID "jargon-buster">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat, Inc. and others">
diff --git a/en-US/Jargon_Buster.xml b/en-US/Jargon_Buster.xml
new file mode 100644
index 0000000..39f202b
--- /dev/null
+++ b/en-US/Jargon_Buster.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE Article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<article>
+ <para>
+ This document clarifies some of the terms used on various lists, web
+ pages, and IRC, when talking about Fedora. Many thanks to the people
+ on the fedora-list and at Red Hat for their input. If you cannot find a
+ term in this document that you think should appear here, use the bug
+ reporting information below to notify the maintainers.
+ </para>
+<xi:include href="glossary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</article>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 6c467ff..09b17a5 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -23,11 +23,8 @@
<revnumber>1.9.6-1</revnumber>
<date>Fri May 26 2006</date>
<author>
- <!-- Unknown author
- <firstname>Eric</firstname>
- <surname>Christensen</surname>
- <email>sparks at fedoraproject.org</email>
- -->
+ <firstname>Unknown</firstname>
+ <surname>Unknown</surname>
</author>
<revdescription>
<simplelist>
diff --git a/en-US/glossery.xml b/en-US/glossary.xml
similarity index 89%
rename from en-US/glossery.xml
rename to en-US/glossary.xml
index 30820a5..61c160f 100644
--- a/en-US/glossery.xml
+++ b/en-US/glossary.xml
@@ -1,29 +1,9 @@
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-
-<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
-%FDP-ENTITIES;
-
-<!ENTITY % DOC-ENTITIES SYSTEM "doc-entities.ent">
-%DOC-ENTITIES;
-
]>
-<section>
- <para>
- This document clarifies some of the terms used on various lists, web
- pages, and IRC, when talking about &FED;. Many thanks to the people
- on the fedora-list and at &RH; for their input. If you cannot find a
- term in this document that you think should appear here, use the bug
- reporting information below to notify the maintainers.
- </para>
-
-<!-- &BUG-REPORTING; -->
<glossary id="fedora-glossary">
- <title>Glossary</title>
- <glossdiv>
- <title>Jargon Buster</title>
<glossentry id="gl-jb-a11y">
<glossterm>a11y</glossterm>
<glossdef>
@@ -43,7 +23,7 @@
<glossdef>
<para>
The Advanced Linux Sound Architecture (ALSA) is a technology
- that gives &FED; the ability to mix and output multiple
+ that gives Fedora the ability to mix and output multiple
audio sources. ALSA supports many consumer and professional
level hardware devices. Refer to
<ulink
@@ -56,7 +36,7 @@
<glossterm>Anaconda</glossterm>
<glossdef>
<para>
- <application>Anaconda</application> is the &FC; installation
+ <application>Anaconda</application> is the Fedora installation
system. <application>Anaconda</application> identifies and
configures the system's hardware, creates appropriate file
systems, and installs or upgrades software packages.
@@ -81,7 +61,7 @@
<command>apt</command> for use with RPM packages. Since
<command>apt</command> has specific problems with
<firstterm>multilib</firstterm>, however, it is not
- recommended for use with &FED; systems. Use
+ recommended for use with Fedora systems. Use
<xref
linkend="gl-jb-yum"/> instead.
</para>
@@ -91,7 +71,7 @@
<glossterm>ATrpms</glossterm>
<glossdef>
<para>
- ATrpms a third party RPM repository for &FED; software.
+ ATrpms a third party RPM repository for Fedora software.
Refer to <ulink url="http://atrpms.physik.fu-berlin.de/"/>
for more information about ATrpms.
</para>
@@ -107,13 +87,13 @@
for more information.
</para>
<para>
- Use <application>BitTorrent</application> to download &FC;
- by downloading and opening a torrent file. The official &FC;
+ Use <application>BitTorrent</application> to download Fedora
+ by downloading and opening a torrent file. The official Fedora
torrent tracker is located at
<ulink
url="http://torrent.fedoraproject.org/"/>.
Download a torrent file there to begin downloading a release
- of &FC;.
+ of Fedora.
</para>
</glossdef>
</glossentry>
@@ -122,25 +102,25 @@
<glossdef>
<para>
<trademark>Bluecurve</trademark> is a theme which unifies
- the look and feel of the &FED; desktop. Bluecurve was
- introduced in &RHL; 9 and was used as the default for &FC;
- through release 3. Bluecurve was replaced in &FC; 4 by
+ the look and feel of the Fedora desktop. Bluecurve was
+ introduced in Red Hat Linux 9 and was used as the default for Fedora
+ through release 3. Bluecurve was replaced in Fedora 4 by
<xref linkend="gl-jb-clearlooks"/>. Bluecurve included icons
and settings for the menu and layout of the desktop.
</para>
</glossdef>
</glossentry>
<glossentry id="gl-jb-bugzilla">
- <glossterm>&BZ;</glossterm>
+ <glossterm>Bugzilla</glossterm>
<glossdef>
<para>
- &BZ; is an online database for recording flaws, or
- <firstterm>bugs</firstterm>, in &FED; software,
- documentation, and other projects. &BZ; also tracks bugs in
- &RH; software. When you encounter a problem with &FED;, you
+ Bugzilla is an online database for recording flaws, or
+ <firstterm>bugs</firstterm>, in Fedora software,
+ documentation, and other projects. Bugzilla also tracks bugs in
+ Red Hat software. When you encounter a problem with Fedora, you
can help the community fix the problem by making a record in
- &BZ;. This procedure is called "entering a bug." For more
- information about &BZ;, refer to &BZ-URL;.
+ Bugzilla. This procedure is called "entering a bug." For more
+ information about Bugzilla, refer to <ulink url="http://bugzilla.redhat.com/"></ulink>.
</para>
</glossdef>
</glossentry>
@@ -162,7 +142,7 @@
<glossdef>
<para>
Clearlooks is the default theme for a GNOME desktop
- environment in &FC; 4. The Clearlooks design is based on the
+ environment in Fedora 4. The Clearlooks design is based on the
original <xref linkend="gl-jb-bluecurve"/>.
</para>
</glossdef>
@@ -171,19 +151,19 @@
<glossterm>Core</glossterm>
<glossdef>
<para>
- Core is a numbered release of a subset of &FED; software,
- and is usually called "&FC;." Core packages are maintained
- mainly by employees of &RH;, and are made up of free and
+ Core is a numbered release of a subset of Fedora software,
+ and is usually called "Fedora." Core packages are maintained
+ mainly by employees of Red Hat, and are made up of free and
open source software produced by the Linux community.
</para>
<para>
- Although the software in &FC; is updated regularly, the
- original release of &FC; does not change. For this reason,
- when users discuss the state of their &FED; system software,
- they might refer to "&FC; plus updates." When you request
+ Although the software in Fedora is updated regularly, the
+ original release of Fedora does not change. For this reason,
+ when users discuss the state of their Fedora system software,
+ they might refer to "Fedora plus updates." When you request
help from the community, this terminology is the most
accurate. However, many users simply call the updated system
- "&FC;."
+ "Fedora."
</para>
</glossdef>
</glossentry>
@@ -234,7 +214,7 @@
<glossdef>
<para>
The <application>Desktop Switcher</application> tool allows
- a user to convert the &FED; desktop between
+ a user to convert the Fedora desktop between
<xref
linkend="gl-jb-gnome"/> and
<xref linkend="gl-jb-kde"/>. To run the <application>Desktop
@@ -244,7 +224,7 @@
Switcher</guimenuitem></menuchoice>. If you do not see this
item in your menu, you may not have the
<filename>switchdesk-gui</filename> package installed. Refer
- to &FDPDOCS-URL; to learn how to use
+ to <ulink url="http://docs.fedoraproject.org/"></ulink> to learn how to use
<xref
linkend="gl-jb-yum"/> to install software
packages.
@@ -257,7 +237,7 @@
<para>
The <systemitem>eth0</systemitem> name represents the first
discovered <xref linkend="gl-jb-ethernet"/> interface in a
- &FED; system. If your &FED; system has more than one such
+ Fedora system. If your Fedora system has more than one such
interface, the others will be numbered
<systemitem>eth1</systemitem>,
<systemitem>eth2</systemitem>, and so on.
@@ -311,10 +291,10 @@
is a list of Frequently Asked Questions. Refer to
<ulink
url="http://fedora.redhat.com/about/faq/"/>
- for a FAQ about the &FP;. Refer to
+ for a FAQ about the Fedora Project. Refer to
<ulink
url="http://fedorafaq.org/"/> for a FAQ about
- using &FED;.
+ using Fedora.
</para>
</glossdef>
</glossentry>
@@ -396,7 +376,7 @@
<para>
The GNU C library, or <systemitem>glibc</systemitem>, is a
free and open source library of C functions. Most software
- programs for your &FED; system rely on
+ programs for your Fedora system rely on
<systemitem>glibc</systemitem> for basic common functions.
Refer to
<ulink
@@ -412,7 +392,7 @@
<acronym>GNOME</acronym>
is the short name for the GNOME Desktop, a product of the
GNOME Project. GNOME is at once a free desktop environment
- for UNIX-like operating systems such as &FED;, and a
+ for UNIX-like operating systems such as Fedora, and a
framework for software developers to develop graphical
utilities and interfaces. GNOME provides a complete set of
human interface guidelines, which means that GNOME strives
@@ -558,7 +538,7 @@
use IM to have conversations with individuals or groups.
America Online, an Internet service provider, popularized IM
in the 1990's, but many other providers such as Yahoo and
- Google offer similar services. &FED; has programs such as
+ Google offer similar services. Fedora has programs such as
<application>gaim</application> that allow you to use IM to
communicate with other Internet users.
</para>
@@ -583,7 +563,7 @@
character directly on a keyboard or other input hardware.
Input methods are widely used for entering ideographs and
other characters phonetically or by component, such as in
- Esat Asian languages. &FC; uses the
+ Esat Asian languages. Fedora uses the
<xref linkend="gl-jb-iiimf"/> platform by default, but also
offers other platforms such as <xref linkend="gl-jb-scim"/>.
</para>
@@ -612,12 +592,12 @@
<acronym>ISO</acronym>
is an acronym that stands for International Standards
Organization. It is also used as an abbreviation for the
- ISO-9660 format of a standard data CD-ROM. &FED; offers
- installation CDs for &FC; as downloadable files on the
+ ISO-9660 format of a standard data CD-ROM. Fedora offers
+ installation CDs for Fedora as downloadable files on the
Internet, in the form of CD image files sometimes called ISO
files. These files can be burned directly to CD media using
a CD-Recordable drive, and the resulting CD will contain all
- the files on the original &FC; media.
+ the files on the original Fedora media.
</para>
</glossdef>
</glossentry>
@@ -626,7 +606,7 @@
<glossdef>
<para>
KDE is a free and open desktop environment for UNIX-like
- operating systems such as &FED;. KDE also offers a complete
+ operating systems such as Fedora. KDE also offers a complete
development framework for writing graphical applications, as
well as an office application suite. Refer to
<ulink
@@ -641,7 +621,7 @@
<para>
A kernel is the core of an operating system, responsible for
managing memory and conducting hardware operations. The
- Linux kernel used in &FED; is free and open source software,
+ Linux kernel used in Fedora is free and open source software,
originally written by Linus Torvalds. Many computer
scientists and programmers from around the world now
contribute to its development.
@@ -653,7 +633,7 @@
<glossdef>
<para>
Kickstart is a facility that allows system administrators to
- automate the installation of &FED;. To use Kickstart, the
+ automate the installation of Fedora. To use Kickstart, the
administrator creates a configuration file which contains
all the information needed by
<xref
@@ -672,7 +652,7 @@
The <command>kudzu</command> utility usually runs at boot
time. The <command>kudzu</command> utility detects changes
in the system's hardware configuration, and configures the
- devices for use with &FED; software. Refer to
+ devices for use with Fedora software. Refer to
<ulink
url="http://fedora.redhat.com/projects/additional-projects/kudzu/"/>
for more information about <command>kudzu</command>.
@@ -704,7 +684,7 @@
collections of information. This information may be
practically anything, but LDAP is most often used to collect
information about organizations, including personnel and
- resource information. &FED; includes support for OpenLDAP,
+ resource information. Fedora includes support for OpenLDAP,
which is a free and open source implementation of LDAP. For
more information about OpenLDAP, refer to
<ulink url="http://www.openldap.org/"/>.
@@ -719,7 +699,7 @@
<acronym>LILO</acronym>
, is a small program used on older Linux systems to boot the
Linux kernel or some other operating systems. LILO has been
- superseded by <xref linkend="gl-jb-grub"/> in &FED;.
+ superseded by <xref linkend="gl-jb-grub"/> in Fedora.
</para>
</glossdef>
</glossentry>
@@ -770,7 +750,7 @@
<glossterm>memtest86</glossterm>
<glossdef>
<para>
- The &FC; Installation CD 1 includes a memory testing utility
+ The Fedora Installation CD 1 includes a memory testing utility
called <command>memtest86</command>. To perform memory
testing before you install Fedora Core, or to diagnose a RAM
problem, enter <command>memtest86</command> at the
@@ -797,13 +777,13 @@
<glossdef>
<para>
To use a disk device such as a CD, USB drive, or floppy
- diskette, you must first <command>mount</command> it. &FED;
+ diskette, you must first <command>mount</command> it. Fedora
uses a single unified file system for all attached devices.
Windows systems, on the other hand, use a "drive letter" for
each disk device, such as <systemitem>A:</systemitem> or
<systemitem>C:</systemitem>. When you
<command>mount</command> a disk device, its file system
- becomes part of the unified file system on &FED;. The device
+ becomes part of the unified file system on Fedora. The device
is mounted on a <firstterm>mount point</firstterm>, which is
a directory that points to that device, such as
<filename>/media/floppy</filename>. You must also unmount
@@ -845,7 +825,7 @@
includes a file manager called Nautilus which provides a
graphical display of your system and personal files.
Nautilus also allows you to configure your desktop and
- &FED;, browse your photo collection, access your network
+ Fedora, browse your photo collection, access your network
resources, and more, all from an integrated interface.
</para>
</glossdef>
@@ -880,16 +860,16 @@
<para>
Rawhide is a package repository which contains the latest
development versions of packages which will eventually be
- included in &FED;. These latest versions are sometimes
+ included in Fedora. These latest versions are sometimes
called "bleeding edge" <xref
linkend="gl-jb-package"/>,
since they often include new and untested technology. You
should consider the Rawhide repository "unstable," since any
Rawhide package <emphasis>might</emphasis> be badly broken
if the programmers are trying to add, change, or test
- features. If you want to develop programs for &FED;, you may
+ features. If you want to develop programs for Fedora, you may
want to install a system from Rawhide. If you only want to
- use a stable &FED; system, you should use the standard &FC;
+ use a stable Fedora system, you should use the standard Fedora
distribution instead.
</para>
</glossdef>
@@ -899,14 +879,14 @@
<glossdef>
<para>
Red Hat Enterprise Linux, or
- <acronym>&RHEL;</acronym>
+ <acronym>Red Hat Enterprise Linux</acronym>
, is a fully-supported enterprise-class operating system for
- open source computing. &RHEL; runs on many system
+ open source computing. Red Hat Enterprise Linux runs on many system
architectures, is certified by top enterprise software and
- hardware vendors, and is based on &FED; technology. Refer to
+ hardware vendors, and is based on Fedora technology. Refer to
<ulink
url="http://www.redhat.com/software/rhel/"/>
- for more information about &RHEL;.
+ for more information about Red Hat Enterprise Linux.
</para>
</glossdef>
</glossentry>
@@ -914,7 +894,7 @@
<glossterm>rhgb</glossterm>
<glossdef>
<para>
- &RH; Graphical Boot, or <application>
+ Red Hat Graphical Boot, or <application>
<acronym>rhgb</acronym>
</application>, is an optional component of the boot
process. The <application>rhgb</application> application
@@ -922,7 +902,7 @@
technical messages. The <application>rhgb</application>
application allows you to click a link to see the technical
boot messages if desired. Systems that have been upgraded
- from &RHL; to &FC; are not configured to include
+ from Red Hat Linux to Fedora are not configured to include
<application>rhgb</application>.
</para>
</glossdef>
@@ -932,7 +912,7 @@
<glossdef>
<para>
The <application>rhn-applet</application> utility was
- originally designed for use with &RHEL; and Red Hat Network.
+ originally designed for use with Red Hat Enterprise Linux and Red Hat Network.
It provides a notification and user interface for system
updates using <xref linkend="gl-jb-up2date"/>. It allows the
user to retrieve and install system updates, but this usage
@@ -949,8 +929,8 @@
<para>
<acronym>RPM</acronym>
stands for RPM Package Manager. RPM is a robust database
- system for maintaining software on &FED; systems. Software
- packaged for &FED; is distributed in special package files
+ system for maintaining software on Fedora systems. Software
+ packaged for Fedora is distributed in special package files
called RPM files, or RPMs. System owners use the
<command>rpm</command> utility to query the RPM database for
information about installed software. Although some
@@ -1021,7 +1001,7 @@
will create the same hash value.
</para>
<para>
- Download mirrors for &FC; <xref linkend="gl-jb-iso"/> image
+ Download mirrors for Fedora <xref linkend="gl-jb-iso"/> image
files also include a related SHA1SUMS file which contains
the hash values for the <xref linkend="gl-jb-iso"/> files.
Run <command>sha1sum</command> against the downloaded files
@@ -1069,7 +1049,7 @@
<glossdef>
<para>
The <application>system-config-packages</application>
- utility is a package installation for new &FC; systems which
+ utility is a package installation for new Fedora systems which
have no software updates installed yet. Since most
administrators and users update their system software
regularly, <application>system-config-packages</application>
@@ -1085,13 +1065,13 @@
<glossdef>
<para>
The <application>up2date</application> application is a
- utility for managing and updating software on &RHEL; and
- &FED; systems. The <application>up2date</application>
+ utility for managing and updating software on Red Hat Enterprise Linux and
+ Fedora systems. The <application>up2date</application>
application has been superseded by
<command>yum</command>-based utilities. Refer to
<ulink
url="http://fedora.redhat.com/docs/yum/"/> for
- more information on managing software on your &FED; system.
+ more information on managing software on your Fedora system.
</para>
</glossdef>
</glossentry>
@@ -1101,7 +1081,7 @@
<para>
The <command>vino</command> utility is a variant of
<xref
- linkend="gl-jb-vnc"/> used in &FC; 4 and beyond
+ linkend="gl-jb-vnc"/> used in Fedora 4 and beyond
for remote assistance and control.
</para>
</glossdef>
@@ -1113,7 +1093,7 @@
Virtual Network Computing, or
<application>VNC</application>, is communication software
that allows you to view and interact with another computer
- over the network. &FED; includes VNC server and client
+ over the network. Fedora includes VNC server and client
software, as well as the customized
<xref
linkend="gl-jb-vino"/> package. Refer to
@@ -1131,7 +1111,7 @@
used in most PC systems. Users and developers tend to use
this term rather broadly, since the very old 8086 and 80286
microprocessors are rarely seen and not usable with most
- modern Linux distributions. In &FED; terms, this
+ modern Linux distributions. In Fedora terms, this
abbreviation stands for Intel and Intel-compatible
processors, Pentium class and above.
</para>
@@ -1142,7 +1122,7 @@
<glossdef>
<para>
XFS is a scalable journaling filesystem developed by SGI and
- available for &FED; systems. Refer to
+ available for Fedora systems. Refer to
<ulink
url="http://oss.sgi.com/projects/xfs/faq.html#whatisxfs"/>
for more information about XFS.
@@ -1155,7 +1135,7 @@
<para>
The X Window System, or simply "X," is the underlying
technology for GNOME, KDE, and other graphical environments
- used in &FED;. X is a network-based system for displaying
+ used in Fedora. X is a network-based system for displaying
and communicating graphical input and output. It is very
flexible and is suitable for a wide variety of
configurations such as remote desktops and thin-client
@@ -1186,7 +1166,7 @@
The Yellow Dog Updater, or
<acronym>yum</acronym>
, is a complete software management utility for RPM-based
- systems such as &FED;. It automatically determines software
+ systems such as Fedora. It automatically determines software
requirements, or <firstterm>dependencies</firstterm>, and
uses this data to install, update, or remove packages. Refer
to <ulink url="http://linux.duke.edu/projects/yum/"/> for
@@ -1194,13 +1174,4 @@
</para>
</glossdef>
</glossentry>
- </glossdiv>
</glossary>
-</section>
-
-<!--
-Local variables:
-mode: xml
-fill-column: 72
-End:
--->
diff --git a/publican.cfg b/publican.cfg
index 1911049..3f69215 100644
--- a/publican.cfg
+++ b/publican.cfg
@@ -1,12 +1,10 @@
# Config::Simple 4.59
# Tue Nov 10 21:00:45 2009
-docname: jargon-buster
debug: 1
xml_lang: en-US
type: Article
brand: fedora
-product: fedora
os_ver:
src_url: http://sparks.fedorapeople.org/source/
More information about the docs-commits
mailing list