[deployment-guide: 182/185] Merged with the latest version for Red Hat Enterprise Linux.
Jaromir Hradilek
jhradile at fedoraproject.org
Sun May 15 21:26:37 UTC 2011
commit f44e582110b2b0ef1e9fa0e6ea5dfc55f13d4403
Merge: b7a251a ea82a5b
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Sat May 14 23:00:58 2011 +0200
Merged with the latest version for Red Hat Enterprise Linux.
Conflicts:
en-US/Book_Info.xml
en-US/Deployment_Guide.ent
en-US/Deployment_Guide.xml
en-US/Keyboard_Configuration.xml
en-US/Revision_History.xml
en-US/The_kdump_Crash_Recovery_Service.xml
en-US/Yum.xml
en-US/AUTHORS | 5 +
en-US/Author_Group.xml | 22 +-
...T.xml => Automatic_Bug_Reporting_Tool_ABRT.xml} | 103 +-
...mated_Tasks.xml => Automating_System_Tasks.xml} | 14 +-
en-US/{The_BIND_DNS_Server.xml => BIND.xml} | 332 +--
en-US/Book_Info.xml | 21 +-
...guration.xml => Configuring_Authentication.xml} | 39 +-
...guration_Protocol_DHCP.xml => DHCP_Servers.xml} | 33 +-
en-US/DNS_Servers.xml | 176 +
en-US/Date_and_Time_Configuration.xml | 10 +-
en-US/Deployment_Guide.ent | 8 +-
en-US/Deployment_Guide.xml | 213 +-
en-US/Directory_Servers.xml | 8 +
en-US/FTP.xml | 89 +-
en-US/Feedback.xml | 22 +-
en-US/File_and_Print_Servers.xml | 8 +
en-US/Introduction.xml | 67 -
.../Lightweight_Directory_Access_Protocol_LDAP.xml | 1026 -----
en-US/Log_Files.xml | 754 ----
en-US/{Email.xml => Mail_Servers.xml} | 49 +-
en-US/Managing_Users_and_Groups.xml | 4398 ++++++++++++++++++++
en-US/Manually_Upgrading_the_Kernel.xml | 54 +-
en-US/NetworkManager.xml | 306 ++
en-US/Network_Configuration.xml | 1472 -------
en-US/Network_Interfaces.xml | 24 +-
en-US/OpenLDAP.xml | 1479 +++++++
en-US/OpenSSH.xml | 34 +-
en-US/PackageKit.xml | 84 +-
en-US/Preface.xml | 243 +-
en-US/Printer_Configuration.xml | 1411 ++++---
en-US/Product_Subscriptions_and_Entitlements.xml | 4183 +++++++++++++++++++
en-US/RPM-Checking_Package_Signatures-Fedora.xml | 4 +-
en-US/RPM-Checking_Package_Signatures-RH.xml | 2 +-
en-US/RPM.xml | 32 +-
en-US/SSSD.xml | 1150 ++++--
en-US/Samba.xml | 240 +-
...ss_to_Services.xml => Services_and_Daemons.xml} | 179 +-
...Information.xml => System_Monitoring_Tools.xml} | 19 +-
en-US/The_Apache_HTTP_Server.xml | 572 ++--
en-US/The_X_Window_System.xml | 10 +-
en-US/The_kdump_Crash_Recovery_Service.xml | 259 +-
en-US/The_proc_File_System.xml | 130 +-
en-US/The_sysconfig_Directory.xml | 87 +-
en-US/Users_and_Groups.xml | 3034 --------------
en-US/Viewing_and_Managing_Log_Files.xml | 1197 ++++++
en-US/Web_Servers.xml | 18 +
en-US/Working_with_Kernel_Modules.xml | 62 +-
en-US/Yum.xml | 1770 +++++----
...ion_Configuration-authconfig-Authentication.png | Bin 42620 -> 0 bytes
...entication_Configuration-authconfig-Options.png | Bin 34331 -> 0 bytes
...tion_Configuration-authconfig-SSSD_Settings.png | Bin 26046 -> 0 bytes
...n_Configuration-authconfig-User_Information.png | Bin 35705 -> 0 bytes
en-US/images/Change_Runtime_Boolean.png | Bin 37646 -> 0 bytes
en-US/images/FirefoxWithKerberosSSO.png | Bin 39134 -> 0 bytes
...hical_Package_Management-additional_updates.png | Bin 56062 -> 0 bytes
...ical_Package_Management-removal_in_progress.png | Bin 81598 -> 0 bytes
.../images/Graphical_Package_Management-remove.png | Bin 67962 -> 0 bytes
en-US/images/Load_New_Policy.png | Bin 26160 -> 0 bytes
...work_Configuration-NM-Connect_automatically.png | Bin 22537 -> 0 bytes
...iguration-NM-Edit_System_eth0-IPv4_Settings.png | Bin 38274 -> 0 bytes
...ork_Configuration-NM-Edit_System_eth0-Wired.png | Bin 24831 -> 0 bytes
...rk_Configuration-NM-IPv4_Settings-Addresses.png | Bin 11247 -> 0 bytes
...nfiguration-NM-IPv4_Settings-DHCP_Client_ID.png | Bin 2223 -> 0 bytes
..._Configuration-NM-IPv4_Settings-DNS_Servers.png | Bin 3036 -> 0 bytes
...twork_Configuration-NM-IPv4_Settings-Method.png | Bin 3336 -> 0 bytes
...twork_Configuration-NM-IPv4_Settings-Routes.png | Bin 1942 -> 0 bytes
...nfiguration-NM-IPv4_Settings-Search_domains.png | Bin 3736 -> 0 bytes
.../Network_Configuration-NM-applet_states.png | Bin 3143 -> 0 bytes
en-US/images/PS2port.png | Bin 1544 -> 0 bytes
en-US/images/SCLogin.png | Bin 22542 -> 0 bytes
en-US/images/SCLoginEnrollment.png | Bin 48425 -> 0 bytes
en-US/images/SELinux_Decision_Process.png | Bin 43289 -> 0 bytes
en-US/images/Screenshot-1.png | Bin 33743 -> 0 bytes
en-US/images/Screenshot-2.png | Bin 56316 -> 0 bytes
en-US/images/apol-DIF.png | Bin 16757 -> 0 bytes
en-US/images/apol-TE-rule-search.png | Bin 17172 -> 0 bytes
en-US/images/apol-plain.png | Bin 14383 -> 0 bytes
en-US/images/arrow.png | Bin 295 -> 0 bytes
en-US/images/auth-panel.png | Bin 11737 -> 0 bytes
en-US/images/authconfig-auth.png | Bin 25099 -> 0 bytes
en-US/images/authconfig-options.png | Bin 36202 -> 0 bytes
en-US/images/authconfig-user-info.png | Bin 41560 -> 0 bytes
en-US/images/authentication_configuration.png | Bin 25829 -> 0 bytes
en-US/images/authicon.png | Bin 1294 -> 0 bytes
en-US/images/bugworkflow_new4.png | Bin 102443 -> 0 bytes
en-US/images/bugworkflow_old8.png | Bin 102392 -> 0 bytes
en-US/images/display-dualhead.png | Bin 34450 -> 0 bytes
en-US/images/display-hardware.png | Bin 21893 -> 0 bytes
en-US/images/display-settings.png | Bin 29285 -> 0 bytes
en-US/images/entitlements-overview.png | Bin 0 -> 294457 bytes
en-US/images/entitlements-subscriptions.png | Bin 0 -> 149240 bytes
en-US/images/ents-chkconfig1.png | Bin 0 -> 38408 bytes
en-US/images/ents-chkconfig2.png | Bin 0 -> 76575 bytes
en-US/images/ents-compliant.png | Bin 0 -> 134185 bytes
en-US/images/ents-global-subscr.png | Bin 0 -> 70222 bytes
en-US/images/ents-nag-warning.png | Bin 0 -> 32176 bytes
en-US/images/ents-nag.png | Bin 0 -> 14601 bytes
en-US/images/flask-arch.png | Bin 8805 -> 0 bytes
en-US/images/flow-diagram.png | Bin 96998 -> 0 bytes
en-US/images/gnome-print-manager-list.png | Bin 9276 -> 0 bytes
en-US/images/gnome-print-manager.png | Bin 9838 -> 0 bytes
en-US/images/gnome-print-queue.png | Bin 9498 -> 84139 bytes
en-US/images/httpd-directories-add.png | Bin 35516 -> 0 bytes
en-US/images/httpd-directories.png | Bin 26266 -> 0 bytes
en-US/images/httpd-environment.png | Bin 32130 -> 0 bytes
en-US/images/httpd-general-options.png | Bin 35136 -> 0 bytes
en-US/images/httpd-listen.png | Bin 7472 -> 0 bytes
en-US/images/httpd-logging.png | Bin 33252 -> 0 bytes
en-US/images/httpd-main.png | Bin 18708 -> 0 bytes
en-US/images/httpd-server.png | Bin 28738 -> 0 bytes
en-US/images/httpd-siteconfig.png | Bin 42272 -> 0 bytes
en-US/images/httpd-tuning.png | Bin 33903 -> 0 bytes
en-US/images/httpd-virtualhosts-ssl.png | Bin 38277 -> 0 bytes
en-US/images/httpd-virtualhosts.png | Bin 13779 -> 0 bytes
en-US/images/icon-greencheck-pkgs.png | Bin 709 -> 0 bytes
en-US/images/icon-install-prep.png | Bin 818 -> 0 bytes
en-US/images/icon-removal-prep.png | Bin 665 -> 0 bytes
en-US/images/image_needed.png | Bin 2857 -> 0 bytes
en-US/images/individual-pkgs.png | Bin 43112 -> 0 bytes
en-US/images/install-depend-prep.png | Bin 19744 -> 0 bytes
en-US/images/install-prep.png | Bin 18139 -> 0 bytes
en-US/images/lvg.png | Bin 41627 -> 0 bytes
en-US/images/lvm-auto-config.png | Bin 81416 -> 0 bytes
en-US/images/lvm-main1.png | Bin 32318 -> 0 bytes
en-US/images/lvm-main10.png | Bin 28599 -> 0 bytes
en-US/images/lvm-main12.png | Bin 25755 -> 0 bytes
en-US/images/lvm-main13.png | Bin 40141 -> 0 bytes
en-US/images/lvm-main14.png | Bin 17864 -> 0 bytes
en-US/images/lvm-main15.png | Bin 50743 -> 0 bytes
en-US/images/lvm-main16.png | Bin 29837 -> 0 bytes
en-US/images/lvm-main17.png | Bin 56669 -> 0 bytes
en-US/images/lvm-main18.png | Bin 40304 -> 0 bytes
en-US/images/lvm-main2.png | Bin 34098 -> 0 bytes
en-US/images/lvm-main21.png | Bin 39504 -> 0 bytes
en-US/images/lvm-main23.png | Bin 52817 -> 0 bytes
en-US/images/lvm-main26.png | Bin 42510 -> 0 bytes
en-US/images/lvm-main27.png | Bin 22913 -> 0 bytes
en-US/images/lvm-main28.png | Bin 52104 -> 0 bytes
en-US/images/lvm-main3.png | Bin 36592 -> 0 bytes
en-US/images/lvm-main30.png | Bin 36875 -> 0 bytes
en-US/images/lvm-main31.png | Bin 39020 -> 0 bytes
en-US/images/lvm-main32.png | Bin 32577 -> 0 bytes
en-US/images/lvm-main33.png | Bin 33581 -> 0 bytes
en-US/images/lvm-main34.png | Bin 59948 -> 0 bytes
en-US/images/lvm-main36.png | Bin 24303 -> 0 bytes
en-US/images/lvm-main7.png | Bin 50620 -> 0 bytes
en-US/images/lvm-manual-boot.png | Bin 26012 -> 0 bytes
en-US/images/lvm-manual-done.png | Bin 75123 -> 0 bytes
en-US/images/lvm-manual-free.png | Bin 70264 -> 0 bytes
en-US/images/lvm-manual-lv.png | Bin 14007 -> 0 bytes
en-US/images/lvm-manual-lvdone.png | Bin 32505 -> 0 bytes
en-US/images/lvm-manual-postboot.png | Bin 72482 -> 0 bytes
en-US/images/lvm-manual-pv01.png | Bin 27569 -> 0 bytes
en-US/images/lvm-manual-pvdone.png | Bin 72040 -> 0 bytes
en-US/images/lvm-manual-vg.png | Bin 27336 -> 0 bytes
en-US/images/lvm/lvg.svg | 684 ---
en-US/images/lvm/lvols.svg | 286 --
en-US/images/lvols.png | Bin 27929 -> 0 bytes
en-US/images/mouseconfig.png | Bin 28653 -> 0 bytes
en-US/images/mthelena_host.png | Bin 0 -> 13874 bytes
en-US/images/n-t-n-ipsec-diagram.png | Bin 46269 -> 0 bytes
en-US/images/n-to-n-ipsec-local.png | Bin 18871 -> 0 bytes
en-US/images/n-to-n-ipsec-remote.png | Bin 21831 -> 0 bytes
en-US/images/neat-aliases.png | Bin 25874 -> 0 bytes
en-US/images/neat-dns.png | Bin 29720 -> 0 bytes
en-US/images/neat-ethernet-settings.png | Bin 31665 -> 0 bytes
en-US/images/neat-ethernet.png | Bin 22810 -> 0 bytes
en-US/images/neat-home-profile.png | Bin 26555 -> 0 bytes
en-US/images/neat-hosts.png | Bin 21047 -> 0 bytes
en-US/images/neat-isdn-settings.png | Bin 21917 -> 0 bytes
en-US/images/neat-isdn.png | Bin 27372 -> 0 bytes
en-US/images/neat-modem-settings.png | Bin 22319 -> 0 bytes
en-US/images/neat-modem.png | Bin 27471 -> 0 bytes
en-US/images/neat-office-profile.png | Bin 28052 -> 0 bytes
en-US/images/neat-tokenring-settings.png | Bin 21668 -> 0 bytes
en-US/images/neat-tokenring.png | Bin 27457 -> 0 bytes
en-US/images/neat-tonline1.png | Bin 28480 -> 0 bytes
en-US/images/neat-tonlineAcctsetup.png | Bin 21160 -> 0 bytes
en-US/images/neat-tonlineProvidertab.png | Bin 21773 -> 0 bytes
en-US/images/neat-wireless-settings.png | Bin 17606 -> 0 bytes
en-US/images/neat-wireless.png | Bin 27063 -> 0 bytes
en-US/images/neat-xdsl-selectdevicetype.png | Bin 26077 -> 0 bytes
en-US/images/neat-xdsl-settings.png | Bin 32416 -> 0 bytes
en-US/images/neat-xdsl.png | Bin 27564 -> 0 bytes
en-US/images/neat.png | Bin 28617 -> 0 bytes
en-US/images/nfs-add.png | Bin 12306 -> 0 bytes
en-US/images/nfs-general-options.png | Bin 33651 -> 0 bytes
en-US/images/nfs-server-settings.png | Bin 21289 -> 0 bytes
en-US/images/nfs-user-access.png | Bin 21082 -> 0 bytes
...raphical_Package_Management-software_update.xcf | Bin 223150 -> 0 bytes
en-US/images/package-selections.png | Bin 37271 -> 0 bytes
en-US/images/pam-icon.png | Bin 1863 -> 0 bytes
en-US/images/print-manager-menu.png | Bin 34704 -> 0 bytes
en-US/images/print_conf_window.png | Bin 0 -> 25792 bytes
en-US/images/printconf-add-printer.png | Bin 24113 -> 25284 bytes
en-US/images/printconf-config1.png | Bin 45311 -> 38236 bytes
en-US/images/printconf-config2.png | Bin 30893 -> 36077 bytes
en-US/images/printconf-config3.png | Bin 34432 -> 24632 bytes
en-US/images/printconf-config4.png | Bin 36553 -> 158664 bytes
en-US/images/printconf-config5.png | Bin 33780 -> 58801 bytes
en-US/images/printconf-config6.png | Bin 0 -> 29441 bytes
en-US/images/printconf-default-icon.png | Bin 456 -> 0 bytes
en-US/images/printconf-edit.png | Bin 20620 -> 0 bytes
en-US/images/printconf-ipp.png | Bin 25875 -> 37555 bytes
en-US/images/printconf-jetdirect.png | Bin 26510 -> 32516 bytes
en-US/images/printconf-local.png | Bin 25933 -> 0 bytes
en-US/images/printconf-lpd.png | Bin 13551 -> 36256 bytes
en-US/images/printconf-ncp.png | Bin 15621 -> 0 bytes
en-US/images/printconf-queue-name.png | Bin 16722 -> 0 bytes
en-US/images/printconf-select-driver.png | Bin 0 -> 35786 bytes
en-US/images/printconf-select-model.png | Bin 61313 -> 38501 bytes
en-US/images/printconf-sharing-general.png | Bin 10763 -> 0 bytes
en-US/images/printconf-sharing-hosts.png | Bin 12462 -> 0 bytes
en-US/images/printconf-sharing-queue.png | Bin 11243 -> 0 bytes
en-US/images/printconf-smb.png | Bin 41883 -> 48756 bytes
en-US/images/printconf-test-page.png | Bin 41118 -> 0 bytes
en-US/images/printer-notification-icon.png | Bin 20976 -> 0 bytes
en-US/images/raid-manual-boot-error.png | Bin 7211 -> 0 bytes
en-US/images/raid-manual-final.png | Bin 85231 -> 0 bytes
en-US/images/raid-manual-free.png | Bin 70264 -> 0 bytes
en-US/images/raid-manual-lvm-final.png | Bin 85750 -> 0 bytes
en-US/images/raid-manual-mntpt.png | Bin 16464 -> 0 bytes
en-US/images/raid-manual-part-add.png | Bin 27574 -> 0 bytes
en-US/images/raid-manual-part-bootready.png | Bin 73405 -> 0 bytes
en-US/images/raid-manual-part-opt.png | Bin 30662 -> 0 bytes
en-US/images/raid-manual-part-opt2.png | Bin 24733 -> 0 bytes
en-US/images/redhat-config-packages.png | Bin 30243 -> 0 bytes
en-US/images/redhat-config-users.png | Bin 23368 -> 0 bytes
en-US/images/redhat-optional-packages.png | Bin 50456 -> 0 bytes
en-US/images/registering.png | Bin 41039 -> 0 bytes
en-US/images/relevant-errata.png | Bin 71268 -> 0 bytes
en-US/images/removal-prep.png | Bin 42651 -> 0 bytes
en-US/images/remove-depend-prep.png | Bin 19835 -> 0 bytes
en-US/images/rh-securitylevel.png | Bin 24045 -> 0 bytes
.../networkconfig/n-t-n-ipsec-diagram.svg | 658 ---
en-US/images/rhsm-activate-email-popup.png | Bin 0 -> 15743 bytes
en-US/images/rhsm-activate.png | Bin 0 -> 33855 bytes
en-US/images/rhsm-compliance.png | Bin 0 -> 58894 bytes
en-US/images/rhsm-compliance2.png | Bin 0 -> 30410 bytes
en-US/images/rhsm-facts.png | Bin 0 -> 26223 bytes
en-US/images/rhsm-menu-item.png | Bin 0 -> 35028 bytes
en-US/images/rhsm-modify-reg.png | Bin 0 -> 32469 bytes
en-US/images/rhsm-prod-subscribe1.png | Bin 0 -> 19192 bytes
en-US/images/rhsm-proxy1.png | Bin 0 -> 18944 bytes
en-US/images/rhsm-proxy2.png | Bin 0 -> 27576 bytes
en-US/images/rhsm-register.png | Bin 0 -> 19313 bytes
en-US/images/rhsm-subscribe-avail.png | Bin 0 -> 61919 bytes
en-US/images/rhsm-subscribe-filter.png | Bin 0 -> 45066 bytes
en-US/images/rhsm-subscribe-prod.png | Bin 0 -> 103022 bytes
en-US/images/rhsm-subscribe-select.png | Bin 0 -> 80725 bytes
en-US/images/rhsm-subscribed.png | Bin 0 -> 74608 bytes
en-US/images/rhsm-subscribed2.png | Bin 0 -> 53232 bytes
en-US/images/rhsm-system-uuid.png | Bin 0 -> 35113 bytes
en-US/images/rhsm-unregister.png | Bin 0 -> 19192 bytes
en-US/images/rhsm-uploadcerts.png | Bin 0 -> 48158 bytes
en-US/images/rhsm-view-facts.png | Bin 0 -> 19249 bytes
en-US/images/rhsm-web-mainpage.png | Bin 0 -> 141862 bytes
en-US/images/samba-nautilus-machines.png | Bin 26281 -> 0 bytes
en-US/images/samba-nautilus.png | Bin 29301 -> 0 bytes
en-US/images/samba_domain.png | Bin 0 -> 14228 bytes
en-US/images/seaudit-Edit-filter.png | Bin 19615 -> 0 bytes
en-US/images/seaudit-Query-policy.png | Bin 29603 -> 0 bytes
.../seaudit-Select-target-type-filtering.png | Bin 16897 -> 0 bytes
en-US/images/seaudit-View-filtering.png | Bin 17914 -> 0 bytes
en-US/images/seaudit-plain.png | Bin 67137 -> 0 bytes
en-US/images/sec-ipsec-host2host.png | Bin 18948 -> 0 bytes
en-US/images/security-intro-to-mls.png | Bin 25124 -> 0 bytes
en-US/images/security-mls-data-flow.png | Bin 45353 -> 0 bytes
en-US/images/serialport.png | Bin 1948 -> 0 bytes
en-US/images/serv-config.png | Bin 34062 -> 0 bytes
en-US/images/system-config-nfs.png | Bin 16992 -> 0 bytes
en-US/images/tcp_wrap_diagram.png | Bin 37973 -> 0 bytes
en-US/images/usbport.png | Bin 862 -> 0 bytes
en-US/images/user-new.png | Bin 25478 -> 0 bytes
en-US/images/user_pass_groups.png | Bin 13630 -> 0 bytes
en-US/images/user_pass_info.png | Bin 52521 -> 0 bytes
en-US/images/your-rhn.png | Bin 59223 -> 0 bytes
277 files changed, 15955 insertions(+), 11125 deletions(-)
---
diff --cc en-US/Book_Info.xml
index 0b59c01,294fe9e..2a5ff59
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -4,12 -4,14 +4,14 @@@
<bookinfo>
<title>Deployment Guide</title>
<subtitle>Deployment, Configuration and Administration of &MAJOROSVER;</subtitle>
- <productname>Red Hat Enterprise Linux</productname>
- <productnumber>6</productnumber>
+ <productname>Fedora</productname>
- <productnumber>14</productnumber>
++ <productnumber>15</productnumber>
<edition>1</edition>
- <pubsnumber>60</pubsnumber>
- <pubsnumber>118</pubsnumber>
++ <pubsnumber>0</pubsnumber>
<abstract>
- <para>The <citetitle>Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
+ <para>
- The <citetitle pubwork="book">Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;. It is oriented towards system administrators with a basic understanding of the system.
++ The <citetitle pubwork="book">Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration, and administration of &MAJOROSVER;. It is oriented towards system administrators with a basic understanding of the system.
+ </para>
</abstract>
<corpauthor>
<inlinemediaobject>
diff --cc en-US/Deployment_Guide.ent
index ae89e47,7fedc4b..416e8fb
--- a/en-US/Deployment_Guide.ent
+++ b/en-US/Deployment_Guide.ent
@@@ -1,9 -1,9 +1,9 @@@
-<!ENTITY BOOKID 'doc-Deployment_Guide'>
-<!ENTITY HOLDER 'Red Hat, Inc'>
-<!ENTITY MAJOROS 'Red Hat Enterprise Linux'>
-<!ENTITY MAJOROSVER 'Red Hat Enterprise Linux 6'>
-<!ENTITY OSORG 'Red Hat'>
-<!ENTITY PKGOS "el6">
-<!ENTITY PRODUCT 'Red Hat Enterprise Linux 6'>
-<!ENTITY VERSIONNUM "6">
-<!ENTITY YEAR '2010, 2011'>
+<!ENTITY BOOKID 'deployment-guide'>
+<!ENTITY HOLDER 'Red Hat, Inc. and others'>
+<!ENTITY MAJOROS 'Fedora'>
- <!ENTITY MAJOROSVER 'Fedora 14'>
++<!ENTITY MAJOROSVER 'Fedora 15'>
+<!ENTITY OSORG 'The Fedora Project'>
- <!ENTITY PKGOS "fc14">
++<!ENTITY PKGOS "fc15">
+<!ENTITY PRODUCT 'Fedora Documentation'>
- <!ENTITY VERSIONNUM "14">
- <!ENTITY YEAR '2010, 2011'>
++<!ENTITY VERSIONNUM "15">
++<!ENTITY YEAR '2011'>
diff --cc en-US/RPM.xml
index ba0ccf1,c7645cf..e885d3d
--- a/en-US/RPM.xml
+++ b/en-US/RPM.xml
@@@ -132,13 -132,19 +132,13 @@@
linkend="ch-yum"/> for details on how to use the official &MAJOROS; package repositories.</para>
</listitem>
<listitem>
- <para>The Extra Packages for Enterprise Linux (EPEL) is a community effort to provide high-quality add-on packages for Red Hat Enterprise Linux<indexterm><primary>extra packages for Enterprise Linux (EPEL)</primary>
- <secondary>installable packages</secondary>
- </indexterm>
- <indexterm>
- <primary> packages</primary>
- <secondary>extra packages for Enterprise Linux (EPEL)</secondary>
- </indexterm>. Refer to <ulink
- url="http://fedoraproject.org/wiki/EPEL"/> for details on EPEL RPM packages.</para>
+ <para>The active &MAJOROS; mirrors contains many installable RPMs: <ulink
+ url="http://mirrors.fedoraproject.org/publiclist/"/>.</para>
</listitem>
<listitem>
- <para>Unofficial, third-party repositories not ahffiliated Red Hat also provide RPM packages.</para>
+ <para>Unofficial, third-party repositories not affiliated with &OSORG; also provide RPM packages.</para>
<important>
- <title>Important</title>
+ <title>Third-party repositories and package compatibility</title>
<para>When considering third-party repositories for use with your &MAJOROS; system, pay close attention to the repository's web site with regard to package compatibility before adding the repository as a package source. Alternate package repositories may offer different, incompatible versions of the same software, including packages already included in the &MAJOROS; repositories.</para>
</important>
</listitem>
More information about the docs-commits
mailing list