docs-common/common/entities Makefile,1.12,1.13
by fedora-docs-commits＠redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24526
Modified Files:
Makefile
Log Message:
Fixed template typo that wrote new .ENT files into a file called '@'.
You should now delete the '@' file in your copy of this directory.
Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 3 Mar 2006 00:13:18 -0000 1.12
+++ Makefile 3 Mar 2006 19:40:16 -0000 1.13
@@ -175,7 +175,7 @@
#######################################################################
define ENT_template
entities-${1}.ent:: entities-${1}.xml entities.pot
- xsltproc -o @$@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
+ xsltproc -o $$@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
entities.xsl entities-${1}.xml
endef
$(foreach L,${PRI_LANG} ${OTHERS},$(eval $(call ENT_template,${L})))
18 years, 3 months
- 1
- 0
release-notes/po zh_CN.po,1.3,1.4
by fedora-docs-commits＠redhat.com
Author: bbbush
Update of /cvs/docs/release-notes/po
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11377
Modified Files:
zh_CN.po
Log Message:
far from ready, though
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 zh_CN.po
Index: zh_CN.po
===================================================================
RCS file: /cvs/docs/release-notes/po/zh_CN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh_CN.po 23 Feb 2006 14:42:00 -0000 1.3
+++ zh_CN.po 3 Mar 2006 14:07:40 -0000 1.4
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: RELEASE-NOTES\n"
-"POT-Creation-Date: 2006-02-20 22:10+0800\n"
-"PO-Revision-Date: 2006-02-22 05:34+0800\n"
+"POT-Creation-Date: 2006-02-27 20:01+0800\n"
+"PO-Revision-Date: 2006-03-02 04:58+0800\n"
"Last-Translator: Yuan Yijun <bbbush.yuan(a)gmail.com>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -10,19 +10,20 @@
"Content-Transfer-Encoding: 8bit\n"
#: en/Xorg.xml:5(title) en/Welcome.xml:5(title) en/WebServers.xml:5(title)
-#: en/SystemDaemons.xml:5(title) en/ServerTools.xml:5(title)
-#: en/SecuritySELinux.xml:5(title) en/Security.xml:5(title)
-#: en/Samba.xml:5(title) en/ProjectOverview.xml:5(title)
-#: en/Printing.xml:5(title) en/PackageNotesJava.xml:5(title)
-#: en/PackageChanges.xml:5(title) en/OverView.xml:5(title)
-#: en/Networking.xml:5(title) en/Multimedia.xml:5(title)
-#: en/Legacy.xml:5(title) en/Kernel.xml:5(title) en/Java.xml:5(title)
-#: en/Installer.xml:5(title) en/I18n.xml:5(title) en/FileSystems.xml:5(title)
-#: en/FileServers.xml:5(title) en/Feedback.xml:5(title)
-#: en/Entertainment.xml:5(title) en/Extras.xml:5(title)
-#: en/DevelToolsGCC.xml:5(title) en/DevelTools.xml:5(title)
-#: en/Desktop.xml:5(title) en/DatabaseServers.xml:5(title)
-#: en/Colophon.xml:5(title) en/ArchSpecificx86.xml:5(title)
+#: en/Virtualization.xml:5(title) en/SystemDaemons.xml:5(title)
+#: en/ServerTools.xml:5(title) en/SecuritySELinux.xml:5(title)
+#: en/Security.xml:5(title) en/Samba.xml:5(title)
+#: en/ProjectOverview.xml:5(title) en/Printing.xml:5(title)
+#: en/PackageNotes.xml:5(title) en/PackageChanges.xml:5(title)
+#: en/OverView.xml:5(title) en/Networking.xml:5(title)
+#: en/Multimedia.xml:5(title) en/Legacy.xml:5(title) en/Kernel.xml:5(title)
+#: en/Java.xml:5(title) en/Installer.xml:5(title) en/I18n.xml:5(title)
+#: en/FileSystems.xml:5(title) en/FileServers.xml:5(title)
+#: en/Feedback.xml:5(title) en/Entertainment.xml:5(title)
+#: en/Extras.xml:5(title) en/DevelToolsGCC.xml:5(title)
+#: en/DevelTools.xml:5(title) en/Desktop.xml:5(title)
+#: en/DatabaseServers.xml:5(title) en/Colophon.xml:5(title)
+#: en/BackwardsCompatibility.xml:5(title) en/ArchSpecificx86.xml:5(title)
#: en/ArchSpecificx86_64.xml:5(title) en/ArchSpecificPPC.xml:5(title)
#: en/ArchSpecific.xml:5(title)
msgid "Temp"
@@ -45,83 +46,128 @@
#: en/Xorg.xml:12(para)
msgid ""
"X.org X11 is an open source implementation of the X Window System. It "
-"provides the basic low level functionality which full fledged graphical user "
-"interfaces (GUIs) such as GNOME and KDE are designed upon."
-msgstr ""
-"X.org X11 ��� X ���������������������������������������������������������������������������������������������"
-"��� (GUI) ������ GNOME ��� KDE ���������������"
+"provides the basic low-level functionality upon which full-fledged graphical "
+"user interfaces (GUIs) such as GNOME and KDE are designed. For more "
+"information about X.org, refer to <ulink url=\"http://xorg.freedesktop.org/"
+"wiki/\">http://xorg.freedesktop.org/wiki/</ulink>."
+msgstr "X.org X11 ��� X ������������������������������������������������������������������������������������������������ (GUI) ������ GNOME ��� KDE ������������������������ <ulink url=\"http://xorg.freedesktop.org/wiki/\"/>"
#: en/Xorg.xml:13(para)
msgid ""
-"For more information about Xorg refer to <ulink url=\"http://xorg."
-"freedesktop.org/wiki/\">http://xorg.freedesktop.org/wiki/</ulink>"
-msgstr ""
-"������������ Xorg ������������������ <ulink url=\"http://xorg.freedesktop.org/wiki/"
-"\">http://xorg.freedesktop.org/wiki/</ulink>"
+"You may use <emphasis>Applications > System Settings > Display</"
+"emphasis> or <emphasis role=\"strong\">system-config-display</emphasis> to "
+"configure the settings. The configuration file for X.org is located in "
+"<code>/etc/X11/xorg.conf</code>."
+msgstr "������������ Applications > System Settings > Display ��������� <command>system-config-display</command> ������������Xorg ������������������ <filename>/etc/X11/xorg.conf</filename>���"
+
+#: en/Xorg.xml:14(para)
+msgid ""
+"X.org X11R7 is the first modular release of X.org, which, among several "
+"other benefits, promotes faster updates and helps programmers rapidly "
+"develop and release specific components. More information on the current "
+"status of the X.org modularization effort in Fedora is available at <ulink "
+"url=\"http://fedoraproject.org/wiki/Xorg/Modularization\">http://"
+"fedoraproject.org/wiki/Xorg/Modularization</ulink>."
+msgstr "X.org X11R7 ��� X.org ���������������������������������������������������������������������������������������������������������������������������������������Fedora ��� X.org ��������������������������������� <ulink url=\"http://fedoraproject.org/wiki/Xorg/Modularization\">http://fedoraproject.org/wiki/Xorg/Modularization</ulink>���"
+
+#: en/Xorg.xml:17(title)
+msgid "X.org X11R7 End-User Notes"
+msgstr "X.org X11R7 ������������"
+
+#: en/Xorg.xml:19(title)
+msgid "Installing Third Party Drivers"
+msgstr "���������������������"
+
+#: en/Xorg.xml:20(para)
+msgid ""
+"Before you install any third party drivers from any vendor, including ATI or "
+"nVidia, please read <ulink url=\"http://fedoraproject.org/wiki/"
+"Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/"
+"Xorg/3rdPartyVideoDrivers</ulink>."
+msgstr "���������������������(������ ATI ��� nVidia)��������������������������������������������� <ulink url=\"http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers\">http://fedoraproject.org/wiki/Xorg/3rdPartyVideoDrivers</ulink>���"
-#: en/Xorg.xml:15(para)
+#: en/Xorg.xml:25(para)
msgid ""
-"You can use Applications => System Settings => Display or system-"
-"config-display to configure the settings. The configuration file for Xorg is "
-"located in /etc/X11/xorg.conf"
-msgstr "������������ Applications => System Settings = > Display ��������� <command>system-config-display</command> ������������Xorg ������������������ <filename>/etc/X11/xorg.conf</filename>���"
+"The <code>xorg-x11-server-Xorg</code> package install scripts automatically "
+"remove the <code>RgbPath</code> line from the <code>xorg.conf</code> file if "
+"it is present. You may need to reconfigure your keyboard differently from "
+"what you are used to. You are encouraged to subscribe to the upstream <ulink "
+"url=\"mailto:xorg@freedesktop.org\">xorg(a)freedesktop.org</ulink> mailing "
+"list if you do need assistance reconfiguring your keyboard."
+msgstr "<code>xorg-x11-server-Xorg</code> ��������������������������������� <code>xorg.conf</code> ������ <code>RgbPath</code> ������������������������������������������������������������������������������������������������������������ <ulink url=\"mailto:xorg@freedesktop.org\">xorg(a)freedesktop.org</ulink> ���������������"
-#: en/Xorg.xml:16(para)
-#, fuzzy
+#: en/Xorg.xml:28(title)
+msgid "X.org X11R7 Developer Overview"
+msgstr "X.org X11R7 ���������������"
+
+#: en/Xorg.xml:29(para)
msgid ""
-"Modular X.Org X11R7 RC2 was released into Fedora development (rawhide) on "
-"November 16, 2005. This is the first modular release of Xorg which among "
-"several other benefits, enable users to receive updates in a faster pace and "
-"helps developers to develop and release specific components in a rapid "
-"fashion."
+"The following list includes some of the more visible changes for developers "
+"in X11R7:"
+msgstr "������������������ X11R7 ���������������������������������������"
+
+#: en/Xorg.xml:32(para)
+msgid ""
+"The entire buildsystem has changed from <code>imake</code> to the GNU "
+"<code>autotools</code> collection."
+msgstr "��������������������� <command>imake</command> ������ GNU autotools ������������"
+
+#: en/Xorg.xml:35(para)
+msgid ""
+"Libraries now install <code>pkgconfig</code><code>*.pc</code> files, which "
+"should now always be used by software that depends on these libraries, "
+"instead of hard coding paths to them in <code>/usr/X11</code><code>R6/lib </"
+"code> or elsewhere."
msgstr ""
-"Modular (������������) X.Org X11R7 RC2 ��� 2005 ��� 11 ��� 16 ��������� &FED; ������"
-"������ (<firstterm>rawhide</firstterm>)��������� Xorg ������������������������������������������"
-"������������������������������������ Xorg ���������������������������������������������������������������������"
-"���������������������������������������"
+"��������������������������� <command>pkgconfig</command><filename>*.pc</filename> ���"
+"������������������������������������������������������������������������ <filename>/usr/X11R6/lib</"
+"filename> ������������������������"
-#: en/Xorg.xml:17(para)
+#: en/Xorg.xml:40(para)
#, fuzzy
msgid ""
-"More information on the current status of the Xorg modularization effort in "
-"Fedora is available from <ulink url=\"/Xorg/Modularization\">http://"
-"fedoraproject.org/wiki/Xorg/Modularization</ulink>"
+"Everything is now installed directly into <code>/usr</code> instead of "
+"<code>/usr/X11</code><code>R6</code>. All software that hard codes paths to "
+"anything in <code>/usr/X11</code><code>R6</code> must now be changed, "
+"preferably to dynamically detect the proper location of the object. "
+"Developers are <emphasis role=\"strong\">strongly</emphasis> advised against "
+"hard-coding the new X11R7 default paths."
msgstr ""
-"������ Xorg ��������������������������������� <ulink url=\"/Xorg/Modularization\">http://"
-"fedoraproject.org/wiki/Xorg/Modularization</ulink>"
+"������������������������������ <filename>/usr</filename> ��������������� <filename>/usr/"
+"X11R6</filename>������������������������ <filename>/usr/X11R6</filename> ������������������"
+"��������������������������������������������������������������� X11R7 ������������������������������������������"
+"������������������������������������������������������"
-#: en/Xorg.xml:21(title)
-#, fuzzy
-msgid "Xorg X11R7.0 Developer Notes"
-msgstr "Xorg X11R7 ���������������"
+#: en/Xorg.xml:45(para)
+msgid ""
+"Every library has its own private source RPM package, which creates a "
+"runtime binary subpackage and a <code>-devel</code> subpackage."
+msgstr "��������������������������������������� RPM��������������������������������������������������������������� <code>-devel</code> ���������������"
-#: en/Xorg.xml:22(para)
+#: en/Xorg.xml:50(title)
#, fuzzy
+msgid "X.org X11R7 Developer Notes"
+msgstr "Xorg X11R7.0 ���������������"
+
+#: en/Xorg.xml:51(para)
msgid ""
-"X11R7.0 is included in this release and there are a number of things that "
[...9439 lines suppressed...]
+
+#, fuzzy
+#~ msgid ""
+#~ "SCIM has replaced IIIMF as the language input framework in Fedora Core in "
+#~ "this release."
+#~ msgstr ""
+#~ "<inlinemediaobject><placeholder-1/><placeholder-2/></inlinemediaobject> ���"
+#~ "��� Fedora Core ������������ SCIM ��������� IIIMF ���������������������������������"
+
+#, fuzzy
+#~ msgid ""
+#~ "Version 2 of Netatalk uses a different method to store file resource "
+#~ "forks from the previous version, and may require a different file name "
+#~ "encoding scheme. Please read the documentation and plan your migration "
+#~ "before upgrading."
+#~ msgstr ""
+#~ "Netatalk ������������������������������������������������������������������������������������������������"
+#~ "���������������������������������������������������������������"
+
+#~ msgid "Feedback"
+#~ msgstr "������"
+
+#~ msgid ""
+#~ "Thanks for your interest in helping us with the release notes by "
+#~ "providing feedback. This section explains how you can give that feedback."
+#~ msgstr "���������������������������������������������������������������������������������������������"
+
+#~ msgid "Release Notes Feedback Procedure"
+#~ msgstr "������������������������"
+
+#~ msgid ""
+#~ "Edit content directly at <ulink url=\"/Docs/Beats\">Docs/Beats</ulink>"
+#~ msgstr "������������ <ulink url=\"/Docs/Beats\">Docs/Beats</ulink> ���������"
+
+#~ msgid ""
+#~ "A <ulink url=\"/DocsProject/ReleaseNotes/Beats\">release note beat</"
+#~ "ulink> is an area of the release notes that is the responsibility of one "
+#~ "or more content contributors to oversee."
+#~ msgstr ""
+#~ "������<ulink url=\"/DocsProject/ReleaseNotes/Beats\">������������ beat</ulink> "
+#~ "������������������������������������������������������������������������������"
+
+#~ msgid "yum groupinfo \"Games and Entertainment\""
+#~ msgstr "yum groupinfo \"Games and Entertainment\""
+
+#~ msgid ""
+#~ "For help using <command>yum</command> to install the assorted game "
+#~ "packages, refer to the guide available at:"
+#~ msgstr ""
+#~ "������������ <command>yum</command> ���������������������������������������������������������������"
+#~ "������"
+
+#~ msgid "http://fedora.redhat.com/docs/yum/"
+#~ msgstr "http://fedora.redhat.com/docs/yum/"
+
+#~ msgid ""
+#~ "Fedora Extras is part of the larger Fedora Project and is a volunteer-"
+#~ "based community effort to create a repository of packages that compliment "
+#~ "Fedora Core. The Fedora Extras repository is enabled by default."
+#~ msgstr ""
+#~ "Fedora Extras ��� Fedora Project ���������������������������������������������������������������"
+#~ "������ Fedora Core ������������������������Fedora Extras ������������������������"
+
+#~ msgid ""
+#~ "If you would like to install any software available from Fedora extras "
+#~ "you can use yum."
+#~ msgstr "������������������ Fedora Extras ��������������������������� yum���"
+
+#~ msgid "yum install <packagename>"
+#~ msgstr "yum install <packagename>"
+
+#~ msgid ""
+#~ "Where <packagename> is the name of the package you want to install. "
+#~ "For example, if you wanted to install the abiword package, the command "
+#~ "<code>yum install abiword</code> automatically installs the package and "
+#~ "all dependencies."
+#~ msgstr ""
+#~ "������ <packagename> ������������������������������������������������������������ abiword "
+#~ "������������������ <code>yum install abiword</code> ���������������������������������������"
+#~ "������"
+
+#, fuzzy
+#~ msgid ""
+#~ "GNOME 2.13.2 and KDE 3.5 Release Candidate 2 has been included in Fedora "
+#~ "Core 5 test 2. GNOME 2.14 (or a release candidate) is scheduled to be "
+#~ "available as part of Fedora Core 5."
+#~ msgstr ""
+#~ "GNOME 2.13.2 ��� KDE 3.5 ������������ 2 ������������ &FC; &LOCALVER; ������"
+#~ "GNOME 2.14 (���������������) ��������������� &FC; 5 ���������������"
+
+#, fuzzy
+#~ msgid ""
+#~ "The current test release has GNOME 2.12.1, together with some previews of "
+#~ "technology from the forthcoming GNOME 2.14. Feedback on these packages is "
+#~ "especially appreciated."
+#~ msgstr ""
+#~ "������������������������ GNOME 2.12.1������������������������ GNOME 2.14 ���������������������"
+#~ "���������������������������������������������������������"
+
+#, fuzzy
+#~ msgid "system-config-mouse Removed"
+#~ msgstr "system-config-securitylevel"
+
+#, fuzzy
+#~ msgid ""
+#~ "system-config-mouse configuration utility has been dropped from this "
+#~ "release since synaptic and 3 button mouse configuration is being done "
+#~ "automatically during installation and serial mice are not formally "
+#~ "supported in Fedora Core anymore."
+#~ msgstr ""
+#~ "<application>system-config-monitor</application> ������������������������������������"
+#~ "������������������������������������������������������������������������������������ &FC; ������������"
+
+#~ msgid "No changes of note."
+#~ msgstr "���������"
+
+#~ msgid "Draft"
+#~ msgstr "������"
+
+#~ msgid "This is a draft, so it is incomplete and imperfect."
+#~ msgstr "������������������������������������������"
+
+#, fuzzy
+#~ msgid ""
+#~ "Fedora includes several system libraries and software for compatibility "
+#~ "with older software. These software are part of the \"Legacy Software "
+#~ "Development\" group which are not installed by default. Users who require "
+#~ "this functionality can select this group during installation or run the "
+#~ "following the command post-installation."
+#~ msgstr ""
+#~ "&FC; ���������������������������������������������������������������\"Legacy Software "
+#~ "Development\"������������������������������������������������������������������������������������������"
+#~ "������������������������������"
+
+#, fuzzy
+#~ msgid ""
+#~ "The following information represents the minimum hardware requirements "
+#~ "necessary to successfully install Fedora Core ."
+#~ msgstr ""
+#~ "������������������������������ &DISTRO; &DISTROVER; test1 ���������������������������"
+#~ "������"
+
+#~ msgid ""
+#~ "The compatibility/availability of other hardware components (such as "
+#~ "video and network cards) may be required for specific installation modes "
+#~ "and/or post-installation usage."
+#~ msgstr ""
+#~ "������������������������������/��������������������������������������������������������� (������������������"
+#~ "���) ���������������"
+
+#~ msgid "CPU Requirements"
+#~ msgstr "CPU ������"
+
+#, fuzzy
+#~ msgid "This section lists the disk space required to install Fedora Core ."
+#~ msgstr "������������������������ &DISTRO; &DISTROVER; test1 ���������������"
+
+#, fuzzy
+#~ msgid "This section lists the memory required to install Fedora Core ."
+#~ msgstr "������������������������ &DISTRO; &DISTROVER; test1 ���������������"
+
+#~ msgid "This list is for 32-bit x86 systems:"
+#~ msgstr "��������������� 32 ��� x86 ���������"
+
+#~ msgid "Minimum for text-mode: 64MB"
+#~ msgstr "������������������������64MiB"
+
+#, fuzzy
+#~ msgid ""
+#~ "Installer package screen selection interface is being redesigned in the "
+#~ "Fedora development version. Fedora Core does not provide an option to "
+#~ "select the installation type such as Personal Desktop, Workstation, "
+#~ "Server and custom."
+#~ msgstr "���������������������������������&FC; &LOCALVER; ������������������������������"
+
+#~ msgid "x86_64 Installation Notes"
+#~ msgstr "x86_64 ������������"
+
+#~ msgid "No differences installing for x86_64."
+#~ msgstr "X86_64 ���������������������"
+
+#~ msgid ""
+#~ "This section lists the minimum PowerPC (PPC) hardware needed to install "
+#~ "Fedora Core 4."
+#~ msgstr ""
+#~ "��������������������� PowerPC (PPC) ��������� &FC; &LOCALVER; ������������������"
+#~ "������"
+
+#~ msgid ""
+#~ "The bootloader should automatically boot the appropriate 32-bit or 64-bit "
+#~ "installer. Power management support, including sleep and backlight level "
+#~ "management, is present in the apmud package, which is in Fedora Extras. "
+#~ "Fedora Extras for Fedora Core is configured by default for yum. Following "
+#~ "installation, apmud can be installed by running yum install apmud."
+#~ msgstr ""
+#~ "��������������������������������� 32 ������ 64 ������������������������������������������������������������"
+#~ "������������������������ <command>apmud</command> ������������������������ &FEX; ������"
+#~ "��������� &FC; ��������� &FEX; ������������ <command>yum</command> ���������"
+#~ "������������������������������������������������ <command>yum install apmud</command> ������"
+#~ "��� <command>apmud</command>���"
18 years, 4 months
- 1
- 0
install-guide/en fedora-install-guide-intro.xml,1.10,1.11
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/install-guide/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18030
Modified Files:
fedora-install-guide-intro.xml
Log Message:
Minor style corrections
Index: fedora-install-guide-intro.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-intro.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fedora-install-guide-intro.xml 3 Mar 2006 02:43:40 -0000 1.10
+++ fedora-install-guide-intro.xml 3 Mar 2006 03:25:42 -0000 1.11
@@ -170,17 +170,17 @@
<title>Storage</title>
<!-- SE: There may also be additional considerations when installing on machines backed by a SAN. -->
<para>
- A &FED; system requires a minimum of 700Mb storage for a
- command-line system. Assign at least 3Gb for a desktop system
- with the default applications. You may install multiple copies
- of &FED; on the same computer.
+ A &FED; system requires a minimum of 700 MB storage for a
+ command-line system. A desktop system with the default
+ applications requires at least 3 GB of storage. You may install
+ multiple copies of &FED; on the same computer.
</para>
<para>
Configure any RAID functions provided by the mainboard of your
computer, or attached controller cards, before you begin the
- installation process. &FED; may automatically detect configured
- RAID devices and use the storage that they provide.
+ installation process. &FED; can automatically detect many RAID
+ devices and use any storage they provide.
</para>
</section>
@@ -262,7 +262,7 @@
</para>
<para>
- To determine the complete the directory path for the
+ To determine the complete directory path for the
installation files, add
<filename>/&FCLOCALVER;/<replaceable>architecture</replaceable>/os/</filename>
to the path shown on the webpage.
@@ -395,13 +395,13 @@
</listitem>
<listitem>
<para>
- Hard drive, either attached by USB, or internal to the
+ hard drive, either attached by USB, or internal to the
computer
</para>
</listitem>
<listitem>
<para>
- Network installation server, using either HTTP, FTP, or NFS
+ network installation server, using either HTTP, FTP, or NFS
</para>
</listitem>
</itemizedlist>
@@ -431,7 +431,7 @@
</listitem>
<listitem>
<para>
- Network interface (via PXE)
+ network interface (via PXE)
</para>
</listitem>
</itemizedlist>
@@ -537,7 +537,6 @@
<!--
Local variables:
mode: xml
-sgml-parent-document:("fedora-install-guide.xml" "book" "preface")
fill-column: 72
End:
-->
18 years, 4 months
- 1
- 0
install-guide/en fedora-install-guide-adminoptions.xml, 1.7, 1.8 fedora-install-guide-diskpartitioning.xml, 1.8, 1.9 fedora-install-guide-intro.xml, 1.9, 1.10 fedora-install-guide-locale.xml, 1.7, 1.8 fedora-install-guide-nextsteps.xml, 1.6, 1.7 fedora-install-guide-other-instmethods.xml, 1.7, 1.8 fedora-install-guide-packageselection.xml, 1.7, 1.8 fedora-install-guide-techref.xml, 1.6, 1.7
by fedora-docs-commits＠redhat.com
Author: elliss
Update of /cvs/docs/install-guide/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15995/en
Modified Files:
fedora-install-guide-adminoptions.xml
fedora-install-guide-diskpartitioning.xml
fedora-install-guide-intro.xml fedora-install-guide-locale.xml
fedora-install-guide-nextsteps.xml
fedora-install-guide-other-instmethods.xml
fedora-install-guide-packageselection.xml
fedora-install-guide-techref.xml
Log Message:
- Removed Xen option from Task Selection.
- Broke out subsections in Boot Options.
- Added text to Disk Partitioning to address #170728.
- Added Storage section to Before You Begin.
Index: fedora-install-guide-adminoptions.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-adminoptions.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-adminoptions.xml 2 Mar 2006 22:57:14 -0000 1.7
+++ fedora-install-guide-adminoptions.xml 3 Mar 2006 02:43:40 -0000 1.8
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -45,8 +46,10 @@
Prompt</title>
<para>
- You can use the <prompt>boot:</prompt> prompt to specify a number
- of settings for the installation system, including:
+ You can use the
+ <prompt>boot:</prompt>
+ prompt to specify a number of settings for the installation
+ system, including:
</para>
<itemizedlist>
@@ -278,9 +281,9 @@
</note>
</section>
</section>
- <section id="sn-remote-installation">
+ <section id="sn-remoteaccess-installation">
<title>Enabling Remote Access to the Installation System</title>
-
+<!-- SE: Note that there is also a "display" option that redirects anaconda's X display to an X server on another system. -->
<para>
You may access either graphical or text interfaces for the
installation system from any other system. Access to a text mode
@@ -316,39 +319,42 @@
running in <firstterm>listening mode</firstterm>.
</para>
- <para>
- <indexterm>
- <primary>VNC (Virtual Network Computing)</primary>
- <secondary>enabling</secondary>
- </indexterm>
- To enable remote graphical access to the installation system,
- enter two options at the prompt:
- </para>
+ <section id="sn-remoteaccess-installation-vnc">
+ <title>Enabling Remote Access with VNC</title>
+
+ <para>
+ <indexterm>
+ <primary>VNC (Virtual Network Computing)</primary>
+ <secondary>enabling</secondary>
+ </indexterm>
+ To enable remote graphical access to the installation system,
+ enter two options at the prompt:
+ </para>
<screen>
<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable></userinput>
</screen>
- <para>
- The <option>vnc</option> option enables the VNC service. The
- <option>vncpassword</option> option sets a password for remote
- access. The example shown above sets the password as
- <systemitem>qwerty</systemitem>.
- </para>
+ <para>
+ The <option>vnc</option> option enables the VNC service. The
+ <option>vncpassword</option> option sets a password for remote
+ access. The example shown above sets the password as
+ <userinput>qwerty</userinput>.
+ </para>
- <note>
- <title>VNC Passwords</title>
+ <note>
+ <title>VNC Passwords</title>
+
+ <para>
+ The VNC password must be at least six characters long.
+ </para>
+ </note>
<para>
- The VNC password must be at least six characters long.
+ Specify the language, keyboard layout and network settings for
+ the installation system with the screens that follow. You may
+ then access the graphical interface through a VNC client. The
+ installation system displays the correct connection setting for
+ the VNC client:
</para>
- </note>
-
- <para>
- Specify the language, keyboard layout and network settings for the
- installation system with the screens that follow. You may then
- access the graphical interface through a VNC client. The
- installation system displays the correct connection setting for
- the VNC client:
- </para>
<screen>
<computeroutput><![CDATA[Starting VNC...
The VNC server is now running.
@@ -356,105 +362,113 @@
Starting graphical installation...
Press <enter> for a shell]]></computeroutput>
</screen>
- <para>
- You may then login to the installation system with a VNC client.
- To run the <application>vncviewer</application> client on &FED;,
- choose <menuchoice> <guimenu>Applications</guimenu>
- <guisubmenu>Accessories</guisubmenu><guimenuitem>VNC
- Viewer</guimenuitem></menuchoice>, or type the command
- <application>vncviewer</application> in a terminal window. Enter
- the server and display number in the <guilabel>VNC
- Server</guilabel> dialog. For the example above, the <guilabel>VNC
- Server</guilabel> is
- <systemitem>computer.mydomain.com:1</systemitem>.
- </para>
+ <para>
+ You may then login to the installation system with a VNC client.
+ To run the <application>vncviewer</application> client on &FED;,
+ choose <menuchoice> <guimenu>Applications</guimenu>
+ <guisubmenu>Accessories</guisubmenu><guimenuitem>VNC
+ Viewer</guimenuitem></menuchoice>, or type the command
+ <application>vncviewer</application> in a terminal window. Enter
+ the server and display number in the <guilabel>VNC
+ Server</guilabel> dialog. For the example above, the
+ <guilabel>VNC Server</guilabel> is
+ <userinput>computer.mydomain.com:1</userinput>.
+ </para>
+ </section>
- <para>
- To have the installation system automatically connect to a VNC
- client, first start the client in
- <indexterm>
- <primary>VNC (Virtual Network Computing)</primary>
- <secondary>listening mode</secondary>
- </indexterm>
- listening mode. On &FED; systems, use the <option>-listen</option>
- option to run <application>vncviewer</application> as a listener.
- In a terminal window, enter the command:
- </para>
+ <section id="sn-remoteaccess-installation-vnclistener">
+ <title>Connecting the Installation System to a VNC Listener</title>
+
+ <para>
+ To have the installation system automatically connect to a VNC
+ client, first start the client in
+ <indexterm>
+ <primary>VNC (Virtual Network Computing)</primary>
+ <secondary>listening mode</secondary>
+ </indexterm>
+ listening mode. On &FED; systems, use the
+ <option>-listen</option> option to run
+ <application>vncviewer</application> as a listener. In a
+ terminal window, enter the command:
+ </para>
<screen>
<userinput>vncviewer -listen</userinput>
</screen>
- <note>
- <title>Firewall Reconfiguration Required</title>
+ <note>
+ <title>Firewall Reconfiguration Required</title>
+
+ <para>
+ By default, the <application>vncviewer</application> utility
+ listens on TCP port 5500. To update the &FED; firewall
+ configuration to permit connections to this port from other
+ systems, choose <menuchoice> <guimenu>System</guimenu>
+ <guisubmenu>Administration</guisubmenu> <guimenuitem>Security
+ Level and Firewall</guimenuitem> </menuchoice>, enter
+ <userinput>5500:tcp</userinput> in the <guilabel>Other
+ ports:</guilabel> field, and select <guilabel>OK</guilabel>.
+ </para>
+ </note>
<para>
- By default, the <application>vncviewer</application> utility
- listens on TCP port <systemitem>5500</systemitem>. To update the
- &FED; firewall configuration to permit connections to this port
- from other systems, choose <menuchoice>
- <guimenu>System</guimenu>
- <guisubmenu>Administration</guisubmenu> <guimenuitem>Security
- Level and Firewall</guimenuitem> </menuchoice>, enter
- <userinput>5500:tcp</userinput> in the <guilabel>Other
- ports:</guilabel> field, and select <guilabel>OK</guilabel>.
+ Once the listening client is active, start the installation
+ system and set the VNC options at the
+ <prompt>boot:</prompt>
+ prompt. In addition to <option>vnc</option> and
+ <option>vncpassword</option> options, use the
+ <option>vncconnect</option> option to specify the name or IP
+ address of the system that has the listening client. To specify
+ the TCP port for the listener, add a colon and the port number
+ to the name of the system.
</para>
- </note>
- <para>
- Once the listening client is active, start the installation system
- and set the VNC options at the
- <prompt>boot:</prompt>
- prompt. In addition to <option>vnc</option> and
- <option>vncpassword</option> options, use the
- <option>vncconnect</option> option to specify the name or IP
- address of the system that has the listening client. To specify
- the TCP port for the listener, add a colon and the port number to
- the name of the system.
- </para>
-
- <para>
- For example, to connect to a VNC client on the system
- <systemitem
+ <para>
+ For example, to connect to a VNC client on the system
+ <systemitem
class="systemname">desktop.mydomain.com</systemitem>
- on the port <systemitem>5500</systemitem>, enter the following at
- the
- <prompt>boot:</prompt>
- prompt:
- </para>
+ on the port 5500, enter the following at the
+ <prompt>boot:</prompt>
+ prompt:
+ </para>
<screen>
<userinput>linux vnc vncpassword=<replaceable>qwerty</replaceable> vncconnect=<replaceable>desktop.mydomain.com:5500</replaceable></userinput>
</screen>
- <para>
- To enable remote access to a text mode installation, use the
- <indexterm>
- <primary>Telnet</primary>
- </indexterm>
- <option>telnet</option> option at the
- <prompt>boot:</prompt>
- prompt:
- </para>
+ </section>
+
+ <section id="sn-telnet-installation">
+ <title>Enabling Remote Access with Telnet</title>
+
+ <para>
+ To enable remote access to a text mode installation, use the
+ <indexterm>
+ <primary>Telnet</primary>
+ </indexterm>
+ <option>telnet</option> option at the
+ <prompt>boot:</prompt>
+ prompt:
+ </para>
<!--SE: The "text" option is necessary to stop the installer switching to graphical mode and losing the telnet interface. This is expected behavior. -->
<screen>
<userinput>linux text telnet</userinput>
</screen>
- <para>
- You may then connect to the installation system with the
- <command>telnet</command> utility. The <command>telnet</command>
- command requires the name or IP address of the installation
- system:
- </para>
+ <para>
+ You may then connect to the installation system with the
+ <command>telnet</command> utility. The <command>telnet</command>
+ command requires the name or IP address of the installation
+ system:
+ </para>
<screen>
<userinput>telnet computer.mydomain.com</userinput>
</screen>
- <caution>
- <title>Telnet Access Requires No Password</title>
+ <caution>
+ <title>Telnet Access Requires No Password</title>
- <para>
- To ensure the security of the installation process, only use the
- <option>telnet</option> option to install systems on networks
- with restricted access.
- </para>
- </caution>
-<!-- SE: Note that there is also a "display" option that redirects anaconda's X display to an X server on another system. -->
+ <para>
+ To ensure the security of the installation process, only use
+ the <option>telnet</option> option to install systems on
+ networks with restricted access.
+ </para>
+ </caution>
+ </section>
</section>
<section id="sn-remote-logging">
<title>Logging to a Remote System During the Installation</title>
@@ -473,8 +487,7 @@
To configure remote logging, add the <option>syslog</option>
option. Specify the IP address of the logging system, and the UDP
port number of the log service on that system. By default, syslog
- services that accept remote messages listen on UDP port
- <systemitem>514</systemitem>.
+ services that accept remote messages listen on UDP port 514.
</para>
<para>
@@ -488,64 +501,67 @@
<screen>
<userinput>linux syslog=<replaceable>192.168.1.20:514</replaceable></userinput>
</screen>
- <para>
- &FED; uses <command>syslogd</command> to provide a syslog service.
- The default configuration of <command>syslogd</command> rejects
- messages from remote systems.
- </para>
-
- <caution>
- <title>Only Enable Remote Syslog Access on Secured Networks</title>
+ <section id="sn-remote-logging-logserver">
+ <title>Configuring a Log Server</title>
<para>
- The <command>syslogd</command> service includes no security
- measures. Crackers may slow or crash systems that permit access
- to the logging service, by sending large quantities of false log
- messages. In addition, hostile users may intercept or falsify
- messages sent to the logging service over the network.
+ &FED; uses <command>syslogd</command> to provide a syslog
+ service. The default configuration of <command>syslogd</command>
+ rejects messages from remote systems.
</para>
- </caution>
- <para>
- To configure a &FED; system to accept log messages from other
- systems on the network, edit the file
- <filename>/etc/sysconfig/syslog</filename>. You must use
- <systemitem class="username">root</systemitem> privileges to edit
- the file <filename>/etc/sysconfig/syslog</filename>. Add the
- option <option>-r</option> to the
- <command>SYSLOGD_OPTIONS</command>:
- </para>
+ <caution>
+ <title>Only Enable Remote Syslog Access on Secured Networks</title>
+
+ <para>
+ The <command>syslogd</command> service includes no security
+ measures. Crackers may slow or crash systems that permit
+ access to the logging service, by sending large quantities of
+ false log messages. In addition, hostile users may intercept
+ or falsify messages sent to the logging service over the
+ network.
+ </para>
+ </caution>
+ <para>
+ To configure a &FED; system to accept log messages from other
+ systems on the network, edit the file
+ <filename>/etc/sysconfig/syslog</filename>. You must use
+ <systemitem class="username">root</systemitem> privileges to
+ edit the file <filename>/etc/sysconfig/syslog</filename>. Add
+ the option <option>-r</option> to the
+ <command>SYSLOGD_OPTIONS</command>:
+ </para>
<screen>
<computeroutput>SYSLOGD_OPTIONS="-m 0 <userinput>-r</userinput>"</computeroutput>
</screen>
-
- <para>
- Restart the <command>syslogd</command> service to apply the
- change:
- </para>
+ <para>
+ Restart the <command>syslogd</command> service to apply the
+ change:
+ </para>
<screen>
<userinput>su -c '/sbin/service syslog restart'</userinput>
</screen>
- <para>
- Enter the <systemitem class="username">root</systemitem> password
- when prompted.
- </para>
-
- <note>
- <title>Firewall Reconfiguration Required</title>
-
<para>
- By default, the syslog service listens on UDP port
- <systemitem>514</systemitem>. To update the &FED; firewall
- configuration to permit connections to this port from other
- systems, choose <menuchoice> <guimenu>System</guimenu>
- <guisubmenu>Administration</guisubmenu> <guimenuitem>Security
- Level and Firewall</guimenuitem> </menuchoice>, enter
- <userinput>514:udp</userinput> in the <guilabel>Other
- ports:</guilabel> field, and select <guilabel>OK</guilabel>.
+ Enter the <systemitem class="username">root</systemitem>
+ password when prompted.
</para>
- </note>
+
+ <note>
+ <title>Firewall Reconfiguration Required</title>
+
+ <para>
+ By default, the syslog service listens on UDP port 514. To
+ update the &FED; firewall configuration to permit connections
+ to this port from other systems, choose <menuchoice>
+ <guimenu>System</guimenu>
+ <guisubmenu>Administration</guisubmenu> <guimenuitem>Security
+ Level and Firewall</guimenuitem> </menuchoice>, enter
+ <userinput>514:udp</userinput> in the <guilabel>Other
+ ports:</guilabel> field, and select <guilabel>OK</guilabel>.
+ </para>
+ </note>
+ </section>
</section>
<section id="sn-automating-installation">
<title>Automating the Installation with Kickstart</title>
@@ -557,8 +573,8 @@
</indexterm>
<firstterm>Kickstart</firstterm> file specifies settings for an
installation. Once the installation system boots, it can read a
- Kickstart file and carry out the installation process without
- any further input from a user.
+ Kickstart file and carry out the installation process without any
+ further input from a user.
</para>
<tip>
<title>Every Installation Produces a Kickstart File</title>
@@ -572,19 +588,18 @@
</para>
</tip>
<para>
- &FED; includes a graphical application to create
- and modify Kickstart files by selecting the options you
- require. Use the package
- <filename>system-config-kickstart</filename> to install this
- utility. To load the &FED; Kickstart editor, choose <menuchoice>
- <guimenu>Applications</guimenu> <guisubmenu>System
+ &FED; includes a graphical application to create and modify
+ Kickstart files by selecting the options you require. Use the
+ package <filename>system-config-kickstart</filename> to install
+ this utility. To load the &FED; Kickstart editor, choose
+ <menuchoice> <guimenu>Applications</guimenu> <guisubmenu>System
Tools</guisubmenu><guimenuitem>Kickstart</guimenuitem></menuchoice>.
</para>
<para>
Kickstart files list installation settings in plain text, with one
- option per line. This format lets you modify your Kickstart
- files with any text editor, and write scripts or applications that
+ option per line. This format lets you modify your Kickstart files
+ with any text editor, and write scripts or applications that
generate custom Kickstart files for your systems.
</para>
@@ -1051,14 +1066,16 @@
</tbody>
</tgroup>
</table>
+ <note>
+ <title>Additional Screen</title>
-<note>
-<title>Additional Screen</title>
-<para>
- The <option>isa</option> option causes the system to display an additional text screen at the beginning of the installation process. Use this screen to configure the ISA devices on your computer.
-</para>
-</note>
-
+ <para>
+ The <option>isa</option> option causes the system to display
+ an additional text screen at the beginning of the installation
+ process. Use this screen to configure the ISA devices on your
+ computer.
+ </para>
+ </note>
</section>
</section>
<section id="sn-boot-modes">
@@ -1106,7 +1123,8 @@
</indexterm>
rescue disc or the first installation disc, without installing
&FED; on the computer. This enables you to use the utilities and
- functions of a running Linux system to modify or repair systems that are already installed on your computer.
+ functions of a running Linux system to modify or repair systems
+ that are already installed on your computer.
</para>
<para>
Index: fedora-install-guide-diskpartitioning.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-diskpartitioning.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-install-guide-diskpartitioning.xml 2 Mar 2006 22:57:14 -0000 1.8
+++ fedora-install-guide-diskpartitioning.xml 3 Mar 2006 02:43:40 -0000 1.9
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -31,8 +32,9 @@
</indexterm>
<firstterm>RAID</firstterm> facilities enable a group, or array,
of drives to act as a single device. Configure any RAID functions
- provided by your mainboard, or attached controller cards, before
- you install &FC;. Each active RAID array appears as one drive.
+ provided by the mainboard of your computer, or attached controller
+ cards, before you begin the installation process. Each active RAID
+ array appears as one drive within &FED;.
</para>
</important>
<!-- SE: Note that this chapter uses the term "Linux software RAID" to differentiate RAID provided by the kernel from the functions of ATA RAID controllers, which are often also called "software RAID". Unfortunately. -->
@@ -168,7 +170,8 @@
<para>
Many systems have more partitions than the minimum listed above.
Choose partitions based on your particular system needs. If you
- are not sure what to choose, accept the default partition layout.
+ are not sure how best to configure the partitions for your
+ computer, accept the default partition layout.
</para>
<para>
@@ -249,7 +252,14 @@
<link linkend="disk-druid-edit">Edit option</link>
for more information.
</para>
-
+ <tip>
+ <title>Leave Excess Capacity Unallocated</title>
+ <para>
+ Only assign storage capacity to partitions that you require
+ immediately. You may allocate free space at any time, to meet
+ needs as they arise.
+ </para>
+ </tip>
<section id="sn-partitioning-types">
<title>Partition Types</title>
@@ -330,6 +340,14 @@
across the storage devices.
</para>
+ <para>
+ You may lose data if you shrink a logical volume to a smaller
+ capacity than the data on the volume requires. For this reason,
+ create logical volumes to meet your current needs, and leave
+ excess storage capacity unallocated. You may safely grow logical
+ volumes to use unallocated space, as your needs dictate.
+ </para>
+
<note>
<title>LVM and the Default Partition Layout</title>
@@ -344,8 +362,8 @@
<title>Creating a <filename>/home</filename> Partition</title>
<para>
- If you expect that you or other users will store data on
- the system, create a separate partition for the
+ If you expect that you or other users will store data on the
+ system, create a separate partition for the
<filename>/home</filename> directory within an LVM volume. With
a separate <filename>/home</filename> partition, you may upgrade
or reinstall &FC; without erasing user data files. LVM provides
@@ -723,9 +741,9 @@
<para>
You may not remove a physical volume from a volume group if
doing so would leave insufficient space for that group's
- logical volumes. Take for example a volume group made up
- of two 5 GB LVM physical volume partitions, which contains
- an 8 GB logical volume. The installer would not allow you to
+ logical volumes. Take for example a volume group made up of
+ two 5 GB LVM physical volume partitions, which contains an 8
+ GB logical volume. The installer would not allow you to
remove either of the component physical volumes, since that
would leave only 5 GB in the group for an 8 GB logical
volume. If you reduce the total size of any logical volumes
Index: fedora-install-guide-intro.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-intro.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-install-guide-intro.xml 2 Mar 2006 22:57:14 -0000 1.9
+++ fedora-install-guide-intro.xml 3 Mar 2006 02:43:40 -0000 1.10
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -38,10 +39,6 @@
<para>
This document does not detail all of the features of the
installation system.
-<!-- Automating the installation process and
- configuring network installation servers will be described in
- separate tutorials. [These tutorials will be added later. Until
- they exist, do not reference them. - PWF.] -->
</para>
&BUG-REPORTING;
@@ -51,17 +48,21 @@
<para>
The &FP;, which produces and maintains &FC;, is a collaboration
- between &FORMAL-RHI; and the <indexterm>
- <primary>free software</primary>
- <see>FOSS</see>
- </indexterm><indexterm>
- <primary>open source</primary>
- <see>FOSS</see>
- </indexterm> <indexterm>
- <primary>FOSS (free and open source software)</primary>
- </indexterm> <firstterm>free and open source software</firstterm>
- (FOSS) community. The &FP; also provides &FEX;, additional
- software packaged for installation on a &FC; system.
+ between &FORMAL-RHI; and the
+ <indexterm>
+ <primary>free software</primary>
+ <see>FOSS</see>
+ </indexterm>
+ <indexterm>
+ <primary>open source</primary>
+ <see>FOSS</see>
+ </indexterm>
+ <indexterm>
+ <primary>FOSS (free and open source software)</primary>
+ </indexterm>
+ <firstterm>free and open source software</firstterm> (FOSS)
+ community. The &FP; also provides &FEX;, additional software
+ packaged for installation on a &FC; system.
</para>
<para>
@@ -165,18 +166,37 @@
Release Notes are available at &FDPDOCS-URL;.
</para>
+ <section id="sn-installing-storage-configurations">
+ <title>Storage</title>
+<!-- SE: There may also be additional considerations when installing on machines backed by a SAN. -->
+ <para>
+ A &FED; system requires a minimum of 700Mb storage for a
+ command-line system. Assign at least 3Gb for a desktop system
+ with the default applications. You may install multiple copies
+ of &FED; on the same computer.
+ </para>
+
+ <para>
+ Configure any RAID functions provided by the mainboard of your
+ computer, or attached controller cards, before you begin the
+ installation process. &FED; may automatically detect configured
+ RAID devices and use the storage that they provide.
+ </para>
+ </section>
+
<section id="sn-installing-network-configurations">
<title>Networking</title>
<para>
By default, &FC; systems attempt to discover correct connection
- settings for the attached network using <indexterm>
- <primary>DHCP (Dynamic Host Configuration Protocol)</primary>
- </indexterm> <firstterm>DHCP</firstterm> (Dynamic Host Control
- Protocol). Your network may include a DHCP provider which
- delivers settings to other systems on demand. The DHCP provider
- may be a router or wireless access point for the network, or a
- server.
+ settings for the attached network using
+ <indexterm>
+ <primary>DHCP (Dynamic Host Configuration Protocol)</primary>
+ </indexterm>
+ <firstterm>DHCP</firstterm> (Dynamic Host Control Protocol).
+ Your network may include a DHCP provider which delivers settings
+ to other systems on demand. The DHCP provider may be a router or
+ wireless access point for the network, or a server.
</para>
<para>
@@ -199,34 +219,13 @@
</para>
</note>
</section>
-<!--
-
- Is it just me, or is this section really out of place? [PWF]
-
- The original text reminded the reader to get the hostname and IP settings for a server before installing. Other types of installation are usually better with the default DHCP. [SE]
-
- <section id="sn-installing-asaserver">
- <title>Installing &FC; as a Server</title>
-
- <para>
- &FC; includes software for a complete range of network services.
- To install a system with the most common network services,
- select the <guilabel>Server</guilabel> installation type during
- the installation. Refer to <xref
- linkend="ch-installtypes"/> for more information. You may
- also select individual software packages during installation, or
- install them later.
- </para>
-
- </section>
--->
<section id="sn-installing-networkinstallation">
- <title>Installing from a Server or Website</title>
+ <title>Installing from a Server or Web Site</title>
<para>
You may install &FC; using a <firstterm>mirror</firstterm>, a
- website or network server that provide a copy of the necessary
+ Web site or network server that provide a copy of the necessary
files. To use a mirror, you need to know:
</para>
@@ -356,9 +355,10 @@
</para>
<para>
- For instructions to download and prepare this CD or DVD installation media, refer
- to <ulink url="http://fedora.redhat.com/download/"/>. If you
- already have the full set of &FC; installation media, skip to
+ For instructions to download and prepare this CD or DVD
+ installation media, refer to
+ <ulink url="http://fedora.redhat.com/download/"/>. If you already
+ have the full set of &FC; installation media, skip to
<xref
linkend="sn-booting-from-disc"/>.
</para>
@@ -367,18 +367,18 @@
<title>Architecture-Specific Distributions</title>
<para>
- To install &FC;, you must use the boot and installation media that is
- particular to your architecture.
+ To install &FC;, you must use the boot and installation media
+ that is particular to your architecture.
</para>
</important>
<para>
You may use the first CD or DVD installation disc from the
- complete &FC; distribution to boot your computer. The &FC; distribution also includes <firstterm>image
- files</firstterm> for boot-only CD or DVD media and USB media.
- These files can be converted into bootable media using standard
- Linux utilities or third-party programs on other operating
- systems.
+ complete &FC; distribution to boot your computer. The &FC;
+ distribution also includes <firstterm>image files</firstterm> for
+ boot-only CD or DVD media and USB media. These files can be
+ converted into bootable media using standard Linux utilities or
+ third-party programs on other operating systems.
</para>
<para>
Index: fedora-install-guide-locale.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-locale.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-locale.xml 2 Mar 2006 22:57:14 -0000 1.7
+++ fedora-install-guide-locale.xml 3 Mar 2006 02:43:40 -0000 1.8
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -11,25 +12,24 @@
]>
<!-- $Id: -->
+
<chapter id="ch-installer-locale">
<title>Identifying Your Locale</title>
-
<para>
If the installation system fails to identify the display hardware on
your computer, it displays text screens rather than the default
- graphical interface. The text screens provide the same functions as
- the standard screens. Later in the installation process you can
+ graphical interface. The text screens provide the same functions as
+ the standard screens. Later in the installation process you can
manually specify your display hardware.
</para>
-
<important>
- <title>Network Installations</title>
+ <title>Network Installations</title>
+
<para>
Network installations with HTTP and FTP always use text screens on
systems with less than 128Mb of memory.
</para>
</important>
-
<section id="sn-installer-language">
<title>Language Selection</title>
@@ -37,41 +37,37 @@
The installation program displays a list of languages supported by
&FED;.
</para>
-
<figure id="fig-lang-selection">
<title>Language Selection Screen</title>
<mediaobject>
- <imageobject>
- <imagedata align="center" fileref="./figs/langselection.eps" format="EPS"/>
- </imageobject>
- <imageobject>
- <imagedata align="center" fileref="./figs/langselection.png" format="PNG"/>
- </imageobject>
- <textobject>
- <phrase>
+ <imageobject>
+ <imagedata align="center" fileref="./figs/langselection.eps" format="EPS"/>
+ </imageobject>
+ <imageobject>
+ <imagedata align="center" fileref="./figs/langselection.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>
Language selection screen.
</phrase>
- </textobject>
+ </textobject>
</mediaobject>
</figure>
-
<para>
Highlight the correct language on the list and select
<guibutton>Next</guibutton>.
</para>
<note>
- <title>Installing Support For Additional Languages</title>
+ <title>Installing Support For Additional Languages</title>
+
<para>
- To select support for additional languages, customize the
- installation at the package selection stage. For more
- information, refer to <xref linkend="sn-lang-packages"></xref>.
+ To select support for additional languages, customize the
+ installation at the package selection stage. For more
+ information, refer to <xref linkend="sn-lang-packages"></xref>.
</para>
</note>
-
</section>
-
-
<section id="sn-installer-keyboard">
<title>Keyboard Configuration</title>
@@ -79,31 +75,27 @@
The installation program display a list of the keyboard layouts
supported by &FED;:
</para>
-
<figure id="fig-keyb-conf">
<title>Keyboard Configuration Screen</title>
<mediaobject>
- <imageobject>
- <imagedata align="center" fileref="./figs/keylayoutselection.eps" format="EPS"/>
- </imageobject>
- <imageobject>
- <imagedata align="center" fileref="./figs/keylayoutselection.png" format="PNG"/>
- </imageobject>
- <textobject>
- <phrase>
+ <imageobject>
+ <imagedata align="center" fileref="./figs/keylayoutselection.eps" format="EPS"/>
+ </imageobject>
+ <imageobject>
+ <imagedata align="center" fileref="./figs/keylayoutselection.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>
Keyboard configuration screen.
</phrase>
- </textobject>
+ </textobject>
</mediaobject>
</figure>
-
<para>
Highlight the correct layout on the list, and select
<guibutton>Next</guibutton>.
</para>
-
</section>
-
</chapter>
<!--
Index: fedora-install-guide-nextsteps.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-nextsteps.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-nextsteps.xml 2 Mar 2006 22:57:14 -0000 1.6
+++ fedora-install-guide-nextsteps.xml 3 Mar 2006 02:43:40 -0000 1.7
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -160,11 +161,12 @@
<para>
Members of the &FED; community provides support through mailing
- lists, web forums and Linux User Groups (LUGs) across the world.
+ lists, Web forums and Linux User Groups (LUGs) across the world.
</para>
<para>
- The Website for the official forums is <ulink
+ The Web site for the official forums is
+ <ulink
url="http://forums.fedoraforum.org/"/>.
</para>
@@ -175,70 +177,70 @@
<itemizedlist>
<listitem>
- <variablelist>
- <varlistentry>
- <term>
+ <variablelist>
+ <varlistentry>
+ <term>
The FAQ on the &FP; website
</term>
- <listitem>
- <para>
- <ulink url="http://fedoraproject.org/wiki/FAQ/"/>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ <listitem>
+ <para>
+ <ulink url="http://fedoraproject.org/wiki/FAQ/"/>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</listitem>
<listitem>
- <variablelist>
- <varlistentry>
- <term>
- The documents available from the &FDP; website
+ <variablelist>
+ <varlistentry>
+ <term>
+ The documents available from the &FDP; Web site
</term>
- <listitem>
- <para>
- <ulink url="http://fedora.redhat.com/docs/"/>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ <listitem>
+ <para>
+ <ulink url="http://fedora.redhat.com/docs/"/>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</listitem>
<listitem>
- <variablelist>
- <varlistentry>
- <term>
+ <variablelist>
+ <varlistentry>
+ <term>
The Linux Documentation Project (LDP)
</term>
- <listitem>
- <para>
- <ulink url="http://www.tldp.org/"/>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ <listitem>
+ <para>
+ <ulink url="http://www.tldp.org/"/>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</listitem>
<listitem>
- <variablelist>
- <varlistentry>
- <term>
+ <variablelist>
+ <varlistentry>
+ <term>
The &RHEL; documentation, much of which also applies to
&FED;
</term>
- <listitem>
- <para>
- <ulink
+ <listitem>
+ <para>
+ <ulink
url="http://www.redhat.com/docs/manuals/enterprise/"/>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</listitem>
</itemizedlist>
<para>
Many other organizations and individuals also provide tutorials
- and HOWTOs for &FED; on their Websites. You can locate information
- on any topic by using Google's Linux search site, located at
- <ulink url="http://www.google.com/linux/"/>.
+ and HOWTOs for &FED; on their Web sites. You can locate
+ information on any topic by using Google's Linux search site,
+ located at <ulink url="http://www.google.com/linux/"/>.
</para>
</section>
<section id="sn-community">
Index: fedora-install-guide-other-instmethods.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-other-instmethods.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-other-instmethods.xml 2 Mar 2006 22:57:14 -0000 1.7
+++ fedora-install-guide-other-instmethods.xml 3 Mar 2006 02:43:40 -0000 1.8
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -69,9 +70,10 @@
<para>
You may install &FC; from a network server using FTP, HTTP, or
<indexterm>
- <primary>NFS (Network File System)</primary>
- <secondary>install from</secondary>
- </indexterm> NFS protocols. Refer to
+ <primary>NFS (Network File System)</primary>
+ <secondary>install from</secondary>
+ </indexterm>
+ NFS protocols. Refer to
<xref linkend="sn-installing-networkinstallation"/> for
information on installation servers.
</para>
@@ -159,15 +161,16 @@
</textobject>
</mediaobject>
</figure>
+ <note>
+ <title>Large Download</title>
- <note>
- <title>Large Download</title>
-
- <para>
- Network installations download the main installation program from the server that you specify. The graphical installation program is over 60 Mb in size. Computers with a slow network connection may take several minutes to download this file.
- </para>
- </note>
-
+ <para>
+ Network installations download the main installation program
+ from the server that you specify. The graphical installation
+ program is over 60 Mb in size. Computers with a slow network
+ connection may take several minutes to download this file.
+ </para>
+ </note>
</section>
</section>
<section id="sn-installing-from-harddrive">
@@ -184,25 +187,34 @@
<para>
The partition on the hard drive holding the ISO files must be
- formatted with the <indexterm>
- <primary>ext2</primary>
- <see>file systems</see>
- </indexterm><indexterm>
- <primary>file systems</primary>
- <secondary>ext2</secondary>
- </indexterm> <firstterm>ext2</firstterm>, <indexterm>
- <primary>ext3</primary>
- <see>file systems</see>
- </indexterm><indexterm>
- <primary>file systems</primary>
- <secondary>ext3</secondary>
- </indexterm> <firstterm>ext3</firstterm> or <indexterm>
- <primary>vfat</primary>
- <see>file systems</see>
- </indexterm><indexterm>
- <primary>file systems</primary>
- <secondary>vfat</secondary>
- </indexterm> <firstterm>vfat</firstterm> file system. In &FED;,
+ formatted with the
+ <indexterm>
+ <primary>ext2</primary>
+ <see>file systems</see>
+ </indexterm>
+ <indexterm>
+ <primary>file systems</primary>
+ <secondary>ext2</secondary>
+ </indexterm>
+ <firstterm>ext2</firstterm>,
+ <indexterm>
+ <primary>ext3</primary>
+ <see>file systems</see>
+ </indexterm>
+ <indexterm>
+ <primary>file systems</primary>
+ <secondary>ext3</secondary>
+ </indexterm>
+ <firstterm>ext3</firstterm> or
+ <indexterm>
+ <primary>vfat</primary>
+ <see>file systems</see>
+ </indexterm>
+ <indexterm>
+ <primary>file systems</primary>
+ <secondary>vfat</secondary>
+ </indexterm>
+ <firstterm>vfat</firstterm> file system. In &FED;,
<systemitem class="filesystem">vfat</systemitem> includes a range
of file systems, such as FAT-16 and FAT-32, found on most
removable media. External hard drives usually contain
Index: fedora-install-guide-packageselection.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-packageselection.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-packageselection.xml 2 Mar 2006 22:57:14 -0000 1.7
+++ fedora-install-guide-packageselection.xml 3 Mar 2006 02:43:40 -0000 1.8
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -43,7 +44,9 @@
<term>Office and Productivity</term>
<listitem>
<para>
- This option provides the OpenOffice.org productivity suite.
+ This option provides the OpenOffice.org productivity suite,
+ the Planner project management application, graphical tools
+ such as the GIMP, and multimedia applications.
</para>
</listitem>
</varlistentry>
@@ -66,16 +69,6 @@
</para>
</listitem>
</varlistentry>
-
- <varlistentry>
- <term>Virtualization (Xen)</term>
- <listitem>
- <para>
- This option provides the services and utilities to simultaneously run multiple operating systems on your computer.
- </para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>
Select <guilabel>Customize now</guilabel> to specify the software
@@ -148,11 +141,16 @@
Some automated processes on your Fedora system use the email
service to send reports and messages to the system administrator.
By default, the email, logging, and printing services do not
- accept connections from other systems. &FED; installs the NFS sharing and VNC components without enabling those services.
+ accept connections from other systems. &FED; installs the NFS
+ sharing and VNC components without enabling those services.
</para>
-<para>
- You may configure your Fedora system after installation to offer email, file sharing, logging, printing and remote desktop access services. The SSH service is enabled by default. You may use NFS to access files on other systems without enabling the NFS sharing service.
+ <para>
+ You may configure your Fedora system after installation to offer
+ email, file sharing, logging, printing and remote desktop access
+ services. The SSH service is enabled by default. You may use NFS
+ to access files on other systems without enabling the NFS sharing
+ service.
</para>
</section>
<section id="sn-package-selection">
Index: fedora-install-guide-techref.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-techref.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-techref.xml 2 Mar 2006 22:57:14 -0000 1.6
+++ fedora-install-guide-techref.xml 3 Mar 2006 02:43:40 -0000 1.7
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -20,13 +21,13 @@
<indexterm>
<primary>Anaconda</primary>
</indexterm>
- <command>anaconda</command>, visit the project webpage:
+ <command>anaconda</command>, visit the project Web page:
<ulink url="http://www.fedoraproject.org/wiki/Anaconda"/>.
</para>
<para>
Both <command>anaconda</command> and &FC; systems use a common set
of software components. For detailed information on key
- technologies, refer to the websites listed below:
+ technologies, refer to the Web sites listed below:
</para>
<variablelist>
<varlistentry>
@@ -64,8 +65,10 @@
<primary>LVM</primary>
<secondary>documentation</secondary>
</indexterm>
-Logical Volume Management (LVM) provides administrators with a range of facilities to manage storage. By default, the &FED; installation process formats drives as LVM volumes. Refer
- to <ulink url="http://www.tldp.org/HOWTO/LVM-HOWTO/"/> for more
+ Logical Volume Management (LVM) provides administrators with a
+ range of facilities to manage storage. By default, the &FED;
+ installation process formats drives as LVM volumes. Refer to
+ <ulink url="http://www.tldp.org/HOWTO/LVM-HOWTO/"/> for more
information.
</para>
</listitem>
@@ -81,7 +84,7 @@
Linux Sound Architecture)</primary>
</indexterm>
ALSA (Advanced Linux Sound Architecture). For more information
- about ALSA, refer to the project website:
+ about ALSA, refer to the project Web site:
<ulink url="http://www.alsa-project.org/"/>.
</para>
</listitem>
@@ -115,7 +118,7 @@
</indexterm>
VNC (Virtual Network Computing) software to enable remote
access to graphical displays. For more information about VNC,
- refer to the documentation on the RealVNC website:
+ refer to the documentation on the RealVNC Web site:
<ulink url="http://www.realvnc.com/documentation/"/>.
</para>
</listitem>
@@ -125,8 +128,8 @@
<term>Command-line Interface</term>
<listitem>
<para>
- By default, &FC; uses the GNU <command>bash</command> shell
- to provide a command-line interface. The GNU Core Utilities
+ By default, &FC; uses the GNU <command>bash</command> shell to
+ provide a command-line interface. The GNU Core Utilities
complete the command-line environment. Refer to
<ulink url="http://www.gnu.org/software/bash/bash.html"/> for
more information on <command>bash</command>. To learn more
@@ -159,7 +162,7 @@
<seealso>SSH</seealso>
</indexterm>
feature of OpenSSH to transfer crash reports to remote
- systems. Refer to the OpenSSH website for more information:
+ systems. Refer to the OpenSSH Web site for more information:
<ulink url="http://www.openssh.com/"/>.
</para>
</listitem>
@@ -224,9 +227,13 @@
<primary>Xen</primary>
<secondary>documentation</secondary>
</indexterm>
- Xen provides the capability to simultaneously run multiple operating systems on the same computer. &FC; also includes tools to install and manage the secondary systems on a &FED; host. You may select Xen support during the installation process, or at any time thereafter. Refer to
- <ulink url="http://www.fedoraproject.org/wiki/Tools/Xen"/> for more
- information.
+ Xen provides the capability to simultaneously run multiple
+ operating systems on the same computer. &FC; also includes
+ tools to install and manage the secondary systems on a &FED;
+ host. You may select Xen support during the installation
+ process, or at any time thereafter. Refer to
+ <ulink url="http://www.fedoraproject.org/wiki/Tools/Xen"/> for
+ more information.
</para>
</listitem>
</varlistentry>
18 years, 4 months
- 1
- 0
install-guide rpm-info.xml,1.11,1.12
by fedora-docs-commits＠redhat.com
Author: elliss
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15995
Modified Files:
rpm-info.xml
Log Message:
- Removed Xen option from Task Selection.
- Broke out subsections in Boot Options.
- Added text to Disk Partitioning to address #170728.
- Added Storage section to Before You Begin.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/install-guide/rpm-info.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpm-info.xml 1 Mar 2006 01:43:08 -0000 1.11
+++ rpm-info.xml 3 Mar 2006 02:43:35 -0000 1.12
@@ -28,10 +28,15 @@
</translation>
</titles>
<changelog order="newest-first">
+ <revision date="2006-03-03" number="1.23" role="doc">
+ <author worker="StuartEllis"/>
+<!--PLEASE SET "lang" ATTRIBUTE IN DETAILS WHERE NEEDED-->
+ <details>Boot options broken out into clearer subsections.</details>
+ </revision>
<revision date="2006-03-01" number="1.22" role="doc">
<author worker="StuartEllis"/>
<!--PLEASE SET "lang" ATTRIBUTE IN DETAILS WHERE NEEDED-->
- <details>Added Xen material.</details>
+ <details lang="en">Added Xen material.</details>
</revision>
<revision date="2006-02-10" number="1.21" role="doc">
<author worker="StuartEllis"/>
18 years, 4 months
- 1
- 0
docs-common/bin fdpsh,1.7,1.8
by fedora-docs-commits＠redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15943/bin
Modified Files:
fdpsh
Log Message:
Identify original shell using the ${REALSHELL} variable.
Index: fdpsh
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdpsh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fdpsh 4 Feb 2006 16:34:17 -0000 1.7
+++ fdpsh 3 Mar 2006 02:23:10 -0000 1.8
@@ -21,6 +21,7 @@
#
PATH=${FDPBINDIR}:${PATH} export PATH
FDPDIR=`cd ${FDPBINDIR}/../.. ; /bin/pwd` export FDPDIR
+REALSHELL="${SHELL}" export REALSHELL
SHELL=${FDPBINDIR}/${ME} export SHELL
#
FDPLOG=/tmp/fdpsh.log
18 years, 4 months
- 1
- 0
docs-common/packaging bookinfo.xsl,1.18,1.19
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13841
Modified Files:
bookinfo.xsl
Log Message:
Please keep XSL sane, thank you... No, this isn't converted to 'en_US'
locale, but one thing at a time!
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bookinfo.xsl 23 Feb 2006 23:06:41 -0000 1.18
+++ bookinfo.xsl 3 Mar 2006 01:44:49 -0000 1.19
@@ -58,27 +58,27 @@
<xsl:call-template name="initials"><xsl:with-param name="who" select="author/@worker"/></xsl:call-template>
</xsl:element>
<xsl:element name="revdescription">
- <xsl:choose>
- <xsl:when test="details[@lang = $lang]">
- <xsl:for-each select="details[@lang = $lang]">
- <xsl:element name="para">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:for-each>
- </xsl:when>
- <xsl:when test="details[@lang = 'en']">
- <xsl:for-each select="details[@lang = 'en']">
- <xsl:element name="para">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <revdescription>
- <para> (...) </para>
- </revdescription>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="details[@lang = $lang]">
+ <xsl:for-each select="details[@lang = $lang]">
+ <xsl:element name="para">
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:when test="details[@lang = 'en']">
+ <xsl:for-each select="details[@lang = 'en']">
+ <xsl:element name="para">
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:element name="para">
+ <xsl:text>(...)</xsl:text>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:element>
</xsl:element>
</xsl:for-each>
18 years, 4 months
- 1
- 0
docs-common/common/entities Makefile, 1.11, 1.12 de.po, 1.2, 1.3 entities.pot, 1.1, 1.2
by fedora-docs-commits＠redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common/entities
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10631
Modified Files:
Makefile de.po entities.pot
Log Message:
Stupid %.ent:%.xml form didn't allow for additional dependancies and the
.ent file may not be regenerated when necesssary. This has been fixed
by adding a template. All hail the template!
Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 2 Mar 2006 22:56:09 -0000 1.11
+++ Makefile 3 Mar 2006 00:13:18 -0000 1.12
@@ -1,5 +1,5 @@
PRI_LANG=en_US
-OTHERS =en it pt_BR ru zh_CN
+OTHERS =de en it pt_BR ru zh_CN
#######################################################################
# PLEASE:
@@ -25,16 +25,6 @@
#######################################################################
#######################################################################
-# Rule: Apply stylesheet to transform XML into locale-specific ".ent"
-# entities file
-#
-%.ent: %.xml
- xsltproc -o $@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
- entities.xsl $<
-#
-#######################################################################
-
-#######################################################################
# Printf(1) format string for describing targets by "make help".
HELPFMT ="%-23s\t| %s.\n"
#
@@ -63,7 +53,7 @@
#######################################################################
#######################################################################
-# Target 'entities.pot' makes a TEMPORARY seed translation file. We
+# Target 'entities.pot' makes a seed translation file. We
# use the original-language entities XML file as the source.
#
.PHONY: pot
@@ -71,6 +61,9 @@
pot entities.pot:: entities-${PRI_LANG}.xml
xml2po -o entities.pot $<
+distclean::
+ ${RM} entities.pot
+
help::
@printf ${HELPFMT} "make pot" "Create template PO file"
@printf ${HELPFMT} "make entities.pot" "Create template PO file"
@@ -174,19 +167,16 @@
${RM} ${ENTFILES}
help::
- @printf ${HELPFMT} "make distclean" "Delete all generated files"
- @printf ${HELPFMT} "make clobber" "Delete all generated files"
+ @printf ${HELPFMT} "make distclean" "Delete all generated files"
+ @printf ${HELPFMT} "make clobber" "Delete all generated files"
#
#######################################################################
#######################################################################
-# We create EXACTLY one .POT file, and treat is as a temporary file.
-# Do NOT EDIT the .POT file if you are sharing this directory!
-#
-entities.pot:: entities-${PRI_LANG}.xml
- xml2po -o $@ $<
-
-help::
- @printf ${HELPFMT} "make entities.pot" "Create template .PO file"
-#
+define ENT_template
+entities-${1}.ent:: entities-${1}.xml entities.pot
+ xsltproc -o @$@ --stringparam FDPCOMMONDIR "${FDPCOMMONDIR}" \
+ entities.xsl entities-${1}.xml
+endef
+$(foreach L,${PRI_LANG} ${OTHERS},$(eval $(call ENT_template,${L})))
#######################################################################
Index: de.po
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/de.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- de.po 2 Mar 2006 22:52:15 -0000 1.2
+++ de.po 3 Mar 2006 00:13:18 -0000 1.3
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-01 16:48-0500\n"
+"POT-Creation-Date: 2006-03-02 16:52-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -9,224 +9,226 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: entities-en_US.xml:6(title)
-msgid "These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names."
+#: entities-en_US.xml:4(title)
+msgid ""
+"These common entities are useful shorthand terms and names, which may be "
+"subject to change at anytime. This is an important value the the entity "
+"provides: a single location to update terms and common names."
msgstr ""
-#: entities-en_US.xml:14(comment) entities-en_US.xml:18(comment)
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
msgid "Generic root term"
msgstr ""
-#: entities-en_US.xml:15(text)
+#: entities-en_US.xml:8(text)
msgid "Fedora"
msgstr ""
-#: entities-en_US.xml:19(text)
+#: entities-en_US.xml:12(text)
msgid "Core"
msgstr ""
-#: entities-en_US.xml:22(comment)
+#: entities-en_US.xml:15(comment)
msgid "Generic main project name"
msgstr ""
-#: entities-en_US.xml:26(comment)
+#: entities-en_US.xml:19(comment)
msgid "Legacy Entity"
msgstr ""
-#: entities-en_US.xml:30(comment)
+#: entities-en_US.xml:23(comment)
msgid "Short project name"
msgstr ""
-#: entities-en_US.xml:31(text)
+#: entities-en_US.xml:24(text)
msgid "FC"
msgstr ""
-#: entities-en_US.xml:34(comment)
+#: entities-en_US.xml:27(comment)
msgid "Generic overall project name"
msgstr ""
-#: entities-en_US.xml:35(text)
+#: entities-en_US.xml:28(text)
msgid "<use entity=\"FED\"/> Project"
msgstr ""
-#: entities-en_US.xml:38(comment)
+#: entities-en_US.xml:31(comment)
msgid "Generic docs project name"
msgstr ""
-#: entities-en_US.xml:39(text) entities-en_US.xml:43(text)
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
msgid "<use entity=\"FED\"/> Docs Project"
msgstr ""
-#: entities-en_US.xml:42(comment)
+#: entities-en_US.xml:35(comment)
msgid "Short docs project name"
msgstr ""
-#: entities-en_US.xml:46(comment)
+#: entities-en_US.xml:39(comment)
msgid "cf. Core"
msgstr ""
-#: entities-en_US.xml:47(text)
+#: entities-en_US.xml:40(text)
msgid "Extras"
msgstr ""
-#: entities-en_US.xml:50(comment)
+#: entities-en_US.xml:43(comment)
msgid "cf. Fedora Core"
msgstr ""
-#: entities-en_US.xml:54(comment)
+#: entities-en_US.xml:47(comment)
msgid "Fedora Docs Project URL"
msgstr ""
-#: entities-en_US.xml:58(comment)
+#: entities-en_US.xml:51(comment)
msgid "Fedora Project URL"
msgstr ""
-#: entities-en_US.xml:62(comment)
+#: entities-en_US.xml:55(comment)
msgid "Fedora Documentation (repository) URL"
msgstr ""
-#: entities-en_US.xml:66(comment) entities-en_US.xml:67(text)
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
msgid "Bugzilla"
msgstr ""
-#: entities-en_US.xml:70(comment)
+#: entities-en_US.xml:63(comment)
msgid "Bugzilla URL"
msgstr ""
-#: entities-en_US.xml:74(comment)
+#: entities-en_US.xml:67(comment)
msgid "Bugzilla product for Fedora Docs"
msgstr ""
-#: entities-en_US.xml:75(text)
+#: entities-en_US.xml:68(text)
msgid "<use entity=\"FED\"/> Documentation"
msgstr ""
-#: entities-en_US.xml:80(comment)
+#: entities-en_US.xml:73(comment)
msgid "Current release version of main project"
msgstr ""
-#: entities-en_US.xml:81(text)
+#: entities-en_US.xml:74(text)
msgid "4"
msgstr ""
-#: entities-en_US.xml:84(comment)
+#: entities-en_US.xml:77(comment)
msgid "Current test number of main project"
msgstr ""
-#: entities-en_US.xml:85(text)
+#: entities-en_US.xml:78(text)
msgid "test3"
msgstr ""
-#: entities-en_US.xml:88(comment)
+#: entities-en_US.xml:81(comment)
msgid "Current test version of main project"
msgstr ""
-#: entities-en_US.xml:89(text)
+#: entities-en_US.xml:82(text)
msgid "5 <use entity=\"TESTVER\"/>"
msgstr ""
-#: entities-en_US.xml:94(comment)
+#: entities-en_US.xml:87(comment)
msgid "The generic term \"Red Hat\""
msgstr ""
-#: entities-en_US.xml:95(text)
+#: entities-en_US.xml:88(text)
msgid "Red Hat"
msgstr ""
-#: entities-en_US.xml:98(comment)
+#: entities-en_US.xml:91(comment)
msgid "The generic term \"Red Hat, Inc.\""
msgstr ""
-#: entities-en_US.xml:99(text)
+#: entities-en_US.xml:92(text)
msgid "<use entity=\"RH\"/> Inc."
msgstr ""
-#: entities-en_US.xml:102(comment)
+#: entities-en_US.xml:95(comment)
msgid "The generic term \"Red Hat Linux\""
msgstr ""
-#: entities-en_US.xml:103(text)
+#: entities-en_US.xml:96(text)
msgid "<use entity=\"RH\"/> Linux"
msgstr ""
-#: entities-en_US.xml:106(comment)
+#: entities-en_US.xml:99(comment)
msgid "The generic term \"Red Hat Network\""
msgstr ""
-#: entities-en_US.xml:107(text)
+#: entities-en_US.xml:100(text)
msgid "<use entity=\"RH\"/> Network"
msgstr ""
-#: entities-en_US.xml:110(comment)
+#: entities-en_US.xml:103(comment)
msgid "The generic term \"Red Hat Enterprise Linux\""
msgstr ""
-#: entities-en_US.xml:111(text)
+#: entities-en_US.xml:104(text)
msgid "<use entity=\"RH\"/> Enterprise Linux"
msgstr ""
-#: entities-en_US.xml:116(comment)
+#: entities-en_US.xml:109(comment)
msgid "Generic technology term"
msgstr ""
-#: entities-en_US.xml:117(text)
+#: entities-en_US.xml:110(text)
msgid "SELinux"
msgstr ""
-#: entities-en_US.xml:123(text)
+#: entities-en_US.xml:116(text)
msgid "legalnotice-en.xml"
msgstr ""
-#: entities-en_US.xml:127(text)
+#: entities-en_US.xml:120(text)
msgid "legalnotice-content-en.xml"
msgstr ""
-#: entities-en_US.xml:131(text)
+#: entities-en_US.xml:124(text)
msgid "legalnotice-opl-en.xml"
msgstr ""
-#: entities-en_US.xml:135(text)
+#: entities-en_US.xml:128(text)
msgid "opl.xml"
msgstr ""
-#: entities-en_US.xml:139(text)
+#: entities-en_US.xml:132(text)
msgid "legalnotice-relnotes-en.xml"
msgstr ""
-#: entities-en_US.xml:143(text)
+#: entities-en_US.xml:136(text)
msgid "legalnotice-section-en.xml"
msgstr ""
-#: entities-en_US.xml:147(text)
+#: entities-en_US.xml:140(text)
msgid "bugreporting-en.xml"
msgstr ""
-#: entities-en_US.xml:161(text)
+#: entities-en_US.xml:154(text)
msgid "Installation Guide"
msgstr ""
-#: entities-en_US.xml:165(text)
+#: entities-en_US.xml:158(text)
msgid "Documentation Guide"
msgstr ""
-#: entities-en_US.xml:181(text)
+#: entities-en_US.xml:174(text)
msgid "draftnotice-en.xml"
msgstr ""
-#: entities-en_US.xml:185(text)
+#: entities-en_US.xml:178(text)
msgid "legacynotice-en.xml"
msgstr ""
-#: entities-en_US.xml:189(text)
+#: entities-en_US.xml:182(text)
msgid "obsoletenotice-en.xml"
msgstr ""
-#: entities-en_US.xml:193(text)
+#: entities-en_US.xml:186(text)
msgid "deprecatednotice-en.xml"
msgstr ""
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en_US.xml:0(None)
+#: entities-en_US.xml:0(None)
msgid "translator-credits"
msgstr ""
-
Index: entities.pot
===================================================================
RCS file: /cvs/docs/docs-common/common/entities/entities.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- entities.pot 2 Mar 2006 22:56:09 -0000 1.1
+++ entities.pot 3 Mar 2006 00:13:18 -0000 1.2
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-02 16:52-0600\n"
+"POT-Creation-Date: 2006-03-02 18:04-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
18 years, 4 months
- 1
- 0
docs-common/common bugreporting-en_US.xml, NONE, 1.1 cvs-en_US.xml, NONE, 1.1 deprecatednotice-en_US.xml, NONE, 1.1 draftnotice-en_US.xml, NONE, 1.1 fedora-entities-en_US.ent, NONE, 1.1 legacynotice-en_US.xml, NONE, 1.1 legalnotice-content-en_US.xml, NONE, 1.1 legalnotice-content-p1-en_US.xml, NONE, 1.1 legalnotice-content-p2-en_US.xml, NONE, 1.1 legalnotice-content-p3-en_US.xml, NONE, 1.1 legalnotice-content-p4-en_US.xml, NONE, 1.1 legalnotice-content-p5-en_US.xml, NONE, 1.1 legalnotice-content-p6-en_US.xm
by fedora-docs-commits＠redhat.com
Author: jtr
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8290
Added Files:
bugreporting-en_US.xml cvs-en_US.xml
deprecatednotice-en_US.xml draftnotice-en_US.xml
fedora-entities-en_US.ent legacynotice-en_US.xml
legalnotice-content-en_US.xml legalnotice-content-p1-en_US.xml
legalnotice-content-p2-en_US.xml
legalnotice-content-p3-en_US.xml
legalnotice-content-p4-en_US.xml
legalnotice-content-p5-en_US.xml
legalnotice-content-p6-en_US.xml legalnotice-en_US.xml
legalnotice-opl-en_US.xml legalnotice-relnotes-en_US.xml
legalnotice-section-en_US.xml obsoletenotice-en_US.xml
Log Message:
Replaced references to "-en.xml" to "-en_US.xml", including in the
<DOCTYPE> areas.
--- NEW FILE bugreporting-en_US.xml ---
<tip>
<title>Reporting Document Errors</title>
<para>
To report an error or omission in this document, file a bug report in &BZ;
at &BZ-URL;. When you file your bug, select "&BZ-PROD;" as the
<systemitem>Product</systemitem>, and select the title of this document as
the <systemitem>Component</systemitem>. The version of this document is
&DOCID;.
</para>
<para>
The maintainers of this document will automatically receive your bug report.
On behalf of the entire &FED; community, thank you for helping us make
improvements.
</para>
</tip>
--- NEW FILE cvs-en_US.xml ---
<!-- $Id: -->
<!--
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY BOILERPLATE "This header makes editing XML easier" >
<!ENTITY FC "Fedora Core" >
<!ENTITY RH "Red Hat" >
]>
-->
<chapter id="ch-cvs">
<title>CVS</title>
<para>
The Concurrent Versions System (<application>CVS</application>)
provides a framework where multiple users can edit the same files.
As you can imagine, if a group of users edits the files in a single
directory, chaos would reign. Using <application>CVS</application>,
however, a group of people can safely work on the same set of files.
<application>CVS</application> keeps the master copy of the files,
and it records who changed what and when in a central repository. If
conflicts arise, <application>CVS</application> lets you know.
<application>CVS</application> is often used so that programmers can
share code, but it also works well for documentation.
</para>
<indexterm>
<primary>cvs</primary>
</indexterm>
<section id="sn-cvs-overview">
<title>How CVS Works</title>
<indexterm>
<primary>cvs</primary>
<secondary>how it works</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>overview</secondary>
</indexterm>
<para>
In most cases, each set of files that make up a package or project
is stored as a <firstterm>module</firstterm> on the CVS server.
</para>
<para>
When working with files from <application>CVS</application>, you
<firstterm>checkout</firstterm> a copy of the module on your local
file system. After modifying one or more files, you
<firstterm>commit</firstterm> them back to the central
<application>CVS</application> repository server.
</para>
<para>
With <application>CVS</application> you may edit a file without
first getting permission or locking the file. The
<wordasword>concurrent</wordasword> part of the
<application>CVS</application> name comes from its ability to
allow several different people to edit different parts of the same
file. As long as none of the changes overlap,
<application>CVS</application> can correctly record their changes.
In case of duplicate changes, they are clearly marked in the files
and the authors must resolve the issue among themselves.
</para>
<para>
When you commit changes, only changes to files the server knows
about are committed. In other words, if you created a file in your
local checkout of a module, the new file is not automatically
uploaded to the server. You must <firstterm>add</firstterm> the
file to the repository and then commit it. If you remove a file
from your local checkout of a module, you must specify that you
want to remove it from the repository on the CVS server and then
commit the removal of the file.
</para>
<para>
The specific commands to perform these actions are discussed in
<xref linkend="sn-cvs-cvscommands"></xref>.
</para>
<para>
If someone has modified the file between the last time you grabbed
the file from CVS and when you try to commit a change,
<application>CVS</application> will try to merge the changes into
the master copy of the <application>CVS</application> server. If
the content you changed is in a different location in the file
than the content changed by someone else, chances are, the commit
action will go through without a <firstterm>conflict</firstterm>.
If someone modified the same content as the content you just
changed and tried to commit, you will see a message that a file
conflict has occurred. Thus, you need to
<firstterm>update</firstterm> your files frequently. It is a good
practice to update them right before you start modifying a file.
Refer to <xref linkend="sn-cvs-cvscommands-conflicts"></xref> for
instructions on resolving conflicts.
</para>
</section>
<section id="sn-cvs-preparation">
<title>Preparing For CVS Use</title>
<indexterm>
<primary>cvs</primary>
<secondary>preparing for use</secondary>
</indexterm>
<para>
Before using <application>CVS</application>, you need to establish
an account with the <application>CVS</application> server. After
getting an account, you do not need to perform these actions
again.
</para>
<section id="sn-cvs-rpm-check">
<title>Is CVS Installed On Your System</title>
<indexterm>
<primary>cvs</primary>
<secondary>RPM installation</secondary>
</indexterm>
<para>
You must have the <application>CVS</application>
<abbrev>RPM</abbrev> package installed. Verify its presence by
typing the command:
</para>
<screen><prompt>$ </prompt><command>rpm -q cvs</command></screen>
<para>
If you see output similar to
<computeroutput>cvs-1.11.19-1</computeroutput>, then the package
is installed. A message similar to <computeroutput>package cvs
is not installed</computeroutput> means you must install the
<application>cvs</application> package before continuing. If you
do not know how to do this, consult your system administrator
who can install it for you.
</para>
</section>
<section id="sn-cvs-generate-keys">
<title>Generating SSH Keys</title>
<indexterm>
<primary>OpenSSH</primary>
<secondary>authorization keys</secondary>
</indexterm>
<para>
The <application>CVS</application> server uses
<application>SSH</application> Protocol 2 keys to authenticate
users. Thus, you need to generate a pair of keys before applying
for a <application>CVS</application> account. If you already
have an <application>SSH</application> <abbrev>DSA</abbrev> key,
you may skip this step.
</para>
<tip>
<title>Tip</title>
<para>
You already have a <abbrev>DSA</abbrev> key if you have the
file <filename>~/.ssh/id_dsa.pub</filename> on the system.
</para>
<para>
If your existing <abbrev>DSA</abbrev> key does not require a
<wordasword>passphrase</wordasword>, you are strongly urged to
generate one that does require a passphrase.
</para>
</tip>
<para>
Use the following steps to generate a <abbrev>DSA</abbrev> key
used by <application>SSH</application> Protocol 2. It is
required for an
<computeroutput>cvs.fedora.redhat.com</computeroutput>
<application>CVS</application> account.
</para>
<orderedlist>
<indexterm>
<primary>OpenSSH</primary>
<secondary><command>ssh-keygen</command>
</secondary>
</indexterm>
<indexterm>
<primary><command>ssh-keygen</command>
</primary>
</indexterm>
<listitem>
<para>
To generate a
<acronym>DSA</acronym>
key to work with version 2.0 protocol, at a shell prompt,
type the command:
</para>
<screen><prompt>$ </prompt><command>ssh-keygen -t dsa</command></screen>
<para>
Accept the default file location of
<filename>~/.ssh/id_dsa</filename>. You are strongly urged
to define and use a <firstterm>passphrase</firstterm> to
enhance the security of your key. Enter a passphrase
different than your account password and confirm it by
entering it again.
</para>
</listitem>
<listitem>
<para>
Copy your new key to the correct file by typing the
following at a shell prompt.
</para>
<screen><prompt>$ </prompt><command>cat ~/.ssh/id_dsa.pub>>~/.ssh/authorized_keys</command></screen>
<note>
<para>
Check this command carefully before you press the
<guibutton>ENTER</guibutton>
key. If <filename>~/.ssh/authorized_keys</filename>
already exists, the contents of
<filename>~/.ssh/id_dsa.pub</filename> will be appended to
the end of the <filename>~/.ssh/authorized_keys</filename>
file.
</para>
</note>
</listitem>
<listitem>
<para>
Change the permissions of your <filename>~/.ssh</filename>
directory and your keys with the commands:
</para>
<screen><prompt>$ </prompt><command>chmod 755 ~/.ssh</command>
<prompt>$ </prompt><command>chmod 644 ~/.ssh/authorized_keys</command></screen>
</listitem>
</orderedlist>
<tip>
<title>Tip</title>
<para>
You can have your system remember your passphrase so that you
do not have to type it every time you access the
<application>CVS</application> server. Refer to the
documentation of the <application>ssh-add</application>
program.
</para>
</tip>
</section>
</section>
<section id="sn-cvs-config">
<title>Configuring For CVS Access</title>
<indexterm>
<primary>cvs</primary>
<secondary>configuring for access</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>CVSROOT</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>CVS_RSH</secondary>
</indexterm>
<indexterm>
<primary>CVSROOT</primary>
</indexterm>
<indexterm>
<primary>CVS_RSH</primary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary><filename>.cvsrc</filename>
</secondary>
</indexterm>
<indexterm>
<primary><filename>.cvsrc</filename>
</primary>
</indexterm>
<section id="sn-cvs-config-cvsrc">
<title>Avoiding Repetitive Typing</title>
<indexterm>
<primary>cvs</primary>
<secondary>avoiding repetitive typing</secondary>
</indexterm>
<para>
Many <application>CVS</application> commands need certain
command line switches to operate consistently. Rather than
typing them every time that command is used, you can save the
switches in a file that <application>CVS</application> will read
before executing your command line.
</para>
<para>
Create a file named <filename>~/.cvsrc</filename> in your home
directory. It should contain the following commands, one per
line:
<screen><computeroutput>cvs -z3
diff -uNp
rdiff -uNp
update -dP</computeroutput></screen>
</para>
</section>
<section id="sn-cvs-config-anon">
<title>Configuring for Read-Only CVS Access</title>
<indexterm>
<primary>cvs</primary>
<secondary>configuring read-only access</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>anonymous access</secondary>
</indexterm>
<para>
If your goal is to download the various &FC; documents and to
render them on your system, you only need read-only access to
the <application>CVS</application> repository. Follow the
instructions in this section and then skip directly to
<xref linkend="sn-cvs-cvscommands-co"/>.
</para>
<para>
Change directories to where you want your files from
<application>CVS</application> to be located, and execute the
following commands:
</para>
<screen><prompt>$ </prompt><command>export CVSROOT=:pserver:cvs.fedora.redhat.com:/cvs/docs</command>
<prompt>$ </prompt><command>cvs login</command>
<prompt>$ </prompt><command>cvs checkout docs-common</command> <replaceable>module-name</replaceable>
<prompt>$ </prompt><command>cvs checkout</command> <replaceable>module-name</replaceable>
<prompt>$ </prompt><command>cd</command> <replaceable>module-name</replaceable></screen>
<para>
Once you have checked the module out, it doesn't matter what
your
<envar>CVSROOT</envar>
is set to because it is stored in the file
<filename>CVS/Root</filename> for each directory in your local
repository. As long as your current working directory has a
<filename>CVS/</filename> directory, the
<application>CVS</application> program will automatically locate
the &FC; repository.
</para>
</section>
<section id="sn-cvs-config-author">
<title>Configuring Read/Write CVS Access</title>
<indexterm>
<primary>cvs</primary>
<secondary>configuring read/write access</secondary>
</indexterm>
<indexterm>
<primary>cvs</primary>
<secondary>configuring access for authors</secondary>
</indexterm>
<para>
To author a new document or to change an existing one, you must
obtain full read/write access to the &FC; Docs
<application>CVS</application> repository. For the full details
on this process, refer to the
<ulink url="http://fedoraproject.org/wiki/DocsProject/NewWriters"><filename>http://fedoraproject.org/wiki/DocsProject/NewWriters</filename>
</ulink> web site. Below is a summary:
</para>
<itemizedlist>
<listitem>
<para>
Subscribe to the
<ulink url="https://listman.redhat.com/mailman/listinfo/fedora-docs-list"><filename>fedora-docs-list</filename>
</ulink>, which is the main forum for the project.
</para>
</listitem>
<listitem>
<para>
Generate a GNU Privacy Guard (<abbrev>GPG</abbrev>) key to
identify yourself to the project.
</para>
</listitem>
<listitem>
<para>
Register for a
<ulink url="http://bugzilla.redhat.com/"><filename>Bugzilla</filename>
</ulink> account, if you do not have one already.
<filename>Bugzilla</filename> is how we keep track of bugs,
changes and projects.
</para>
</listitem>
<listitem>
<para>
Post a
<ulink url="http://fedoraproject.org/wiki/DocsProject_2fSelfIntroduction">self
introduction</ulink> to the list.
</para>
</listitem>
</itemizedlist>
<para>
After your
<ulink url="http://fedoraproject.org/wiki/DocsProject_2fSelfIntroduction">self
introduction</ulink> has been approved your
<application>CVS</application> access will be granted.
</para>
<para>
Every author, and that includes you once your self introduction
has been received, has a unique
<envar>$CVSROOT</envar>
to access the <application>CVS</application> repository:
</para>
<screen><prompt>$ </prompt><command>export CVSROOT=:ext:</command><replaceable>yourname</replaceable><command>@cvs.fedora.redhat.com:/cvs/docs</command>
<prompt>$ </prompt><command>export CVS_RSH=/usr/bin/ssh</command></screen>
<para>
With the
<envar>$CVSROOT</envar>
and
<envar>$CVS_RSH</envar>
environment variables in place, you can access the repository:
</para>
<screen><prompt>$ </prompt><command>cvs co -c</command></screen>
<para>
You will be asked for the passphrase for your
<application>SSH</application> key. Press
<guibutton>ENTER</guibutton>
and you should receive a list of modules already in the
repository.
</para>
</section>
</section>
<section id="sn-cvs-cvscommands">
<title>Basic CVS Commands</title>
<indexterm>
<primary>cvs</primary>
<secondary>commands</secondary>
</indexterm>
<para>
After configuring your system to work with CVS, checkout the
modules you will be working on.
</para>
<tip>
<title>Tip</title>
<para>
To see if you need a correctly-set
<envar>$CVSROOT</envar>
variable, or the <option>-m </option>
<replaceable>repository</replaceable> command line switch, see
if you have a <filename>CVS/</filename> subdirectory in your
working directory.
</para>
<para>
If you have a <filename>CVS/</filename> directory,
<application>CVS</application> ignores any
<envar>$CVSROOT</envar>
or <option>-m</option> command line switch.
</para>
</tip>
<section id="sn-cvs-cvscommands-co">
<title>Checking Out Modules</title>
<indexterm>
<primary>cvs</primary>
<secondary>checking out modules</secondary>
</indexterm>
<para>
You only need to checkout a module once. After a local copy of
the module is on your system, it is on your system.
</para>
<para>
To checkout a module, use the following command:
</para>
<screen><prompt>$ </prompt><command>cvs co</command> <replaceable><module-name></replaceable></screen>
<para>
For example, to checkout the
<computeroutput>example-tutorial</computeroutput> module, change
to your work directory, and execute the following command:
</para>
<screen><prompt>$ </prompt><command>cvs co example-tutorial</command></screen>
<para>
A directory called <filename>example-tutorial/</filename> is
created in the current directory.
</para>
<para>
If a branch name is not specified when checking out a module, it
is referred to as the <firstterm>HEAD</firstterm> of the
<application>CVS</application> module.
</para>
<section id="sn-cvs-cvscommands-co-branch">
<title>Checking Out Branches of Modules</title>
<indexterm>
<primary>cvs</primary>
<secondary>check out modules</secondary>
<tertiary>checking out branches</tertiary>
</indexterm>
<para>
Think of a <application>CVS</application> branch as a version
of the files for a particular version of a manual or package.
</para>
<para>
To checkout a branch of a module, use the following command:
</para>
<screen><prompt>$ </prompt><command>cvs co</command> <option>-d</option> <replaceable><directory></replaceable> <option>-r</option> <replaceable><branchname></replaceable> <replaceable><module-name></replaceable></screen>
<para>
A directory named <replaceable><directory></replaceable>
is created, and the files for the
<replaceable><branchname></replaceable> branch of the
<replaceable><module-name></replaceable> module are
copied in the directory.
</para>
<para>
For example, to checkout a branch named BRANCH-VERSION-1.2
from the <computeroutput>mymodule</computeroutput> module, use
the command:
</para>
<screen><prompt>$ </prompt><command>cvs co -d mymodule-1.2 -r BRANCH-VERSION-1.2 mymodule</command></screen>
<para>
The BRANCH-VERSION-1.2 branch of the module is checked out in
the <filename>mymodule-1.2</filename> directory on your
system.
</para>
<para>
To determine which branches and tags exist for a file, use the
command:
</para>
<screen><prompt>$ </prompt><command>cvs status</command> <option>-v</option> <replaceable><filename></replaceable></screen>
<para>
For example, the status of the file
<filename>foo.sgml</filename> is as follows:
</para>
<screen>
<computeroutput>
===================================================================
File: foo.sgml Status: Up-to-date
Working revision: 1.47
Repository revision: 1.47 /cvs/docs/custom-guide/rhl-cg-en_US.sgml,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Existing Tags:
BRANCH-VERSION-1.2 (branch: 1.25.2)
</computeroutput>
</screen>
<para>
Only tags marked as branches in the second column under the
<computeroutput>Existing Tags</computeroutput> section can be
checked out as a branch.
</para>
</section>
</section>
<section id="sn-cvs-cvscommands-up">
<title>Updating Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>updating files</secondary>
</indexterm>
<para>
To retrieve the latest versions of the files in a module, change
to the directory that contains the files for the module and
execute the command:
</para>
<screen><command>cvs update</command></screen>
<para>
The latest versions of all the files in the module are
downloaded into your local copy. If you notice a file conflict,
refer to <xref linkend="sn-cvs-cvscommands-conflicts"></xref>.
</para>
</section>
<section id="sn-cvs-cvscommands-commit">
<title>Committing Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>committing files</secondary>
</indexterm>
<para>
After modifying files in your local version of a module, commit
them to save the changes on the <application>CVS</application>
server:
</para>
<screen><prompt>$ </prompt><command>cvs commit</command> <option>-m</option> "<replaceable>some log message</replaceable>" <replaceable>filename</replaceable></screen>
<note>
<para>
If you would prefer to write your log message with your
favorite text editor, as defined by the $VISUAL or the $EDITOR
environment variable, just omit the <userinput>-m "some
log message"</userinput>. The buffer will already contain
comments describing the change; you do not need to delete them
as you enter your own text.
</para>
</note>
<para>
The log message should be as descriptive as possible so that you
and anyone else working on the module understands what changed.
Using a log message such as <userinput>updated some
files</userinput> does not accurately describe what has changed
and will not help you in the future. If you are correcting a
bug, use the <application>Bugzilla</application> reference.
</para>
<para>
The <replaceable><filename></replaceable> can be one
filename, a series of filenames separated by spaces, or a group
of filenames specified using wildcards such as
<filename>*.png</filename> or <filename>foo-*.sgml</filename>.
</para>
<para>
If no filename or group of filenames is specified in the
<command>commit</command> command, all outstanding changes of
any kind are committed to the server. The command is recursive
and will include changes in any subdirectories of the module.
Use caution when issuing the <command>commit</command> command
without any filenames because you might not remember exactly
what files changed.
</para>
<para>
If you notice a file conflict, refer to
<xref linkend="sn-cvs-cvscommands-conflicts"></xref>.
</para>
</section>
<section id="sn-cvs-cvscommands-add">
<title>Adding Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>adding files</secondary>
</indexterm>
<para>
To add a file to a module, create the file in your local copy
then execute the following command:
</para>
<screen><prompt>$ </prompt><command>cvs add</command> <replaceable>file-to-add</replaceable></screen>
<para>
After adding the file, you must <command>commit</command> the
<command>add</command> to copy it to the server:
</para>
<screen><prompt>$ </prompt><command>cvs commit</command> <option>-m</option> "<replaceable>some log message</replaceable>" <replaceable>file-to-add</replaceable></screen>
</section>
<section id="sn-cvs-cvscommands-admin">
<title>Managing Binary Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>binary files</secondary>
</indexterm>
<para>
The most commonly-archived files are simple text files but
sometimes binary files are also archived. The
<application>cvs</application> program recognizes most common
filename extentions such as <filename>.png</filename> or
<filename>.jpg</filename>, so <application>cvs</application>
usually "does the right thing".
</para>
<para>
When a copy of a file is checked out of the repository,
<application>cvs</application> scans it for special keywords,
such as "<computeroutput>$id:$</computeroutput>" and
replaces the string with a generated value, such as the file
version number.
</para>
<para>
This keyword substitution usually corrupts binary files, so it
must be turned off if <application>cvs</application> does not
recognize your file as binary. To mark your file as being
binary, and thus needing the keyword expansion turned off, use
the command:
</para>
<screen width="60"><prompt>$ </prompt><command>cvs</command> <option>admin</option> <option>-kk</option> <replaceable>filename</replaceable></screen>
<para>
Note that the file must already be checked in to the
<abbrev>CVS</abbrev> repository before the
<option>admin</option> command can be used. This is OK, since
the keyword expansion is done as the file is checked out and
copied to the local directory, not when the file is committed to
the repository.
</para>
<tip>
<title>Recovering a binary file</title>
<para>
If you check a binary file into the repository and then find
it corrupted when it is checked out, do not panic. Simply use
the <option>admin</option> command as described above, delete
your local file copy, and check it out again.
</para>
</tip>
</section>
<section id="sn-cvs-cvscommands-rm">
<title>Removing Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>removing files</secondary>
</indexterm>
<para>
If a file is no longer needed in the module, use the
<command>remove</command> command to remove it from your local
copy and then <command>commit</command> the removal to the
server. Even though the file is removed from current version of
the module, an archived copy is still kept on the server and can
be retrieved at any time with the <command>add</command>
command.
</para>
<screen><prompt>$ </prompt><command>cvs rm -f</command> <replaceable>file-to-remove</replaceable></screen>
<para>
After removing the file, you must <command>commit</command> the
removal:
</para>
<screen><prompt>$ </prompt><command>cvs commit</command> <option>-m</option>"<replaceable>some log message</replaceable>" <replaceable>file-to-remove</replaceable></screen>
<para>
You can not use wildcards in the <command>commit</command>
command to identify removed files. They must be specified with a
exact filename.
</para>
<para>
If you need to rename a file, it is best to rename the file on
the <application>CVS</application> server so that the history of
the file is preserved. If you need to rename a file, send an
email to
<ulink url="mailto:cvsdocs-administrator@fedora.redhat.com"><filename>cvsdocs-administrator(a)fedora.redhat.com</filename>
</ulink> asking to have the file renamed.
</para>
</section>
<section id="sn-cvs-cvscommands-status">
<title>Status of Files</title>
<indexterm>
<primary>cvs</primary>
<secondary>status of files</secondary>
</indexterm>
<para>
Sometimes it is necessary to view the
<firstterm>status</firstterm> of a file in a
<application>CVS</application> module. To view the status of a
file, use the command:
</para>
<screen><prompt>$ </prompt><command>cvs status</command> <replaceable>filename</replaceable></screen>
<para>
The status report of a repository file is as follows:
</para>
<variablelist>
<varlistentry>
<term><computeroutput>Up-to-date</computeroutput></term>
<listitem>
<para>
Your revision of the file is identical to the latest
revision on the <application>CVS</application> server.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Locally Modified</computeroutput></term>
<listitem>
<para>
You have updated to the latest revision from the server,
but then you modified the file on your system.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Locally Added</computeroutput></term>
<listitem>
<para>
You added the file with the <command>cvs add</command>
command but have not yet committed the addition of the
file.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Locally Removed</computeroutput></term>
<listitem>
<para>
You removed the file with the <command>cvs
remove</command> command but have not yet committed the
removal.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Needs Checkout</computeroutput></term>
<listitem>
<para>
A newer version of the file is on the server and needs to
be retrieved. Even though the status includes the word
checkout, it really means that you need to update your
files with the <command>cvs update</command> command.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Needs Patch</computeroutput></term>
<listitem>
<para>
The revision in your local checkout needs a patch to be
the latest revision from the server. Issue the
<command>cvs update</command> command to resolve.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Needs Merge</computeroutput></term>
<listitem>
<para>
A newer revision exists on the server and your local
version contains modification not yet committed. This
status usually occurs if you don't have the latest
revision of the file and edit it anyway.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>File had conflicts on merge</computeroutput></term>
<listitem>
<para>
Similar to <computeroutput>Needs Merge</computeroutput>,
except when you tried to issue the <command>cvs
update</command> command, the differences could not be
resolved automatically. Refer to
<xref linkend="sn-cvs-cvscommands-conflicts"></xref> for
more information on resolving conflicts.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><computeroutput>Unknown</computeroutput></term>
<listitem>
<para>
The <application>CVS</application> server does not know
anything about this file. It has neither been added nor
removed locally and has never been committed to the
server. This status usually occurs for files you should
not commit to <application>CVS</application> such as
<filename>generated-index.sgml</filename> or for files
that you want to add to the repository but have not yet
issued the <command>cvs add</command> command.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section id="sn-cvs-cvscommands-conflicts">
<title>Resolving Conflicts</title>
<indexterm>
<primary>cvs</primary>
<secondary>resolving conflicts</secondary>
</indexterm>
<para>
If you modify a file and the same region is modified by someone
else and committed first, you will probably see a message
similar to the following when committing the file or updating
your local copy of the module:
</para>
<screen>
<computeroutput>
RCS file: /cvs/docs/module-name/filename.sgml,v
retrieving revision 1.12
retrieving revision 1.13
Merging differences between 1.12 and 1.13 into filename.sgml
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in filename.sgml
C filename.sgml
</computeroutput>
</screen>
<para>
To resolve the conflict, open the file, search for
<computeroutput><<<<<<<</computeroutput>
and determine which version of the content is correct. For
example:
</para>
<screen>
<computeroutput>
<para>
Some sentence.
<<<<<<< filename.sgml
A sentence that was changed in the working copy.
=======
A same sentence that was changed differently and committed.
>>>>>>> 1.13
</para>
</computeroutput>
</screen>
<para>
The content between the
<computeroutput><<<<<<<</computeroutput>,
and the <computeroutput>=======</computeroutput> is the content
from your working copy. The content between the
<computeroutput>=======</computeroutput> and the
<computeroutput>>>>>>>></computeroutput> is
the content from the server.
</para>
<para>
Resolve the conflict by editing your copy, and commit the file.
</para>
</section>
<section id="sn-cvs-cvscommands-summary">
<title>Summary</title>
<indexterm>
<primary>cvs</primary>
<secondary>commands</secondary>
<tertiary>summary of</tertiary>
</indexterm>
<para>
All commands assume you are in the proper directory for the
<application>CVS</application> module.
</para>
<table frame="all" id="tb-cvs-basic-commands">
<title>Basic CVS Commands</title>
<tgroup cols="2">
<colspec colnum="1" colname="shortcut" colwidth="30"/>
<colspec colnum="2" colname="description" colwidth="60"/>
<thead>
<row>
<entry>Command</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry><command>cvs checkout
<replaceable><module-name></replaceable></command>
or <command>cvs co <replaceable><module-name></replaceable></command>
</entry>
<entry>Creates a directory called
<replaceable><module-name></replaceable> with the contents of the
module in the directory</entry>
</row>
<row>
<entry><command>cvs co -d <replaceable><directory></replaceable> -r <replaceable><branchname></replaceable><replaceable><module-name></replaceable></command>
</entry>
<entry>Creates the <replaceable><directory></replaceable> directory
with the contents of the <replaceable><branchname></replaceable>
branch of the <replaceable><module-name></replaceable> module</entry>
</row>
<row>
<entry><command>cvs update</command> or <command>cvs up</command>
</entry>
<entry>Update your files with the latest files from the CVS server</entry>
</row>
<row>
<entry><command>cvs add <replaceable><filename></replaceable></command>
</entry>
<entry>Add a new file "filename" to the CVS server</entry>
</row>
<row>
<entry><command>cvs commit -m "My message"
<replaceable><filename></replaceable></command>
</entry>
<entry>Update file <replaceable><filename></replaceable> with the
latest copy from your computer</entry>
</row>
<row>
<entry><command>cvs log <replaceable><filename></replaceable></command>
</entry>
<entry>View the commit messages for the file <replaceable><filename></replaceable>
</entry>
</row>
<row>
<entry><command>cvs status <replaceable><filename></replaceable></command>
</entry>
<entry>View status of the file, such as <computeroutput>Locally
Modified</computeroutput>
</entry>
</row>
<row>
<entry><command>cvs status -v <replaceable><filename></replaceable></command>
</entry>
<entry>View existing tags and branches for file</entry>
</row>
<row>
<entry><command>cvs diff <replaceable><filename></replaceable></command>
</entry>
<entry>Show diff of the working copy of the file and the latest
version of the file for the branch</entry>
</row>
<row>
<entry><command>cvs diff -r1.1 -r1.2 <replaceable><filename></replaceable></command>
</entry>
<entry>Show diff of version 1.1 and 1.2 for file</entry>
</row>
</tbody>
</tgroup>
</table>
<para>
For more information, read the CVS manual available on your
system at
<filename>/usr/share/doc/cvs-<replaceable><version-number></replaceable>/cvs.ps</filename>
(the CVS version might vary) and visit the CVS webpage available
at
<ulink url="http://www.cvshome.org/">http://www.cvshome.org/</ulink>.
</para>
<tip>
<title>Tip</title>
<para>
Since <application>CVS</application> is using
<application>ssh</application> to connect to the
<application>CVS</application> server, you will be prompted
your password before performing your
<application>CVS</application> request. If you want to
configure your machine so that you do not have to enter a
password, refer to the
<ulink url="http://redhat.com/docs/manuals/linux/RHL-9-Manual/custom-guide/s1-openssh..."><citetitle>&RH;
Linux 9 Customization Guide</citetitle> </ulink> for details
about using <command>ssh-agent</command>.
</para>
</tip>
</section>
</section>
</chapter>
--- NEW FILE deprecatednotice-en_US.xml ---
<note>
<title>DEPRECATED DOCUMENT</title>
<para>
This document is no longer supported by the &FDP;. One or more of the
following situations may have occurred:
</para>
<itemizedlist>
<listitem>
<para>
Changes in Fedora may have made this document inaccurate.
</para>
</listitem>
<listitem>
<para>
A more relevant document may be available.
</para>
</listitem>
<listitem>
<para>
This document may have been subsumed in a different document.
</para>
</listitem>
</itemizedlist>
<para>
Refer to the revision history for more information.
</para>
</note>
--- NEW FILE draftnotice-en_US.xml ---
<note>
<title>DRAFT</title>
<para>
This is a draft version of the document. It is subject to change at any time
and may not have been tested for technical accuracy yet. If you find any
errors, please report them via Bugzilla in bug &BUG-NUM;.
</para>
</note>
***** Error reading new file: [Errno 2] No such file or directory: 'fedora-entities-en_US.ent'
--- NEW FILE legacynotice-en_US.xml ---
<note>
<title>LEGACY DOCUMENT</title>
<para>
This document relates to a version of &FC; that is no longer
supported by the &FP;. Changes in later versions of &FC; may have
made this document inaccurate. Please check the &FDP; website at
&FDPDOCS-URL; for a current version before you continue reading this
document.
</para>
<para>
This version of the document will not be changed or amended, except
to correct errors that may result in data loss or a system security
weakness. If you believe that you have found such an error, please
report it via &BZ; in bug &BUG-NUM;.
</para>
</note>
--- NEW FILE legalnotice-content-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!--
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<section id="sn-legalnotice-content">
<title>Legal Notice</title> -->
<para>
Copyright (c) 2006 by Fedora Foundation and others. This material may be
distributed only subject to the terms and conditions set forth in the Open
Publication License, v1.0, available at <ulink
url="http://www.opencontent.org/openpub/"/>.
</para>
<para>
Garrett LeSage created the admonition graphics (note, tip, important,
caution, and warning).
Tommy Reynolds <email>Tommy.Reynolds(a)MegaCoder.com</email> created the callout graphics.
They all may be freely redistributed with documentation
produced for the <!-- &PROJECT; --> Fedora Project.
</para>
<!--
<para>
&DOCID;
</para>
-->
<!--
<para>
&RH; and the &RH; "Shadow Man" logo are registered trademarks of
&FORMAL-RHI; in the United States and other countries.
</para>
-->
<para>
FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, Inc.,
are registered or pending registration in the U.S. and other countries, and
are used here under license to the Fedora Foundation.
</para>
<para>
Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of
Red Hat, Inc. in the United States and other countries.
</para>
<para>
All other trademarks and copyrights referred to are the property of their
respective owners.
</para>
<para>
Documentation, as with software itself, may be subject to export control.
Read about Fedora Project export controls at <ulink
url="http://fedoraproject.org/wiki/Legal/Export" />.
</para>
<!-- </section> -->
<!--
-->
--- NEW FILE legalnotice-content-p1-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
Copyright (c) 2006 by Fedora Foundation and others. This material may be
distributed only subject to the terms and conditions set forth in the Open
Publication License, v1.0, available at <ulink
url="http://www.opencontent.org/openpub/"/>.
</para>
--- NEW FILE legalnotice-content-p2-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
Garrett LeSage created the admonition graphics (note, tip, important, caution,
and warning). Tommy Reynolds <email>Tommy.Reynolds(a)MegaCoder.com</email>
created the callout graphics. They all may be freely redistributed with
documentation produced for the <!-- &PROJECT; --> Fedora Project.
</para>
--- NEW FILE legalnotice-content-p3-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, Inc.,
are registered or pending registration in the U.S. and other countries, and
are used here under license to the Fedora Foundation.
</para>
--- NEW FILE legalnotice-content-p4-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
&RH; and the &RH; "Shadow Man" logo are registered trademarks of &FORMAL-RHI;
in the United States and other countries.
</para>
--- NEW FILE legalnotice-content-p5-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
All other trademarks and copyrights referred to are the property of their
respective owners.
</para>
--- NEW FILE legalnotice-content-p6-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd"[
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<para>
Documentation, as with software itself, may be subject to export control.
Read about Fedora Project export controls at <ulink
url="http://fedoraproject.org/wiki/Legal/Export">http://fedoraproject.org/wiki/Legal/Export</ulink>.
</para>
--- NEW FILE legalnotice-en_US.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<legalnotice id="legalnotice">
<xi:include href="legalnotice-content-p1-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p2-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p3-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p4-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p5-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</legalnotice>
--- NEW FILE legalnotice-opl-en_US.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<!--
To use the content of this legal notice in another document, simply
use the XInclude standard. Logically there are only two elements
you need to reference, as follows:
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="legalnotice-opl-en_US.xml"
xpointer="element(opl.permission)"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="legalnotice-opl-en_US.xml" xpointer="element(opl.require)"/>
You may insert these includes in any element which can contain a
<para> and an <orderedlist> element.
-->
<legalnotice id="legalnotice-opl">
<para id="opl.permission">
Permission is granted to copy, distribute, and/or modify this
document under the terms of the Open Publication Licence, Version
1.0, or any later version. The terms of the OPL are set out below.
</para>
<orderedlist numeration="upperroman" id="opl.terms">
<listitem id="opl.require">
<bridgehead>REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED
VERSIONS</bridgehead>
<para>
Open Publication works may be reproduced and distributed in
whole or in part, in any medium physical or electronic, provided
that the terms of this license are adhered to, and that this
license or an incorporation of it by reference (with any options
elected by the author(s) and/or publisher) is displayed in the
reproduction.
</para>
<para>
Proper form for an incorporation by reference is as follows:
</para>
<para>
Copyright (c) <year> by <author's name or designee>.
This material may be distributed only subject to the terms and
conditions set forth in the Open Publication License, vX.Y or
later (the latest version is presently available at <ulink
url="http://www.opencontent.org/openpub/"/>).
</para>
<para>
The reference must be immediately followed with any options
elected by the author(s) and/or publisher of the document (see
section VI). Commercial redistribution of Open
Publication-licensed material is permitted. Any publication in
standard (paper) book form shall require the citation of the
original publisher and author. The publisher and author's names
shall appear on all outer surfaces of the book. On all outer
surfaces of the book the original publisher's name shall be as
large as the title of the work and cited as possessive with
respect to the title.
</para>
</listitem>
<listitem id="opl.copyright">
<bridgehead>COPYRIGHT</bridgehead>
<para>
The copyright to each Open Publication is owned by its author(s)
or designee.
</para>
</listitem>
<listitem id="opl.scope">
<bridgehead>SCOPE OF LICENSE</bridgehead>
<para>
The following license terms apply to all Open Publication works,
unless otherwise explicitly stated in the document.
</para>
<para>
Mere aggregation of Open Publication works or a portion of an
Open Publication work with other works or programs on the same
media shall not cause this license to apply to those other
works. The aggregate work shall contain a notice specifying the
inclusion of the Open Publication material and appropriate
copyright notice.
</para>
<para>
SEVERABILITY. If any part of this license is found to be
unenforceable in any jurisdiction, the remaining portions of the
license remain in force.
</para>
<para>
NO WARRANTY. Open Publication works are licensed and provided
"as is" without warranty of any kind, express or implied,
including, but not limited to, the implied warranties of
merchantability and fitness for a particular purpose or a
warranty of non-infringement.
</para>
</listitem>
<listitem id="opl.modified.works">
<bridgehead>REQUIREMENTS ON MODIFIED WORKS</bridgehead>
<para>
All modified versions of documents covered by this license,
including translations, anthologies, compilations and partial
documents, must meet the following requirements:
</para>
<orderedlist>
<listitem>
<para>
The modified version must be labeled as such.
</para>
</listitem>
<listitem>
<para>
The person making the modifications must be identified and
the modifications dated.
</para>
</listitem>
<listitem>
<para>
Acknowledgement of the original author and publisher if
applicable must be retained according to normal academic
citation practices.
</para>
</listitem>
<listitem>
<para>
The location of the original unmodified document must be
identified.
</para>
</listitem>
<listitem>
<para>
The original author's (or authors') name(s) may not be used
to assert or imply endorsement of the resulting document
without the original author's (or authors') permission.
</para>
</listitem>
</orderedlist>
</listitem>
<listitem id="opl.good-practice">
<bridgehead>GOOD-PRACTICE RECOMMENDATIONS</bridgehead>
<para>
In addition to the requirements of this license, it is requested
from and strongly recommended of redistributors that:
</para>
<orderedlist>
<listitem>
<para>
If you are distributing Open Publication works on hardcopy
or CD-ROM, you provide email notification to the authors of
your intent to redistribute at least thirty days before your
manuscript or media freeze, to give the authors time to
provide updated documents. This notification should describe
modifications, if any, made to the document.
</para>
</listitem>
<listitem>
<para>
All substantive modifications (including deletions) be
either clearly marked up in the document or else described
in an attachment to the document.
</para>
</listitem>
<listitem>
<para>
Finally, while it is not mandatory under this license, it is
considered good form to offer a free copy of any hardcopy
and CD-ROM expression of an Open Publication-licensed work
to its author(s).
</para>
</listitem>
</orderedlist>
</listitem>
<listitem id="opl.options">
<bridgehead>LICENSE OPTIONS</bridgehead>
<para>
The author(s) and/or publisher of an Open Publication-licensed
document may elect certain options by appending language to the
reference to or copy of the license. These options are
considered part of the license instance and must be included
with the license (or its incorporation by reference) in derived
works.
</para>
<para>
A. To prohibit distribution of substantively modified versions
without the explicit permission of the author(s). "Substantive
modification" is defined as a change to the semantic content of
the document, and excludes mere changes in format or
typographical corrections.
</para>
<para>
To accomplish this, add the phrase 'Distribution of
substantively modified versions of this document is prohibited
without the explicit permission of the copyright holder.' to the
license reference or copy.
</para>
<para>
B. To prohibit any publication of this work or derivative works
in whole or in part in standard (paper) book form for commercial
purposes is prohibited unless prior permission is obtained from
the copyright holder.
</para>
<para>
To accomplish this, add the phrase 'Distribution of the work or
derivative of the work in any standard (paper) book form is
prohibited unless prior permission is obtained from the
copyright holder.' to the license reference or copy.
</para>
</listitem>
</orderedlist>
</legalnotice>
<!--
Local variables:
mode: xml
fill-column: 72
End:
-->
--- NEW FILE legalnotice-relnotes-en_US.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: -->
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<!--
Use this legalnotice for no-chunks/single-page HTML output. It is an optional
usage to move the bulk of the legalnotice to another location in the document.
If you use this legalnotice, you must include a call to the
LEGALNOTICE-SECTION entity, or include a similar <section> in your document.
The call to LEGALNOTICE-SECTION must happen where a <section> is otherwise
allowed. One good location is immediately following an introduction.
-->
<legalnotice id="legalnotice">
<para>
This document is released under the terms of the Open Publication License.
For more details, read the full legalnotice in <xref
linkend="sn-legalnotice" />.
</para>
<tip>
<title>Latest Release Notes on the Web</title>
<para>
These release notes may be updated. Visit <ulink
url="http://fedora.redhat.com/docs/release-notes/"/> to view the latest
release notes for Fedora Core 5.
</para>
</tip>
</legalnotice>
--- NEW FILE legalnotice-section-en_US.xml ---
<?xml version='1.0' encoding='UTF-8'?>
<!-- $Id: -->
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.docbook.org/xml/4.4/docbookx.dtd" [
<!-- *************** COMMON FDP entities *************** -->
<!ENTITY % FEDORA-ENTITIES SYSTEM "./fedora-entities-en_US.ent">
%FEDORA-ENTITIES;
]>
<!--
Use this legalnotice for no-chunks/single-page HTML output. It is an optional
usage to move the bulk of the legalnotice to another location in the document.
If you use this legalnotice, you must include a call to the
LEGALNOTICE-NOCHUNKS or LEGALNOTICE-RELNOTES. This gets the legal material in
the proper <legalnotice /> container.SECTION entity, or include a similar
<section> in your document. The call to LEGALNOTICE-SECTION must happen where
a <section> is otherwise allowed. One good location is immediately following
an introduction.
-->
<section id="sn-legalnotice">
<title>Legal Notice</title>
<xi:include href="legalnotice-content-p1-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p2-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p3-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p4-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p5-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="legalnotice-content-p6-en_US.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
</section>
--- NEW FILE obsoletenotice-en_US.xml ---
<note>
<title>OBSOLETE DOCUMENT</title>
<para>
This document relates to a version of &FC; that is no longer
supported. Changes in later versions of &FC; may have made this
document inaccurate. Please check the &FDP; website at
&FDPDOCS-URL; for a current version before you continue reading this
document.
</para>
<para>
This version of the document will not be changed or amended.
</para>
</note>
18 years, 4 months
- 1
- 0
install-guide/en fedora-install-guide-abouttoinstall.xml, 1.5, 1.6 fedora-install-guide-acknowledgements.xml, 1.5, 1.6 fedora-install-guide-adminoptions.xml, 1.6, 1.7 fedora-install-guide-beginninginstallation.xml, 1.6, 1.7 fedora-install-guide-bootloader.xml, 1.5, 1.6 fedora-install-guide-diskpartitioning.xml, 1.7, 1.8 fedora-install-guide-firstboot.xml, 1.6, 1.7 fedora-install-guide-installingpackages.xml, 1.5, 1.6 fedora-install-guide-intro.xml, 1.8, 1.9 fedora-install-guide-locale.xml, 1.6, 1.7 fedora-i
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/install-guide/en
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6253/en
Modified Files:
fedora-install-guide-abouttoinstall.xml
fedora-install-guide-acknowledgements.xml
fedora-install-guide-adminoptions.xml
fedora-install-guide-beginninginstallation.xml
fedora-install-guide-bootloader.xml
fedora-install-guide-diskpartitioning.xml
fedora-install-guide-firstboot.xml
fedora-install-guide-installingpackages.xml
fedora-install-guide-intro.xml fedora-install-guide-locale.xml
fedora-install-guide-networkconfig.xml
fedora-install-guide-nextsteps.xml
fedora-install-guide-other-instmethods.xml
fedora-install-guide-packageselection.xml
fedora-install-guide-rootpassword.xml
fedora-install-guide-techref.xml
fedora-install-guide-timezone.xml
fedora-install-guide-upgrading.xml fedora-install-guide.xml
Log Message:
Fix install-guide to build again with entities properly declared
Index: fedora-install-guide-abouttoinstall.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-abouttoinstall.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-abouttoinstall.xml 1 Mar 2006 01:43:13 -0000 1.5
+++ fedora-install-guide-abouttoinstall.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-acknowledgements.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-acknowledgements.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-acknowledgements.xml 1 Mar 2006 01:43:13 -0000 1.5
+++ fedora-install-guide-acknowledgements.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-adminoptions.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-adminoptions.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-adminoptions.xml 2 Mar 2006 01:24:58 -0000 1.6
+++ fedora-install-guide-adminoptions.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-beginninginstallation.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-beginninginstallation.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-beginninginstallation.xml 1 Mar 2006 12:52:56 -0000 1.6
+++ fedora-install-guide-beginninginstallation.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-bootloader.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-bootloader.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-bootloader.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-bootloader.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-diskpartitioning.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-diskpartitioning.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide-diskpartitioning.xml 2 Mar 2006 01:24:58 -0000 1.7
+++ fedora-install-guide-diskpartitioning.xml 2 Mar 2006 22:57:14 -0000 1.8
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-firstboot.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-firstboot.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-firstboot.xml 2 Mar 2006 01:24:58 -0000 1.6
+++ fedora-install-guide-firstboot.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-installingpackages.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-installingpackages.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-installingpackages.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-installingpackages.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-intro.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-intro.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-install-guide-intro.xml 1 Mar 2006 21:36:19 -0000 1.8
+++ fedora-install-guide-intro.xml 2 Mar 2006 22:57:14 -0000 1.9
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-locale.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-locale.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-locale.xml 2 Mar 2006 01:24:58 -0000 1.6
+++ fedora-install-guide-locale.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-networkconfig.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-networkconfig.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-networkconfig.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-networkconfig.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-nextsteps.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-nextsteps.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-nextsteps.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-nextsteps.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-other-instmethods.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-other-instmethods.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-other-instmethods.xml 2 Mar 2006 01:24:58 -0000 1.6
+++ fedora-install-guide-other-instmethods.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-packageselection.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-packageselection.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-install-guide-packageselection.xml 2 Mar 2006 01:24:58 -0000 1.6
+++ fedora-install-guide-packageselection.xml 2 Mar 2006 22:57:14 -0000 1.7
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-rootpassword.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-rootpassword.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-rootpassword.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-rootpassword.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-techref.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-techref.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-techref.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-techref.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-timezone.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-timezone.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-timezone.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-timezone.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide-upgrading.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide-upgrading.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-install-guide-upgrading.xml 1 Mar 2006 01:43:14 -0000 1.5
+++ fedora-install-guide-upgrading.xml 2 Mar 2006 22:57:14 -0000 1.6
@@ -2,9 +2,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-<!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<!-- $Id: -->
Index: fedora-install-guide.xml
===================================================================
RCS file: /cvs/docs/install-guide/en/fedora-install-guide.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-install-guide.xml 1 Mar 2006 21:36:19 -0000 1.7
+++ fedora-install-guide.xml 2 Mar 2006 22:57:14 -0000 1.8
@@ -3,9 +3,12 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
- <!ENTITY % FEDORA-ENTITIES SYSTEM "../locale-entities.xml">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "../fdp-entities.ent">
%FEDORA-ENTITIES;
+<!ENTITY % DOC-ENTITIES SYSTEM "../entities.ent">
+%DOC-ENTITIES;
+
]>
<book id="book" lang="en">
18 years, 4 months
- 1
- 0