[deployment-guide/comm-rel-14: 618/677] Removed obsolete comments.
Jaromir Hradilek
jhradile at fedoraproject.org
Sun Nov 14 23:54:17 UTC 2010
commit 094689072f64e5b16eae812174445aa4e501a19a
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Thu Oct 21 16:08:37 2010 +0200
Removed obsolete comments.
en-US/OProfile.xml | 35 -------
en-US/The_X_Window_System.xml | 184 -------------------------------------
en-US/The_sysconfig_Directory.xml | 180 ------------------------------------
3 files changed, 0 insertions(+), 399 deletions(-)
---
diff --git a/en-US/OProfile.xml b/en-US/OProfile.xml
index 5f48520..d09a595 100644
--- a/en-US/OProfile.xml
+++ b/en-US/OProfile.xml
@@ -324,29 +324,6 @@
4
</entry>
</row>
-<!-- silas: no support for Itanium in RHEL6; ergo, removing
-<row>
- <entry>
- Itanium
- </entry>
- <entry>
- ia64/itanium
- </entry>
- <entry>
- 4
- </entry>
- </row>
- <row>
- <entry>
- Itanium 2
- </entry>
- <entry>
- ia64/itanium2
- </entry>
- <entry>
- 4
- </entry>
- </row>-->
<row>
<entry>
TIMER_INT
@@ -479,18 +456,6 @@
The time during which the processor is not stopped
</entry>
</row>
-<!-- silas: no support for Itanium in RHEL6; ergo, removing
-<row>
- <entry>
- Itanium 2
- </entry>
- <entry>
- CPU_CYCLES
- </entry>
- <entry>
- CPU Cycles
- </entry>
- </row>-->
<row>
<entry>
TIMER_INT
diff --git a/en-US/The_X_Window_System.xml b/en-US/The_X_Window_System.xml
index f4cc728..6868a28 100644
--- a/en-US/The_X_Window_System.xml
+++ b/en-US/The_X_Window_System.xml
@@ -31,9 +31,6 @@
</indexterm>
<para>While the heart of &MAJOROS; is the kernel, for many users, the face of the operating system is the graphical environment provided by the <firstterm>X Window System</firstterm>, also called <firstterm>X</firstterm>.</para>
<para>Other windowing environments have existed in the UNIX world, including some that predate the release of the X Window System in June 1984. Nonetheless, X has been the default graphical environment for most UNIX-like operating systems, including &MAJOROS;, for many years.</para>
- <!-- RHEL5: above replaces below, as per peer review by bforte at redhat.com
- <para>Various windowing environments have existed in the <trademark class="trade">UNIX</trademark> world for decades, predating many of the current mainstream operating systems. Through the years, X has become the dominant graphical environment for UNIX-like
- operating systems.</para> -->
<para>The graphical environment for &MAJOROS; is supplied by the <firstterm>X.Org Foundation</firstterm>, an open source organization created to manage development and strategy for the X Window System and related technologies. X.Org is a large-scale, rapidly developing project with hundreds of developers around the world. It features a wide degree of support for a variety of hardware devices and architectures, and can run on a variety of different operating systems and platforms. This release for &MAJOROS; specifically includes the X11R7.1 release of the X Window System.</para>
<para>The X Window System uses a client-server architecture. The <firstterm>X server</firstterm> (the <command>Xorg</command> binary) listens for connections from <firstterm>X client</firstterm> applications via a network or local loopback interface. The server communicates with the hardware, such as the video card, monitor, keyboard, and mouse. X client applications exist in the user-space, creating a <firstterm>graphical user interface</firstterm> (<firstterm>GUI</firstterm>) for the user and passing user requests to the X server.</para>
<section
@@ -45,64 +42,20 @@
<secondary>X server</secondary>
<tertiary>features of</tertiary>
</indexterm>
- <!-- silas: s-c-display removed from RHEL6
- <indexterm
- significance="normal">
- <primary>X</primary>
- <secondary>utilities</secondary>
- <tertiary>
- <application>system-config-display</application>
- </tertiary>
- </indexterm>-->
- <!-- RHEL5: ddomingo at redhat.com: replacement, mostly from http://ftp.x.org/pub/X11R7.1/doc/RELNOTES1.html#1 -->
<para>&MAJOROSVER; uses the X11R7.1 release as the base X Window System, which includes several video driver, EXA, and platform support enhancements over the previous release, among others. In addition, this release also includes several automatic configuration features for the X server.</para>
<para>X11R7.1 is the first release to take specific advantage of the modularization of the X Window System. This modularization, which splits X into logically distinct modules, makes it easier for open source developers to contribute code to the system.</para>
- <!-- RHEL5: peer review: above replaces below, less clumsy
- <para>The X11R7.1 release also features developmental modularization, which makes it much easier for open source developers to contribute to it.</para> --><!-- RHEL5: ddomingo at redhat.com: replaced by above, now X11R7
- <para>&RHEL; 5 uses the X11R6.8 release as the base X Window System, which includes many cutting-edge X.Org technology enhancements, such as 3D hardware acceleration support, the XRender extension for anti-aliased fonts, a modular
- driver-based design, and support for modern video hardware and input devices.</para> -->
<important>
<title>Important</title>
<para>&MAJOROS; no longer provides the <trademark
class="trade">XFree86</trademark> server packages. Before upgrading a system to the latest version of &MAJOROS;, be sure that the system's video card is compatible with the X11R7.1 release by checking the Red Hat Hardware Compatibility List located online at <ulink
url="http://hardware.redhat.com/">http://hardware.redhat.com/</ulink>.</para>
</important>
- <!-- RHEL5: ddomingo at redhat.com: replacement -->
<!-- TBD6: /usr/X11R6 is an obsolete directory for Fedora 12 -->
<para>In the X11R7.1 release, all libraries, headers, and binaries now live under <filename>/usr/</filename> instead of <filename>/usr/X11R6</filename>. The <filename>/etc/X11/</filename> directory contains configuration files for X client and server applications. This includes configuration files for the X server itself, the <command>xfs</command> font server, the X display managers, and many other base components.</para>
<para>The configuration file for the newer Fontconfig-based font architecture is still <filename>/etc/fonts/fonts.conf</filename>. For more on configuring and adding fonts, refer to <xref
linkend="s1-x-fonts"/>.</para>
- <!-- RHEL5: ddomingo at redhat.com: replacement above
- <para>The files related to the X11R6.8 release reside primarily in two locations:</para>
- <variablelist>
- <varlistentry>
- <term><emphasis><filename>/usr/X11R6/</filename></emphasis></term>
- <listitem>
- <para>Contains X server and some client applications, as well as X header files, libraries, modules, and documentation.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><filename>/etc/X11/</filename></term>
- <listitem>
- <para>Contains configuration files for X client and server applications. This includes configuration files for the X server itself, the <command>fs</command> font server, the X display managers, and many other base components.</para>
- <para>It is important to note that the configuration file for the newer Fontconfig-based font architecture is <filename>/etc/fonts/fonts.conf</filename> (which obsoletes the <filename>/etc/X11/XftConfig</filename> file). For
- more on configuring and adding fonts, refer to <xref linkend="s1-x-fonts"/>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- -->
<para>Because the X server performs advanced tasks on a wide array of hardware, it requires detailed information about the hardware it works on. The X server automatically detects some of this information; other details must be configured.</para>
<para>The installation program installs and configures X automatically, unless the X11R7.1 release packages are not selected for installation. However, if there are any changes to the monitor, video card or other devices managed by the X server, X must be reconfigured.</para>
- <!-- silas: s-c-display not in RHEL6; following section removed
- The best way to do this is to use the <application>X Configuration Tool</application> (<command>system-config-display</command>), particularly for devices that are not detected manually.</para>
- <para>In &MAJOROS;'s default graphical environment, the <application>X Configuration Tool</application> is available at System (on the panel) > <guimenu>Administration</guimenu> > <guimenu>Display</guimenu>.</para>
- <para>Changes made with the <application>X Configuration Tool</application> take effect after logging out and logging back in.</para>
- <para>For more information about <application>X Configuration Tool</application>, refer to <xref
- linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
- <!-- RHEL5: peer review: above 3 para replaces below
- <para>To start the <application>&RHXFREE86TOOL;</application> while in an active X session, go to &RHTHIRDMENU; > <guimenu>Administration</guimenu> >
- <guimenu>Display</guimenu>. After using the <application>&RHXFREE86TOOL;</application> during an X session, changes takes effect after logging out and logging back in. For more about using the
- <application>&RHXFREE86TOOL;</application>, refer to <xref linkend="ch-Configuring_the_X_Window_System"/>.</para> -->
<para>In some situations, reconfiguring the X server may require manually editing its configuration file, <filename>/etc/X11/xorg.conf</filename>. For information about the structure of this file, refer to <xref
linkend="s1-x-server-configuration"/>.</para>
</section>
@@ -153,9 +106,6 @@
<tertiary>GNOME</tertiary>
</indexterm>
<para>A desktop environment integrates various X clients to create a common graphical user environment and development platform.</para>
- <!-- RHEL5: peer review: above replaces below, more succinct
- <para>A desktop environment brings together assorted X clients which, when used together, create a common graphical user environment and development platform.</para>
- -->
<para>Desktop environments have advanced features allowing X clients and other running processes to communicate with one another, while also allowing all applications written to work in that environment to perform advanced tasks, such as drag and drop operations.</para>
<para>&MAJOROS; provides two desktop environments:</para>
<itemizedlist>
@@ -249,7 +199,6 @@
<para>
<firstterm>Window managers</firstterm> are X client programs which are either part of a desktop environment or, in some cases, stand-alone. Their primary purpose is to control the way graphical windows are positioned, resized, or moved. Window managers also control title bars, window focus behavior, and user-specified key and mouse button bindings.</para>
<para>Four window managers are included with &MAJOROS;:</para>
- <!-- RHEL5: ddomingo at redhat.com: replacement <variablelist> -->
<variablelist>
<varlistentry>
<term>
@@ -284,23 +233,6 @@
</listitem>
</varlistentry>
</variablelist>
- <!-- RHEL5: ddomingo at redhat.com: above <variablelist> replaces below <itemizedlist>
- <itemizedlist>
- <listitem>
- <para><command>kwin</command> — The <firstterm>KWin</firstterm> window manager is the default window manager for KDE. It is an efficient window manager which supports custom themes.</para>
- </listitem>
- <listitem>
- <para><command>metacity</command> — The <firstterm>Metacity</firstterm> window manager is the default window manager for GNOME. It is a simple and efficient window manager which supports custom themes.</para>
- </listitem>
- <listitem>
- <para><command>mwm</command> — The <firstterm>Motif</firstterm> window manager is a basic, standalone window manager. Since it is designed to be a standalone window manager, it should not be used in conjunction with GNOME or KDE.</para>
- </listitem>
- <listitem>
- <para><command>twm</command> — The minimalist <firstterm>Tab Window Manager</firstterm>, which provides the most basic tool set of any of the window managers and can be used either as a standalone or with a desktop environment. It is
- installed as part of the X11R6.8 release.</para>
- </listitem>
- </itemizedlist>
- -->
<para>To run any of the aforementioned window managers, you will first need to boot into Runlevel 3. For instructions on how to do this, refer to <xref
linkend="s1-services-runlevels"/>.</para>
<para>Once you are logged in to Runlevel 3, you will be presented with a terminal prompt, not a graphical environment. To start a window manager, type <command>xinit -e <replaceable><path-to-window-manager></replaceable>
@@ -320,9 +252,6 @@
<keycap>Alt</keycap>
<keycap>Backspace</keycap>
</keycombo>. Once you have exited the window manager, you can log back into Runlevel 5 by typing <command>startx</command> at the prompt.</para>
- <!-- RHEL5: peer review: aboves replace below.
- <para>These window managers can be run without desktop environments to gain a better sense of their differences. To do this, type the <command>xinit -e <replaceable><path-to-window-manager></replaceable></command> command, where
- <command><replaceable><path-to-window-manager></replaceable></command> is the location of the window manager binary file. The binary file can be found by typing <command>which <replaceable><window-manager-name></replaceable></command>, where <replaceable><window-manager-name></replaceable> is the name of the window manager you are querying.</para> -->
</section>
</section>
<section
@@ -346,10 +275,6 @@
<para>To load optional modules, they must be specified in the X server configuration file, <filename>/etc/X11/xorg.conf</filename>. For more information about loading modules, refer to <xref
linkend="s3-x-server-config-xorg.conf-modules"/>.</para>
<para>When &MAJOROSVER; is installed, the configuration files for X are created using information gathered about the system hardware during the installation process.</para>
- <!-- RHEL5: peer review: aboves replace belows
- <para>The X server is a single binary executable (<command>/usr/bin/Xorg</command>) that dynamically loads any necessary X server modules at runtime from the <filename>/usr/lib/xorg/modules/</filename> directory. Some of these modules are automatically loaded by the server, while others are optional and must be specified in the X server configuration file.</para>
- <para>The X server and associated configuration files are stored in the <filename>/etc/X11/</filename> directory. The configuration file for the X server is <filename>/etc/X11/xorg.conf</filename>. When &RHEL; is installed, the configuration files for X are created using information gathered about the system hardware during the installation process.</para>
- -->
<section
id="s2-x-server-config-xorg.conf">
<title>
@@ -408,10 +333,6 @@
</indexterm>
<para>The <filename>/etc/X11/xorg.conf</filename> file is comprised of many different sections which address specific aspects of the system hardware.</para>
<para>Each section begins with a <command>Section "<replaceable><section-name></replaceable>"</command> line (where <replaceable><section-name></replaceable> is the title for the section) and ends with an <command>EndSection</command> line. Each section contains lines that include option names and one or more option values. These are sometimes enclosed in double quotes (<command>"</command>).</para>
- <!-- RHEL5: BZ#225369
- <para>Each section begins with a <command>Section "<replaceable><section-name></replaceable>"</command> line (where <replaceable><section-name></replaceable> is the title for the section) and ends with an
- <command>EndSection</command> line. Within each of the sections are lines containing option names and at least one option value, sometimes surrounded with double quotes (<command>"</command>).</para>
- -->
<para>Lines beginning with a hash sign (<command>#</command>) are not read by the X server and are used for human-readable comments.</para>
<para>Some options within the <filename>/etc/X11/xorg.conf</filename> file accept a boolean switch which turns the feature on or off. Acceptable boolean values are:</para>
<itemizedlist>
@@ -483,9 +404,6 @@ EndSection</screen>
<command>ServerLayout</command> section</tertiary>
</indexterm>
<para>The <command>ServerLayout</command> section binds together the input and output devices controlled by the X server. At a minimum, this section must specify one output device and one input device. By default, a monitor (output device) and keyboard (input device) are specified.</para>
- <!-- RHEL5: peer review: above replaces below for clarity
- <para>The <command>ServerLayout</command> section binds together the input and output devices controlled by the X server. At a minimum, this section must specify one output device and one input device (a keyboard). It is advisable that a mouse also be specified.</para>
- -->
<para>The following example illustrates a typical <command>ServerLayout</command> section:</para>
<screen>Section "ServerLayout"
Identifier "Default Layout"
@@ -505,7 +423,6 @@ EndSection</screen>
<para>The following is an example of a typical <command>Screen</command> entry:</para>
<screen>Screen 0 "Screen0" 0 0</screen>
<para>The first number in this example <command>Screen</command> entry (<command>0</command>) indicates that the first monitor connector or <firstterm>head</firstterm> on the video card uses the configuration specified in the <command>Screen</command> section with the identifier <command>"Screen0"</command>.</para>
- <!-- RHEL5: peer review: below added for clarity -->
<para>An example of a <command>Screen</command> section with the identifier <command>"Screen0"</command> can be found in <xref linkend="s3-x-server-config-xorg.conf-screen"/>.</para>
<para>If the video card has more than one head, another <command>Screen</command> entry with a different number and a different <command>Screen</command> section identifier is necessary .</para>
<para>The numbers to the right of <command>"Screen0"</command> give the absolute X and Y coordinates for the upper-left corner of the screen (<command>0 0</command> by default).</para>
@@ -523,9 +440,6 @@ EndSection</screen>
</itemizedlist>
<para>It is possible to put more than one <command>ServerLayout</command> section in the <filename>/etc/X11/xorg.conf</filename> file. By default, the server only reads the first one it encounters, however.</para>
<para>If there is an alternative <command>ServerLayout</command> section, it can be specified as a command line argument when starting an X session.</para>
- <!-- RHEL5: peer review: above replaces below, clarity
- <para>It is possible to create more than one <command>ServerLayout</command> section. However, the server only reads the first one to appear unless an alternate <command>ServerLayout</command> section is specified as a
- command line argument.</para> -->
</section>
<section
id="s3-x-server-config-xorg.conf-files">
@@ -627,23 +541,6 @@ EndSection</screen>
EndSection</screen>
<para>instructs the X server to load the <filename>fbdevhw</filename> instead of the default modules.</para>
<para>As such, if you add a <command>Module</command> section to <filename>/etc/X11/xorg.conf</filename>, you will need to specify any default modules you want to load as well as any extra modules.</para>
- <!-- RHEL5: peer review: aboves replace below, for clarification of Module loading schema
- <para>The <command>Module</command> section specifies which modules the X server should load, overriding the default set of modules loaded during start-up. Modules are loaded from the <filename>/usr/lib/xorg/modules/</filename> directory unless otherwise specified by the optional <command>ModulePath</command> parameter. By default, the X server automatically loads the following modules:
- <itemizedlist>
- <listitem><para><filename>extmod</filename></para></listitem>
- <listitem><para><filename>dbe</filename></para></listitem>
- <listitem><para><filename>glx</filename></para></listitem>
- <listitem><para><filename>freetype</filename></para></listitem>
- <listitem><para><filename>type1</filename></para></listitem>
- <listitem><para><filename>record</filename></para></listitem>
- <listitem><para><filename>dri</filename></para></listitem>
- </itemizedlist></para>
- <para>The following example illustrates a typical <command>Module</command> section:</para>
- <screen>Section "Module"
- Load "fbdevhw"
-EndSection</screen>
- <para>This example instructs the X server to load the <filename>fbdevhw</filename> module <emphasis>instead</emphasis> of the default modules. As such, you will also need to specify any default modules you want to load normally when adding a <command>Module</command> section to the <filename>xorg.conf</filename>.</para>
- -->
</section>
<section
id="s3-x-server-config-xorg.conf-inputd">
@@ -660,8 +557,6 @@ EndSection</screen>
<command>InputDevice</command> section</tertiary>
</indexterm>
<para>Each <command>InputDevice</command> section configures one input device for the X server. Systems typically have at least one <command>InputDevice</command> section for the keyboard. It is perfectly normal to have no entry for a mouse, as most mouse settings are automatically detected.</para>
- <!-- RHEL5: ddomingo at redhat.com: above replaces below, mouse is automatically detected now
- <para>Each <command>InputDevice</command> section configures one input device for the X server. Systems typically have at least two <command>InputDevice</command> sections: keyboard and mouse. However, it is perfectly normal to have no entry for a mouse, as any mouse settings are automatically detected</para> -->
<para>The following example illustrates a typical <command>InputDevice</command> section for a keyboard:</para>
<screen>Section "InputDevice"
Identifier "Keyboard0"
@@ -669,14 +564,6 @@ EndSection</screen>
Option "XkbModel" "pc105"
Option "XkbLayout" "us"
EndSection</screen>
- <!-- RHEL5: ddomingo at redhat.com: replaced with keyboard ; above replaces below
-<screen>Section "InputDevice"
- Identifier "Mouse0"
- Driver "mouse"
- Option "Protocol" "IMPS/2"
- Option "Device" "/dev/input/mice"
- Option "Emulate3Buttons" "no"
-EndSection</screen> -->
<para>The following entries are commonly used in the <command>InputDevice</command> section:</para>
<itemizedlist>
<listitem>
@@ -708,8 +595,6 @@ EndSection</screen> -->
<para>Consult the <filename>xorg.conf</filename> man page for a list of valid options for this section.</para>
</listitem>
</itemizedlist>
- <!-- RHEL5: peer review: removed, falsed!
- <para>By default, the <command>InputDevice</command> section has comments to allow users to configure additional options.</para> -->
</section>
<section
id="s3-x-server-config-xorg.conf-monitor">
@@ -727,9 +612,6 @@ EndSection</screen> -->
</tertiary>
</indexterm>
<para>Each <command>Monitor</command> section configures one type of monitor used by the system. This is an optional entry as well, as most monitors are now automatically detected.</para>
- <!-- silas: s-c-display removed from RHEL6
- <para>The easiest way to configure a monitor is to configure X during the installation process or by using the <application>X Configuration Tool</application>. For more information about using the <application>X Configuration Tool</application>, refer to <xref
- linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
<para>This example illustrates a typical <command>Monitor</command> section for a monitor:</para>
<screen>Section "Monitor"
Identifier "Monitor0"
@@ -795,9 +677,6 @@ EndSection</screen>
</tertiary>
</indexterm>
<para>Each <command>Device</command> section configures one video card on the system. While one <command>Device</command> section is the minimum, additional instances may occur for each video card installed on the machine.</para>
- <!-- silas: s-c-display removed from RHEL6
- <para>The best way to configure a video card is to configure X during the installation process or by using the <application>X Configuration Tool</application>. For more about using the <application>X Configuration Tool</application>, refer to <xref
- linkend="ch-Configuring_the_X_Window_System"/>.</para>-->
<para>The following example illustrates a typical <command>Device</command> section for a video card:</para>
<screen>Section "Device"
Identifier "Videocard0"
@@ -832,8 +711,6 @@ EndSection</screen>
<listitem>
<para>
<command>BusID</command> — An entry which specifies the bus location of the video card. On systems with only one video card a <command>BusID</command> entry is optional and may not even be present in the default <filename>/etc/X11/xorg.conf</filename> file. On systems with more than one video card, however, a <command>BusID</command> entry must be present.</para>
- <!-- RHEL5: peer review: above replaces below
- <para><command>BusID</command> — An optional entry which specifies the bus location of the video card. This option is only mandatory for systems with multiple cards.</para> -->
</listitem>
<listitem>
<para>
@@ -899,16 +776,11 @@ EndSection</screen>
<command>DefaultDepth</command> — Specifies the default color depth in bits. In the previous example, <command>16</command> (which provides thousands of colors) is the default. Only one <command>DefaultDepth</command> is permitted, although this can be overridden with the Xorg command line option <command>-depth <replaceable><n></replaceable>
</command>,where <command><replaceable><n></replaceable>
</command> is any additional depth specified.</para>
- <!-- RHEL5: ddomingo at redhat.com: above replaces below, only ONE DefaultDepth is PERMITTED
- <para><command>DefaultDepth</command> — Specifies the default color depth in bits. In the previous example, <command>16</command> (which provides thousands of colors) is the default. Multiple <command>DefaultDepth</command> entries are permitted, but at least one is required.</para> -->
</listitem>
<listitem>
<para>
<command>SubSection "Display"</command> — Specifies the screen modes available at a particular color depth. The <command>Screen</command> section can have multiple <command>Display</command> subsections, which are entirely optional since screen modes are automatically detected.</para>
<para>This subsection is normally used to override autodetected modes.</para>
- <!-- RHEL5: ddomingo at redhat.com: above replaces below, as per kem at redhat.com
- <para><command>SubSection "Display"</command> — Specifies the screen modes available at a particular color depth. This section is entirely optional, and a <command>Screen</command> section may have multiple <command>Display</command> subsections.</para> --><!-- RHEL5: ddomingo at redhat.com: above replaces below, entirely optional now
- <para><command>SubSection "Display"</command> — Specifies the screen modes available at a particular color depth. A <command>Screen</command> section may have multiple <command>Display</command> subsections, but at least one is required for the color depth specified in the <command>DefaultDepth</command> entry.</para> -->
</listitem>
<listitem>
<para>
@@ -933,9 +805,6 @@ EndSection</screen>
</indexterm>
<para>The optional <command>DRI</command> section specifies parameters for the <firstterm>Direct Rendering Infrastructure</firstterm> (<firstterm>DRI</firstterm>). DRI is an interface which allows 3D software applications to take advantage of 3D hardware acceleration capabilities built into most modern video hardware. In addition, DRI can improve 2D performance via hardware acceleration, if supported by the video card driver.</para>
<para>This section rarely appears, as the DRI Group and Mode are automatically initialized to default values. If a different Group or Mode is desired, then adding this section to the <filename>xorg.conf</filename> file will override those defaults.</para>
- <!-- RHEL5: ddomingo at redhat.com: above replaces below as per kem at redhat.com
- <para>This section rarely appears, as DRI is automatically loaded as the default module.</para> --><!-- RHEL5: ddomingo at redhat.com: above replaces below
- <para>This section is ignored unless DRI is enabled in the <command>Module</command> section.</para> -->
<para>The following example illustrates a typical <command>DRI</command> section:</para>
<screen>Section "DRI"
Group 0
@@ -1175,10 +1044,6 @@ widget_class "*" style "user-font"</screen>
<secondary>runlevels and</secondary>
</indexterm>
<para>In most cases, the &MAJOROS; installer configures a machine to boot into a graphical login environment, known as <firstterm>Runlevel 5</firstterm>. It is possible, however, to boot into a text-only multi-user mode called <firstterm>Runlevel 3</firstterm> and begin an X session from there.</para>
- <!-- RHEL5: peer review: above replaces below, clarity
- <para>In most cases, the default installation of &RHEL; configures a machine to boot into a graphical login environment, known as runlevel 5. It is possible, however, to boot into the text-only multi-user mode called runlevel 3 and begin an
- X session from there.</para>
- -->
<para>For more information about runlevels, refer to <xref
linkend="s1-services-runlevels"/>.</para>
<para>The following subsections review how X starts up in both runlevel 3 and runlevel 5.</para>
@@ -1233,8 +1098,6 @@ widget_class "*" style "user-font"</screen>
<para>After setting these options, the <command>xinitrc</command> script executes all scripts located in the <filename>/etc/X11/xinit/xinitrc.d/</filename> directory. One important script in this directory is <filename>xinput.sh</filename>, which configures settings such as the default language.</para>
<para>Next, the <command>xinitrc</command> script attempts to execute <filename>.Xclients</filename> in the user's home directory and turns to <filename>/etc/X11/xinit/Xclients</filename> if it cannot be found. The purpose of the <filename>Xclients</filename> file is to start the desktop environment or, possibly, just a basic window manager. The <filename>.Xclients</filename> script in the user's home directory starts the user-specified desktop environment in the <filename>.Xclients-default</filename> file. If <filename>.Xclients</filename> does not exist in the user's home directory, the standard <filename>/etc/X11/xinit/Xclients</filename> script attempts to start another desktop environment, trying GNOME first and then KDE followed by <command>twm</command>.</para>
<para>When in runlevel 3, the user is returned to a text mode user session after ending an X session.</para>
- <!-- RHEL5: peer review: above replaces below
- <para>The user is returned to a text mode user session after logging out of X from runlevel 3.</para> -->
</section>
<section
id="s2-x-runlevels-5">
@@ -1348,23 +1211,11 @@ widget_class "*" style "user-font"</screen>
<listitem>
<para>
<filename>/usr/share/X11/doc/</filename> — contains detailed documentation on the X Window System architecture, as well as how to get additional information about the Xorg project as a new user.</para>
- <!-- RHEL5: ddomingo at redhat.com: above replaces below, as per kem at redhat.com
- <para><filename>/usr/share/X11/doc/</filename> — contains more detailed documentation on the XFree86 architecture, as well as how to get additional information about the XFree86 project as a new user.</para> --><!-- RHEL5: ddomingo at redhat.com: above replaces below
- <para><filename>/usr/share/doc/libX11-<replaceable><version-number></replaceable>/README</filename> — Briefly describes the XFree86 architecture and how to get additional information about the XFree86 project as a new user. Replace <replaceable><version-number></replaceable> with the version number of the <filename>libX11</filename> package.</para> -->
</listitem>
- <!-- RHEL5: ddomingo at redhat.com: could not find file (basic install of RHEL5)
- <listitem>
- <para><filename>/usr/X11R6/lib/X11/doc/RELNOTES</filename> — For advanced users who want to read about the latest features available in XFree86.</para>
- </listitem> -->
<listitem>
<para>
<command>man xorg.conf</command> — Contains information about the <filename>xorg.conf</filename> configuration files, including the meaning and syntax for the different sections within the files.</para>
</listitem>
- <!-- RHEL5: ddomingo at redhat.com: found no man entries (basic install of RHEL5)
- <listitem>
- <para><command>man X.Org</command> — The primary man page for X.Org Foundation information.</para>
- </listitem>
- -->
<listitem>
<para>
<command>man Xorg</command> — Describes the <command>Xorg</command> display server.</para>
@@ -1386,10 +1237,6 @@ widget_class "*" style "user-font"</screen>
<ulink
url="http://www.X.org/">http://www.X.org/</ulink> — Home page of the X.Org Foundation, which produces the X11R7.1 release of the X Window System. The X11R7.1 release is bundled with &MAJOROS; to control the necessary hardware and provide a GUI environment.</para>
</listitem>
- <!-- RHEL5: ddomingo at redhat.com: what's here that isn't in the above site? besides, there's a link in X.org that goes to this wiki anyway
- <listitem>
- <para><ulink url="http://xorg.freedesktop.org/wiki/">http://xorg.freedesktop.org/wiki/</ulink> — Home page of the XR116.8 release, which provides binaries and documention for the X Window System.</para>
- </listitem> -->
<listitem>
<para>
<ulink
@@ -1405,38 +1252,7 @@ widget_class "*" style "user-font"</screen>
<ulink
url="http://www.kde.org">http://www.kde.org/</ulink> — Home of the KDE desktop environment.</para>
</listitem>
- <!-- RHEL5: ddomingo at redhat.com: link goes to 404
- <listitem>
- <para><ulink url="http://nexp.cs.pdx.edu/fontconfig/">http://nexp.cs.pdx.edu/fontconfig/</ulink> — Home of the Fontconfig font subsystem for X.</para>
- </listitem>
- -->
</itemizedlist>
</section>
- <!-- RHEL5: ddomingo at redhat.com: removed
- <section id="s2-x-related-books">
- <title>Related Books</title>
- <indexterm significance="normal">
- <primary>X</primary>
- <secondary>additional resources</secondary>
- <tertiary>related books</tertiary>
- </indexterm>
- <itemizedlist>
- <listitem>
- <para><citetitle>The Concise Guide to XFree86 for Linux</citetitle> by Aron Hsiao; Que — Provides an expert's view of the operation of XFree86 on Linux systems.</para>
- </listitem>
- <listitem>
- <para><citetitle>The New XFree86</citetitle> by Bill Ball; Prima Publishing — Discuses XFree86 and its relationship with the popular desktop environments, such as GNOME and KDE.</para>
- </listitem>
- <listitem>
- <para><citetitle>Beginning GTK+ and GNOME</citetitle> by Peter Wright; Wrox Press, Inc. — Introduces programmers to the GNOME architecture, showing them how to get started with GTK+.</para>
- </listitem>
- <listitem>
- <para><citetitle>GTK+/GNOME Application Development</citetitle> by Havoc Pennington; New Riders Publishing — An advanced look into the heart of GTK+ programming, focusing on sample code and a thorough look at the available APIs.</para>
- </listitem>
- <listitem>
- <para><citetitle>KDE 2.0 Development</citetitle> by David Sweet and Matthias Ettrich; Sams Publishing — Instructs beginning and advanced developers on taking advantage of the many environment guidelines required to built QT applications for KDE.</para>
- </listitem>
- </itemizedlist>
- </section> -->
</section>
</chapter>
diff --git a/en-US/The_sysconfig_Directory.xml b/en-US/The_sysconfig_Directory.xml
index f9ffe6b..bf07174 100644
--- a/en-US/The_sysconfig_Directory.xml
+++ b/en-US/The_sysconfig_Directory.xml
@@ -616,65 +616,6 @@
linkend="sect-Date_and_Time_Configuration-Date_and_Time_Properties_Tool" /> for more information on the <application>Date/Time Properties</application> tool and its usage.
</para>
</section>
- <!-- Note: This file is no longer present, nor provided by any package in the RHEL6 Beta.
- <section id="s2-sysconfig-desktop">
- <title><filename>/etc/sysconfig/desktop</filename></title>
- <indexterm>
- <primary><filename class="directory">sysconfig</filename> directory</primary>
- <secondary><filename>/etc/sysconfig/desktop</filename></secondary>
- </indexterm>
- <para>
- The <filename>/etc/sysconfig/desktop</filename> file specifies the desktop for new users and the display manager to run when entering runlevel 5.
- </para>
- <para>
- Correct values are:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <command>DESKTOP="<replaceable><value></replaceable>"</command>, where <command>"<replaceable><value></replaceable>"</command> is one of the following:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <command>GNOME</command> — Selects the <application>GNOME</application> desktop environment.
- </para>
- </listitem>
- <listitem>
- <para>
- <command>KDE</command> — Selects the <application>KDE</application> desktop environment.
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- <command>DISPLAYMANAGER="<replaceable><value></replaceable>"</command>, where <command>"<replaceable><value></replaceable>"</command> is one of the following:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- <command>GNOME</command> — Selects the <application>GNOME Display Manager</application>.
- </para>
- </listitem>
- <listitem>
- <para>
- <command>KDE</command> — Selects the <application>KDE Display Manager</application>.
- </para>
- </listitem>
- <listitem>
- <para>
- <command>XDM</command> — Selects the <application>X Display Manager</application>.
- </para>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist>
- <para>
- For more information, refer to <xref linkend="ch-The_X_Window_System" />.
- </para>
- </section>
- -->
<section
id="s2-sysconfig-dhcpd">
<title>
@@ -710,45 +651,6 @@
linkend="ch-Dynamic_Host_Configuration_Protocol_DHCP" /> for more information on DHCP and its usage.
</para>
</section>
- <!-- silas: exim was in RHEL5 but not in RHEL6 packages
- <section
- id="s2-sysconfig-exim">
- <title>
- <filename>/etc/sysconfig/exim</filename>
- </title>
- <indexterm
- significance="normal">
- <primary>
- <filename class="directory">sysconfig</filename> directory</primary>
- <secondary>
- <filename>/etc/sysconfig/exim</filename>
- </secondary>
- </indexterm>
- <para>The <filename>/etc/sysconfig/exim</filename> file allows messages to be sent to one or more clients, routing the messages over whatever networks are necessary. The file sets the default values for exim to run. Its default values are set to run as a background daemon and to check its queue each hour in case something has backed up.</para>
- <para>The values include:</para>
- <itemizedlist>
- <listitem>
- <para>
- <command>DAEMON=<replaceable><value></replaceable>
- </command>, where <command><replaceable><value></replaceable>
- </command> is one of the following:</para>
- <itemizedlist>
- <listitem>
- <para>
- <command>yes</command> — <filename>exim</filename> should be configured to listen to port 25 for incoming mail. <command>yes</command> implies the use of the Exim's <command>-bd</command> options.</para>
- </listitem>
- <listitem>
- <para>
- <command>no</command> — <filename>exim</filename> should not be configured to listen to port 25 for incoming mail.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- <listitem>
- <para>
- <command>QUEUE=1h</command> which is given to <filename>exim</filename> as <command>-q$QUEUE</command>. The <command>-q</command> option is not given to <filename>exim</filename> if <filename>/etc/sysconfig/exim</filename> exists and <filename>QUEUE</filename> is empty or undefined.</para>
- </listitem>
- </itemizedlist>
- </section>-->
<section
id="s2-sysconfig-firewall">
<title>
@@ -1528,61 +1430,6 @@
</para>
</warning>
</section>
- <!-- RHEL5: BZ#224367 --><!-- RHEL5: Move to SAG
- <section id="s2-sysconfig-nfs">
- <title><filename>/etc/sysconfig/nfs</filename></title>
- <indexterm>
- <primary><filename class="directory">sysconfig</filename></primary>
- <secondary><filename>/etc/sysconfig/nfs</filename></secondary>
- </indexterm>
- <para>NFS requires portmap, which dynamically assigns ports for RPC services. This causes problems for configuring firewall rules. To overcome this problem, use the <filename>/etc/sysconfig/nfs</filename> file to control which ports the required RPC services run on.</para>
- <para>The <filename>/etc/sysconfig/nfs</filename> may not exist by default on all systems. If it does not exist, create it and add the following variables (alternatively, if the file exists, un-comment and change the default entries as required):</para>
- <variablelist>
- <varlistentry><term><computeroutput>MOUNTD_PORT=<replaceable>x</replaceable></computeroutput></term>
- <listitem>
- <para>control which TCP and UDP port mountd (rpc.mountd) uses. Replace <replaceable>x</replaceable> with an unused port number.</para>
- </listitem>
- </varlistentry>
- <varlistentry><term><computeroutput>STATD_PORT=<replaceable>x</replaceable></computeroutput></term>
- <listitem>
- <para>control which TCP and UDP port status (rpc.statd) uses. Replace <replaceable>x</replaceable> with an unused port number.</para>
- </listitem>
- </varlistentry>
- <varlistentry><term><computeroutput>LOCKD_TCPPORT=<replaceable>x</replaceable></computeroutput></term>
- <listitem>
- <para>control which TCP port nlockmgr (rpc.lockd) uses. Replace <replaceable>x</replaceable> with an unused port number.</para>
- </listitem>
- </varlistentry>
- <varlistentry><term><computeroutput>LOCKD_UDPPORT=<replaceable>x</replaceable></computeroutput></term>
- <listitem>
- <para>control which UDP port nlockmgr (rpc.lockd) uses. Replace <replaceable>x</replaceable> with an unused port number.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- <para>If NFS fails to start, check <filename>/var/log/messages</filename>. Normally, NFS will fail to start if you specify a port number that is already in use. After editing <filename>/etc/sysconfig/nfs</filename> restart the NFS service by running the <command>service nfs restart</command> command. Run the <command>rpcinfo -p</command> command to confirm the changes.</para>
- (this section might not be needed, I could not decide to I put it in anyway. One reason I didn't want to include it is I want know existing iptables rules, so I would not know where to input them, and I don't want to say "use system-config-securitylevel" if they have iptables rules setup, because that will overwrite them. Maybe...trying to be too helpful?
- <para>To configure a firewall to allow NFS:</para>
- <orderedlist>
- <listitem>
- <para>Allow TCP and UDP port 2049 for NFS.</para>
- </listitem>
- <listitem>
- <para>Allow TCP and UDP port 111 (portmap/sunrpc).</para>
- </listitem>
- <listitem>
- <para>Allow the TCP and UDP port specified with <computeroutput>MOUNTD_PORT="<replaceable>x</replaceable>"</computeroutput></para>
- </listitem>
- <listitem>
- <para>Allow the TCP and UDP port specified with <computeroutput>STATD_PORT="<replaceable>x</replaceable>"</computeroutput></para>
- </listitem>
- <listitem>
- <para>Allow the TCP port specified with <computeroutput>LOCKD_TCPPORT="<replaceable>x</replaceable>"</computeroutput></para>
- </listitem>
- <listitem>
- <para>Allow the UDP port specified with <computeroutput>LOCKD_UDPPORT="<replaceable>x</replaceable>"</computeroutput></para>
- </listitem>
- </orderedlist>
- </section> -->
<section
id="s2-sysconfig-ntpd">
<title>
@@ -2028,23 +1875,6 @@
</varlistentry>
</variablelist>
</section>
- <!-- silas: s-c-securitylevel dropped from RHEL6
- <section
- id="s2-sysconfig-sec-level">
- <title>
- <filename>/etc/sysconfig/system-config-securitylevel</filename>
- </title>
- <indexterm
- significance="normal">
- <primary>
- <filename class="directory">sysconfig</filename> directory</primary>
- <secondary>
- <filename>/etc/sysconfig/system-config-securitylevel</filename>
- </secondary>
- </indexterm>
- <para>
- The <filename>/etc/sysconfig/system-config-securitylevel</filename> file contains all options chosen by the user the last time the <application>Security Level Configuration Tool</application> (<command>system-config-securitylevel</command>) was run. Users should not modify this file by hand. For more information about the <application>Security Level Configuration Tool</application>, refer to <xref linkend="s1-basic-firewall" /> .</para>
- </section>-->
<section
id="s2-sysconfig-rcu">
<title>
@@ -2228,16 +2058,6 @@
<filename>/etc/sysconfig/apm-scripts/</filename> directory</secondary>
</indexterm>
<variablelist>
- <!-- Note: This directory is no longer present, nor provided by any package in the RHEL6 Beta.
- <varlistentry>
- <term><filename>apm-scripts/</filename></term>
- <listitem>
- <para>
- This directory contains the APM suspend/resume script. Do not edit the files directly. If customization is necessary, create a file called <filename>/etc/sysconfig/apm-scripts/apmcontinue</filename> which is called at the end of the script. It is also possible to control the script by editing <filename>/etc/sysconfig/apmd</filename>.
- </para>
- </listitem>
- </varlistentry>
- -->
<varlistentry>
<term>
<filename
More information about the docs-commits
mailing list