[deployment-guide/comm-rel: 74/74] Merge branch 'master' into comm
dsilas
dsilas at fedoraproject.org
Tue Jul 6 21:15:42 UTC 2010
commit 62e407034006237c8029dbfd7bb99fe1d25751ee
Merge: ac3bc34... 8e15f0b...
Author: Douglas Silas <dhensley at redhat.com>
Date: Tue Jul 6 23:06:46 2010 +0200
Merge branch 'master' into comm
Conflicts:
en-US/Manually_Upgrading_the_Kernel.xml
en-US/PackageKit.xml
en-US/RPM.xml
en-US/Yum.xml
.gitignore | 2 +
en-US/ABRT.xml | 2 +-
en-US/Authentication_Configuration.xml | 987 ++++-
en-US/Console_Access.xml | 8 +-
en-US/Controlling_Access_to_Services.xml | 144 +-
en-US/Date_and_Time_Configuration.xml | 5 +-
en-US/Deployment_Guide.xml | 4 +
en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml | 198 +-
en-US/Email.xml | 4 +-
en-US/Keyboard_Configuration.xml | 250 +-
en-US/Log_Files.xml | 6 +-
en-US/Manually_Upgrading_the_Kernel.xml | 93 +-
en-US/Network_Configuration.xml | 101 +-
en-US/Network_Interfaces.xml | 10 +
en-US/OpenSSH.xml | 1002 +++--
en-US/PackageKit.xml | 89 +-
en-US/RPM.xml | 108 +-
en-US/SSSD.xml | 250 +-
en-US/Samba.xml | 4 +-
en-US/The_BIND_DNS_Server.xml | 6 +-
en-US/The_proc_File_System.xml | 5273 ++++++++++++++++++++
en-US/The_sysconfig_Directory.xml | 36 +-
en-US/Users_and_Groups.xml | 534 ++-
en-US/Yum.xml | 4 +-
en-US/images/Users_Groups-Create_New_User.png | Bin 35507 -> 123723 bytes
en-US/images/Users_Groups-User_Manager.png | Bin 26023 -> 44516 bytes
en-US/images/authconfig_LDAP_kerb.png | Bin 0 -> 52573 bytes
en-US/images/authconfig_advanced.png | Bin 0 -> 44688 bytes
en-US/images/group-new.png | Bin 3111 -> 20994 bytes
en-US/images/group-properties.png | Bin 2991 -> 50829 bytes
.../keyboard-configuration-applet-addition.png | Bin 0 -> 18519 bytes
.../keyboard-configuration-applet-observation.png | Bin 0 -> 15341 bytes
.../keyboard-configuration-applet-selection.png | Bin 0 -> 115084 bytes
en-US/images/keyboard-configuration-break-take.png | Bin 0 -> 75595 bytes
en-US/images/keyboard-configuration-break.png | Bin 0 -> 171411 bytes
.../keyboard-configuration-layouts-default.png | Bin 0 -> 3446 bytes
.../images/keyboard-configuration-layouts-new.png | Bin 0 -> 29253 bytes
.../keyboard-configuration-layouts-prioritize.png | Bin 0 -> 5071 bytes
.../keyboard-configuration-layouts-separate.png | Bin 0 -> 6495 bytes
.../images/keyboard-configuration-layouts-test.png | Bin 0 -> 45470 bytes
en-US/images/keyboard-configuration-layouts.png | Bin 0 -> 154144 bytes
en-US/images/keyboardconfig.png | Bin 10487 -> 0 bytes
en-US/images/user-properties.png | Bin 14297 -> 70120 bytes
en-US/images/user_pass_info.png | Bin 15665 -> 45963 bytes
44 files changed, 8012 insertions(+), 1108 deletions(-)
---
diff --cc en-US/Manually_Upgrading_the_Kernel.xml
index 7d2a8d0,eae8798..2f641ee
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@@ -14,10 -17,16 +17,18 @@@
<para>This chapter is therefore <emphasis>only</emphasis> useful for users who need to manually update a kernel package using the <command>rpm</command> command instead of <command>yum</command>.</para>
<warning>
<title>Use Yum to Install Kernels Whenever Possible</title>
- <para>Whenever possible, use either the <application>Yum</application> or <application>PackageKit</application> package manager to install a new kernel because they always <emphasis>install</emphasis> a new kernel instead of replacing the current one, which could potentially leave your system unable to boot.</para>
+ <para>Whenever possible, use either the <application>Yum</application> or <application>PackageKit</application> package manager <indexterm><primary>kernel</primary><secondary>installing kernel packages</secondary></indexterm>
+ <indexterm><primary>installing the kernel</primary></indexterm> to install a new kernel because they always <emphasis>install</emphasis> a new kernel instead of replacing the current one, which could potentially leave your system unable to boot.</para>
</warning>
+ <para>For more information on installing kernel packages with <application>Yum</application>, refer to <xref
+ linkend="sec-Updating_Packages"/>.</para>
+ <warning>
+ <title>Important</title>
+ <para>Building a custom kernel is not supported by the Red Hat Global Services Support team, and therefore is not explored in this manual.</para>
+ </warning>
+ <para>For more information on installing kernel packages<indexterm><primary>kernel</primary><secondary>installing kernel packages</secondary></indexterm> with <application>Yum</application>, refer to <xref
+ linkend="sec-Updating_Packages"/>. For information on Red Hat Network, refer to <xref
+ linkend="ch-rhnetwork"/>.</para>
<section
id="s1-kernel-packages">
<title>Overview of Kernel Packages</title>
@@@ -25,28 -34,55 +36,55 @@@
<itemizedlist>
<listitem>
<para>
- <package>kernel</package> — Contains the kernel for single, multicore and multiprocessor systems.</para>
- <package>kernel</package> —
++ <package>kernel</package> —
+ <indexterm><primary>kernel package</primary><secondary>kernel</secondary><tertiary>for single,multicore and multiprocessor systems</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>kernel</secondary><tertiary>for single,multicore and multiprocessor systems</tertiary></indexterm>
+ Contains the kernel for single, multicore and multiprocessor systems.</para>
</listitem>
<listitem>
<para>
- <package>kernel-devel</package> — Contains the kernel headers and makefiles sufficient to build modules against the <package>kernel</package> package.</para>
- <package>kernel-devel</package> —
++ <package>kernel-devel</package> —
+ <indexterm><primary>kernel package</primary><secondary>kernel-devel</secondary><tertiary>kernel headers and makefiles</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>kernel-devel</secondary><tertiary>kernel headers and makefiles</tertiary></indexterm>
+ Contains the kernel headers and makefiles sufficient to build modules against the <package>kernel</package> package.</para>
</listitem>
<listitem>
<para>
- <package>kernel-doc</package> — Contains documentation files from the kernel source. Various portions of the Linux kernel and the device drivers shipped with it are documented in these files. Installation of this package provides a reference to the options that can be passed to Linux kernel modules at load time.</para>
- <package>kernel-doc</package> —
++ <package>kernel-doc</package> —
+ <indexterm><primary>kernel package</primary><secondary>kernel-doc</secondary><tertiary>
+ documentation files</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>kernel-doc</secondary><tertiary>
+ documentation files</tertiary></indexterm>
+ documentation files from the kernel source. Various portions of the Linux kernel and the device drivers shipped with it are documented in these files. Installation of this package provides a reference to the options that can be passed to Linux kernel modules at load time.</para>
<para>By default, these files are placed in the <filename>/usr/share/doc/kernel-doc-<replaceable><kernel_version></replaceable>/</filename> directory.</para>
</listitem>
<listitem>
<para>
- <package>kernel-headers</package> — Includes the C header files that specify the interface between the Linux kernel and user-space libraries and programs. The header files define structures and constants that are needed for building most standard programs.</para>
- <package>kernel-headers</package> —
++ <package>kernel-headers</package> —
+ <indexterm><primary>kernel package</primary><secondary>kernel-headers</secondary><tertiary>
+ C header files files</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>kernel-headers</secondary><tertiary>
+ C header files files</tertiary></indexterm>
+ Includes the C header files that specify the interface between the Linux kernel and user-space libraries and programs. The header files define structures and constants that are needed for building most standard programs.</para>
</listitem>
<listitem>
<para>
- <package>kernel-firmware</package> — Contains all of the firmware files that are required by various devices to operate.</para>
- <package>kernel-firmware</package> —
++ <package>kernel-firmware</package> —
+ <indexterm><primary>kernel package</primary><secondary>kernel-firmware</secondary><tertiary>
+ firmware files</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>kernel-firmware</secondary><tertiary>
+ firmware files</tertiary></indexterm>
+ Contains all of the firmware files that are required by various devices to operate.</para>
</listitem>
<listitem>
<para>
- <package>perf</package> — Technically a documentation instead of kernel package, <package>perf</package> contains supporting documentation for the perf tool shipped in each kernel image subpackage.</para>
- <package>perf</package> —
- <package>kernel-firmware</package> —
++ <package>perf</package> —
++ <package>kernel-firmware</package> —
+ <indexterm><primary>kernel package</primary><secondary>perf</secondary><tertiary>
+ firmware files</tertiary></indexterm>
+ <indexterm><primary>packages</primary><secondary>perf</secondary><tertiary>
+ firmware files</tertiary></indexterm>
+ Technically a documentation instead of kernel package, <package>perf</package> contains supporting documentation for the perf tool shipped in each kernel image subpackage.</para>
</listitem>
</itemizedlist>
<!-- TBD6: ensure the release notes contain kernel-source pkg build instructions -->
@@@ -64,7 -100,12 +102,12 @@@
significance="normal">
<primary>boot media</primary>
</indexterm>
- <para>Before upgrading the kernel, it is recommended that you take some precautionary steps. The first step is to make sure working boot media exists for the system in case a problem occurs. If the boot loader is not configured properly to boot the new kernel, the system cannot be booted into &MAJOROS; without working boot media.</para>
+ <para>Before upgrading the kernel
+ <indexterm><primary>kernel</primary><secondary>upgrading</secondary><tertiary>preparing</tertiary></indexterm>
+ <indexterm><primary>kernel upgrading</primary><secondary>preparing</secondary></indexterm>
- , it is recommended that you take some precautionary steps. </para>
++ , it is recommended that you take some precautionary steps. </para>
+ <para>In the first step, make sure working boot media exists
+ <indexterm><primary>kernel</primary><secondary>upgrading</secondary><tertiary>working boot media</tertiary></indexterm>for the system in case a problem occurs. If the boot loader is not configured properly to boot the new kernel, the system cannot be booted into &MAJOROS; without working boot media.</para>
<!--silas: the following instructions for making (USB) boot media are adapted from the RHEL6 beta Installation Guide, "Alternative Method to Make Minimal USB Boot Media" section-->
<para>USB media often comes in the form of flash devices sometimes called <firstterm>pen drives</firstterm>, <firstterm>thumb disks</firstterm>, or <firstterm>keys</firstterm>, or as an externally-connected hard disk device. Almost all media of this type is formatted as a <systemitem
class="filesystem">VFAT</systemitem> file system. You can create bootable USB media on media formatted as <systemitem
@@@ -219,7 -260,7 +262,7 @@@ kernel-headers.x86_64 2.6.32-
class="trade">System i</trademark> (see <xref
linkend="bh-Verifying_the_Initial_RAM_Disk_Image_and_Kernel_on_IBM_eServer_System_i"/>), you can create an <systemitem
class="filesystem">initramfs</systemitem> by running the <command>dracut</command> command. However, you usually don't need to create an <systemitem
-- class="filesystem">initramfs</systemitem> manually: this step is automatically performed if the kernel and its associated packages are installed or upgraded from RPM packages distributed by &OSORG;.
++ class="filesystem">initramfs</systemitem> manually: this step is automatically performed if the kernel and its associated packages are installed or upgraded from RPM packages distributed by &OSORG;.
</para>
<para>You can verify that an <systemitem
class="filesystem">initramfs</systemitem> corresponding to your current kernel version exists and is specified correctly in the <filename>grub.conf</filename> configuration file by following this procedure:</para>
@@@ -426,20 -457,20 +469,20 @@@ timeout=
splashimage=(hd0,0)/grub/splash.xpm.gz
hiddenmenu
-title Red Hat Enterprise Linux (2.6.32-22.el6.x86_64)
+title Fedora (2.6.32.11-99.fc12.x86_64)
root (hd0,0)
- kernel /vmlinuz-2.6.32-22.el6.x86_64 ro root=/dev/mapper/vg_vm6b-lv_root rd_LVM_LV=vg_vm6b/lv_root rd_NO_LUKS rd_NO_MD rd_NO_DM LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=us rhgb quiet crashkernel=auto
- initrd /initramfs-2.6.32-22.el6.x86_64.img
+ kernel /vmlinuz-2.6.32.11-99.fc12.x86_64 ro root=UUID=39e5f931-5dd5-4a90-a0cf-52996767d592 noiswmd LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=dvorak rhgb quiet
+ initrd /initramfs-2.6.32.11-99.fc12.x86_64.img
-
+
-title Red Hat Enterprise Linux (2.6.32-19.el6.x86_64)
+title Fedora (2.6.32.10-90.fc12.x86_64)
root (hd0,0)
- kernel /vmlinuz-2.6.32-19.el6.x86_64 ro root=/dev/mapper/vg_vm6b-lv_root rd_LVM_LV=vg_vm6b/lv_root rd_NO_LUKS rd_NO_MD rd_NO_DM LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=us rhgb quiet crashkernel=auto
- initrd /initramfs-2.6.32-19.el6.x86_64.img
+ kernel /vmlinuz-2.6.32.10-90.fc12.x86_64 ro root=UUID=39e5f931-5dd5-4a90-a0cf-52996767d592 noiswmd LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=dvorak rhgb quiet
+ initrd /initramfs-2.6.32.10-90.fc12.x86_64.img
-
+
-title Red Hat Enterprise Linux 6 (2.6.32-17.el6.x86_64)
+title Fedora (2.6.32.9-70.fc12.x86_64)
root (hd0,0)
- kernel /vmlinuz-2.6.32-17.el6.x86_64 ro root=/dev/mapper/vg_vm6b-lv_root rd_LVM_LV=vg_vm6b/lv_root rd_NO_LUKS rd_NO_MD rd_NO_DM LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=us rhgb quiet
- initrd /initramfs-2.6.32-17.el6.x86_64.img</screen>
+ kernel /vmlinuz-2.6.32.9-70.fc12.x86_64 ro root=UUID=39e5f931-5dd5-4a90-a0cf-52996767d592 noiswmd LANG=en_US.UTF-8 SYSFONT=latarcyrheb-sun16 KEYBOARDTYPE=pc KEYTABLE=dvorak rhgb quiet
+ initrd /initramfs-2.6.32.9-70.fc12.x86_64.img</screen>
</example>
<para>If a separate <filename>/boot/</filename> partition was created, the paths to the kernel and the <systemitem
class="filesystem">initramfs</systemitem>
diff --cc en-US/PackageKit.xml
index eb3bb16,bd77a52..2a1f143
--- a/en-US/PackageKit.xml
+++ b/en-US/PackageKit.xml
@@@ -17,7 -23,7 +23,7 @@@
<section
id="sec-Updating_Packages_with_Software_Update">
<title>Updating Packages with Software Update</title>
--
++
<para>
<application>PackageKit</application> displays a starburst icon in the Notification Area whenever updates are available to be installed on your system.</para>
<mediaobject>
@@@ -181,8 -197,9 +197,9 @@@
</varlistentry>
<varlistentry>
<term>
- <guisubmenu>Free</guisubmenu>
+ <guisubmenu>Free</guisubmenu><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>Free</tertiary></indexterm>
</term>
-
++
<listitem>
<para>Search for packages which are considered to be free software Refer to the <ulink
url="https://fedoraproject.org/wiki/Licensing#SoftwareLicenses">Fedora Licensing List</ulink> for details on approved licenses.</para>
diff --cc en-US/RPM.xml
index 473a95c,39cb83c..e87cbfb
--- a/en-US/RPM.xml
+++ b/en-US/RPM.xml
@@@ -90,17 -90,27 +90,36 @@@
linkend="ch-yum"/> for details on how to use the official &MAJOROS; package repositories.</para>
</listitem>
<listitem>
++<<<<<<< HEAD
+ <para>The active &MAJOROS; mirrors contains many installable RPMs: <ulink
+ url="http://mirrors.fedoraproject.org/publiclist/"/>.</para>
++=======
+ <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>
++>>>>>>> master
</listitem>
<listitem>
- <para>Unofficial, third-party repositories not affiliated Red Hat also provide RPM packages.</para>
+ <para>Unofficial, third-party repositories not ahffiliated Red Hat also provide RPM packages.</para>
<important>
<title>Important</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>
++<<<<<<< HEAD
+ </itemizedlist>
++=======
+ <listitem>
+ <para>The Red Hat Errata Page, available at <ulink
+ url="http://www.redhat.com/apps/support/errata/"/>
+ </para>
+ </listitem>
+ <!-- TBD6: re-include for RHEL once RHN chapter is incorporated
+ <listitem>
+ <para>Red Hat Network — Refer to <xref
+ linkend="ch-rhnetwork"/> for more details on Red Hat Network.</para>
+ </listitem>-->
+ </itemizedlist>
++>>>>>>> master
</section>
<section
id="sec-Installing_and_Upgrading">
diff --cc en-US/Yum.xml
index 0f29ae8,8138e56..8645211
--- a/en-US/Yum.xml
+++ b/en-US/Yum.xml
@@@ -1,19 -1,11 +1,18 @@@
<?xml version='1.0'?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<chapter id="ch-yum">
-
+<chapter
+ id="ch-yum">
-
<title>Yum</title>
-
- <para><application>Yum</application> is the &OSORG; package manager that is able to query for information about packages, fetch packages from repositories, install and uninstall packages using automatic dependency resolution, and update an entire system to the latest available packages. <application>Yum</application> performs automatic dependency resolution on packages you are updating, installing or removing, and thus is able to automatically determine, fetch and install all available dependent packages. <application>Yum</application> can be configured with new, additional repositories, or <firstterm>package sources</firstterm>, and also provides many plugins which enhance and extend its capabilities. <application>Yum</application> is able to perform many of the same tasks that <application>RPM</application> can; additionally, many of the command line options are similar. <application>Yum</application> enables easy and simple package management on a single machine or on
groups of them.</para>
+ <indexterm>
+ <primary>Yum Package Manager</primary>
+ <see>Yum</see>
+ </indexterm>
+ <indexterm>
+ <primary>Yum</primary>
+ </indexterm>
+ <para>
+ <application>Yum</application> is the &OSORG; package manager that is able to query for information about packages, fetch packages from repositories, install and uninstall packages using automatic dependency resolution, and update an entire system to the latest available packages. <application>Yum</application> performs automatic dependency resolution on packages you are updating, installing or removing, and thus is able to automatically determine, fetch and install all available dependent packages. <application>Yum</application> can be configured with new, additional repositories, or <firstterm>package sources</firstterm>, and also provides many plugins which enhance and extend its capabilities. <application>Yum</application> is able to perform many of the same tasks that <application>RPM</application> can; additionally, many of the command line options are similar. <application>Yum</application> enables easy and simple package management on a single machine or on grou
ps of them.</para>
<important
id="important-Secure_Package_Management_with_GPG-Signed_Packages">
<title>Secure Package Management with GPG-Signed Packages</title>
More information about the docs-commits
mailing list