[deployment-guide/comm-rel: 727/727] Merge branch 'master' into comm
Jaromir Hradilek
jhradile at fedoraproject.org
Tue Oct 19 13:26:56 UTC 2010
commit d37fb55d1ca9616ecf55352a749a0150b3cf9e2c
Merge: bc5bc0f... fbc6a73...
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Tue Oct 19 14:18:11 2010 +0200
Merge branch 'master' into comm
Conflicts:
en-US/Deployment_Guide.ent
en-US/Deployment_Guide.xml
en-US/Manually_Upgrading_the_Kernel.xml
en-US/RPM.xml
Resolved.
.gitignore | 2 +
en-US/ABRT.xml | 813 ++-
en-US/Authentication_Configuration.xml | 11 +-
en-US/Automated_Tasks.xml | 370 +-
en-US/Book_Info.xml | 2 +-
en-US/Controlling_Access_to_Services.xml | 4 +-
en-US/Date_and_Time_Configuration.xml | 2 +-
en-US/Deployment_Guide.xml | 90 +-
en-US/Dynamic_Host_Configuration_Protocol_DHCP.xml | 10 +-
en-US/Email.xml | 605 +-
en-US/FTP.xml | 153 +-
en-US/Gathering_System_Information.xml | 93 +-
en-US/General_Parameters_and_Modules.xml | 1283 ----
en-US/Introduction.xml | 15 +-
.../Lightweight_Directory_Access_Protocol_LDAP.xml | 1642 ++--
en-US/Log_Files.xml | 784 ++-
en-US/Manually_Upgrading_the_Kernel.xml | 381 +-
en-US/Network_Configuration.xml | 300 +-
en-US/Network_Interfaces.xml | 18 +-
en-US/OpenSSH.xml | 2 +-
en-US/PackageKit.xml | 14 +-
en-US/Printer_Configuration.xml | 2 +-
en-US/RPM.xml | 7 +-
en-US/SSSD.xml | 408 +-
en-US/Samba.xml | 411 +-
en-US/The_Apache_HTTP_Server.xml | 7966 ++++++++++----------
en-US/The_BIND_DNS_Server.xml | 3488 +++++----
en-US/The_X_Window_System.xml | 2 +-
en-US/The_kdump_Crash_Recovery_Service.xml | 933 +++
en-US/The_proc_File_System.xml | 342 +-
en-US/The_sysconfig_Directory.xml | 2501 +++++--
en-US/Users_and_Groups.xml | 2942 ++++----
en-US/Working_with_Kernel_Modules.xml | 1716 +++++
en-US/Yum.xml | 225 +-
en-US/icons/icon.svg | 247 +
en-US/images/ABRT-Main_Window.png | Bin 70322 -> 62743 bytes
en-US/images/ABRT-Notification_Area_alarm_icon.png | Bin 1009 -> 1187 bytes
en-US/images/ABRT-plugins.png | Bin 0 -> 72790 bytes
en-US/images/abrt_main.png | Bin 45328 -> 0 bytes
en-US/images/apache-mod_ssl-genkey-01.png | Bin 0 -> 139602 bytes
en-US/images/apache-mod_ssl-genkey-02.png | Bin 0 -> 145185 bytes
en-US/images/apache-mod_ssl-genkey-03.png | Bin 0 -> 91440 bytes
en-US/images/apache-mod_ssl-genkey-04.png | Bin 0 -> 147106 bytes
en-US/images/apache-mod_ssl-genkey-05.png | Bin 0 -> 137555 bytes
en-US/images/apache-mod_ssl-genkey-06.png | Bin 0 -> 148690 bytes
en-US/images/apache-mod_ssl-genkey-07.png | Bin 0 -> 144241 bytes
en-US/images/genkey1.png | Bin 9587 -> 0 bytes
en-US/images/genkey10.png | Bin 16485 -> 0 bytes
en-US/images/genkey11.png | Bin 7436 -> 0 bytes
en-US/images/genkey2.png | Bin 10374 -> 0 bytes
en-US/images/genkey3.png | Bin 18324 -> 0 bytes
en-US/images/genkey4.png | Bin 6604 -> 0 bytes
en-US/images/genkey5.png | Bin 9053 -> 0 bytes
en-US/images/genkey6.png | Bin 12479 -> 0 bytes
en-US/images/genkey7.png | Bin 17567 -> 0 bytes
en-US/images/genkey8.png | Bin 10794 -> 0 bytes
en-US/images/genkey9.png | Bin 11766 -> 0 bytes
en-US/images/gnome-system-monitor-filesystems.png | Bin 23184 -> 65650 bytes
en-US/images/gnome-system-monitor-memory.png | Bin 11217 -> 139795 bytes
en-US/images/gnome-system-monitor-processes.png | Bin 14094 -> 110184 bytes
en-US/images/icon.svg | 3936 ----------
...p-kernel_dump_configuration-expert_settings.png | Bin 0 -> 103326 bytes
...ernel_dump_configuration-filtering_settings.png | Bin 0 -> 81998 bytes
...kernel_dump_configuration-not_enough_memory.png | Bin 0 -> 8602 bytes
...p-kernel_dump_configuration-target_settings.png | Bin 0 -> 82693 bytes
en-US/images/kdump-kernel_dump_configuration.png | Bin 0 -> 85823 bytes
en-US/images/redhat-filter-enable.png | Bin 0 -> 194249 bytes
en-US/images/redhat-filter-sample.png | Bin 0 -> 16132 bytes
en-US/images/redhat-filters.png | Bin 0 -> 9495 bytes
en-US/images/redhat-logviewer-add.png | Bin 13899 -> 147036 bytes
en-US/images/redhat-logviewer-monitoring.png | Bin 0 -> 159116 bytes
en-US/images/redhat-logviewer-monitoring1.png | Bin 20495 -> 0 bytes
en-US/images/redhat-logviewer-monitoring2.png | Bin 27489 -> 0 bytes
en-US/images/redhat-logviewer-monitoring3.png | Bin 26805 -> 0 bytes
en-US/images/redhat-logviewer-prefs.png | Bin 27983 -> 0 bytes
en-US/images/redhat-logviewer-sample.png | Bin 21035 -> 0 bytes
en-US/images/redhat-logviewer.png | Bin 26264 -> 166037 bytes
.../recently_removed_files}/Console_Access.xml | 0
.../recently_removed_files}/Red_Hat_Network.xml | 0
79 files changed, 16415 insertions(+), 15305 deletions(-)
---
diff --cc en-US/Book_Info.xml
index be6f047,6731af6..f209e0a
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@@ -4,10 -4,10 +4,10 @@@
<bookinfo>
<title>Deployment Guide</title>
<subtitle>Deployment, configuration and administration of &MAJOROSVER;</subtitle>
- <productname>Red Hat Enterprise Linux</productname>
- <productnumber>6</productnumber>
+ <productname>Fedora Documentation</productname>
+ <productnumber>13</productnumber>
<edition>0.5</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>59</pubsnumber>
<abstract>
<para>The Deployment Guide documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
</abstract>
diff --cc en-US/Deployment_Guide.xml
index 7d8cc50,64896c2..ef2bc85
--- a/en-US/Deployment_Guide.xml
+++ b/en-US/Deployment_Guide.xml
@@@ -29,10 -28,13 +28,9 @@@
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
href="RPM.xml"/>
- <!-- RHEL6: silas: removing outdated RHEL5 RHN chapter: see bug 618878 for replacement chapter progress
- <xi:include
- xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Red_Hat_Network.xml"/>-->
</part>
<part
- id="pt-network-related-config"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,de-DE,ru-RU,fr-FR,zh-CN,it-IT,es-ES,ja-JP">
+ id="pt-network-related-config">
<title>Network-Related Configuration</title>
<partintro>
<para>After explaining how to configure the network, this part discusses topics related to networking such as how to allow remote logins, share files and directories over the network, and set up a Web server.</para>
@@@ -93,54 -82,44 +78,39 @@@
<partintro>
<para>Part of a system administrator's job is configuring the system for various tasks, types of users, and hardware configurations. This section explains how to configure a &MAJOROS; system.</para>
</partintro>
- <!-- RHEL6: silas: removing the Console Access chapter as per BZ#561643
- This chapter will be replaced by one or more (of a combination of) ConsoleKit, PolicyKit and sudo chapters/sections (bugs 617222, 617221, 617224)
- <xi:include
- xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Console_Access.xml"/>-->
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Console_Access.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"/>
- <xi:include
- xmlns:xi="http://www.w3.org/2001/XInclude"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,zh-CN,fr-FR,es-ES"
- href="The_proc_File_System.xml" />
+ href="The_proc_File_System.xml" />
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="The_sysconfig_Directory.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,es-ES,zh-CN,fr-FR"/>
+ href="The_sysconfig_Directory.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Date_and_Time_Configuration.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,de-DE,pt-BR,es-ES,ja-JP,zh-CN,fr-FR"/>
+ href="Date_and_Time_Configuration.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Keyboard_Configuration.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,pt-BR,es-ES,zh-CN,fr-FR"/>
+ href="Keyboard_Configuration.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="The_X_Window_System.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,es-ES,fr-FR"/>
+ href="The_X_Window_System.xml"/>
<!--<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Configuring_the_X_Window_System.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,de-DE,fr-FR,zh-CN,pt-BR,it-IT,ko-KR,es-ES,ja-JP"/>-->
+ href="Configuring_the_X_Window_System.xml"/>-->
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Users_and_Groups.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,es-ES,fr-FR"/>
+ href="Users_and_Groups.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Printer_Configuration.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,fr-FR,es-ES"/>
+ href="Printer_Configuration.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Automated_Tasks.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,es-ES,ja-JP,fr-FR"/>
+ href="Automated_Tasks.xml"/>
<xi:include
xmlns:xi="http://www.w3.org/2001/XInclude"
- href="Log_Files.xml"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,ja-JP,es-ES,fr-FR"/>
+ href="Log_Files.xml"/>
</part>
<part
- id="pt-system-monitoring"
- lang="en-US,as-IN,bn-IN,gu-IN,hi-IN,kn-IN,ml-IN,mr-IN,or-IN,pa-IN,si-LK,ta-IN,te-IN,fr-FR,es-ES">
+ id="pt-system-monitoring">
<title>System Monitoring</title>
<partintro>
<para>System administrators also monitor system performance. &MAJOROS; contains tools to assist administrators with these tasks.</para>
diff --cc en-US/Manually_Upgrading_the_Kernel.xml
index 3cdae47,d60e714..befae5d
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@@ -397,22 -413,26 +419,21 @@@ vmlinuz-2.6.32.9-70.fc12.x86_64</screen
</screen>
<para>You must use the <option>--force</option> option if you want <command>dracut</command> to overwrite an existing <filename>initramfs</filename> (for example, if your <filename>initramfs</filename> has become corrupt). Otherwise <command>dracut</command> will refuse to overwrite the existing <filename>initramfs</filename> file:</para>
<screen>~]# <command>dracut</command>
-Will not override existing initramfs (/boot/initramfs-2.6.32-22.el6.x86_64.img) without --force</screen>
- <para>You can create an initramfs in the current directory by calling <command>
-dracut <replaceable><initramfs_name></replaceable> <replaceable><kernel_version></replaceable>
-</command>:</para>
+Will not override existing initramfs (/boot/initramfs-2.6.32.11-99.fc12.x86_64.img) without --force</screen>
- <para>You can create an initramfs in the current directory by calling <command>dracut <replaceable><initramfs_name></replaceable> <replaceable><kernel_version></replaceable>
- </command>:</para>
++ <para>You can create an initramfs in the current directory by calling <command>dracut <replaceable><initramfs_name></replaceable> <replaceable><kernel_version></replaceable></command>:</para>
<screen>~]# <command>dracut "initramfs-$(uname -r).img" $(uname -r)</command>
</screen>
<para>If you need to specify specific kernel modules to be preloaded, add the names of those modules (minus any file name suffixes such as <filename>.ko</filename>) inside the parentheses of the <computeroutput>add_dracutmodules="<replaceable><module></replaceable> <optional><replaceable><more_modules></replaceable>
- </optional>"</computeroutput> directive of the <filename>/etc/dracut.conf</filename> configuration file. You can list the file contents of an <filename>initramfs</filename> image file created by dracut by using the <command>lsinitrd <replaceable><initramfs_file></replaceable>
+ </optional>"</computeroutput> directive of the <filename>/etc/dracut.conf</filename> configuration file. You can list the file contents of an <filename>initramfs</filename> image file created by dracut by using the <command>lsinitrd <replaceable><initramfs_file></replaceable>
</command> command:</para>
- <screen>~]# <command>lsinitrd initramfs-2.6.32-22.el6.x86_64.img</command>
-initramfs-2.6.32-22.el6.x86_64.img:
+ <screen>~]# <command>lsinitrd initramfs-2.6.32.11-99.fc12.x86_64.img</command>
+initramfs-2.6.32.11-99.fc12.x86_64.img:
========================================================================
-dracut-004-17.el6
-========================================================================
-drwxr-xr-x 23 root root 0 May 3 22:34 .
-drwxr-xr-x 2 root root 0 May 3 22:33 proc
--rwxr-xr-x 1 root root 7575 Mar 25 19:53 init
-drwxr-xr-x 7 root root 0 May 3 22:34 etc
-drwxr-xr-x 2 root root 0 May 3 22:34 etc/modprobe.d
+drwxr-xr-x 23 root root 0 Apr 12 05:41 .
+drwxr-xr-x 2 root root 0 Apr 12 05:41 mount
+-rwxr-xr-x 1 root root 934 Jan 15 14:07 mount/99mount-root.sh
+-rwxr-xr-x 1 root root 230 Jan 15 14:07 mount/10resume.sh
- <lineannotation>output truncated</lineannotation>
+ <lineannotation>[output truncated]</lineannotation>
</screen>
<para>Refer to <command>man dracut</command> and <command>man dracut.conf</command> for more information on options and usage.</para>
</step>
diff --cc en-US/Yum.xml
index e63b603,eb32ada..4430867
--- a/en-US/Yum.xml
+++ b/en-US/Yum.xml
@@@ -441,19 -427,18 +438,18 @@@ Description: abrt is a tool to help use
</command> is similar to the <command>rpm -q --info <replaceable><package_name></replaceable>
</command> command, but provides as additional information the ID of the <application>Yum</application> repository the RPM package is found in (look for the <emphasis>From repo:</emphasis> line in the output).</para>
<para>
- <command>yumdb info <replaceable><package_name></replaceable> <optional><replaceable>more_names</replaceable>
- </optional>
+ <command>yumdb info <replaceable><package_name></replaceable> <optional><replaceable>more_names</replaceable></optional>
</command> can be used to query the <application>Yum</application> database for alternative and useful information about a package, including the checksum of the package (and algorithm used to produce it, such as SHA-256), the command given on the command line that was invoked to install the package (if any), and the reason that the package is installed on the system (where <computeroutput>user</computeroutput> indicates it was installed by the user, and <computeroutput>dep</computeroutput> means it was brought in as a dependency):</para>
<screen>~]# <command>yumdb info yum</command>
-yum-3.2.27-4.el6.noarch
- checksum_data = 15c8eaf583fabad6974a35b9f6c6527e49362fe4e23baec1682ef51a598e4abb
+yum-3.2.27-3.fc12.noarch
+ checksum_data = 8d7773ec28c954c69c053ea4bf61dec9fdea11a59c50a2c31d1aa2e24bc611d9
checksum_type = sha256
command_line = update
- from_repo = rhel
- from_repo_revision = 1271991599
- from_repo_timestamp = 1271991721
+ from_repo = updates
+ from_repo_revision = 1272392716
+ from_repo_timestamp = 1272414297
reason = user
- releasever = 6</screen>
+ releasever = 12</screen>
<para>See <command>man yumdb</command> for more information on the <command>yumdb</command> command.</para>
<para>Finally, the <command>yum history</command> command, which is new in &MAJOROSVER;, can be used to show a timeline of <application>Yum</application> transactions, the dates and times on when they occurred, the number of packages affected, whether transactions succeeded or were aborted, and if the RPM database was changed between transactions. Refer to the <computeroutput>history</computeroutput> section of <command>man yum</command> for details.</para>
</section>
More information about the docs-commits
mailing list