svn commit: r44743 - head/en_US.ISO8859-1/books/handbook/x11

Dru Lavigne dru at FreeBSD.org
Fri May 2 19:31:32 UTC 2014


Author: dru
Date: Fri May  2 19:31:31 2014
New Revision: 44743
URL: http://svnweb.freebsd.org/changeset/doc/44743

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by:	iXsystems

Modified:
  head/en_US.ISO8859-1/books/handbook/x11/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri May  2 19:10:08 2014	(r44742)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Fri May  2 19:31:31 2014	(r44743)
@@ -550,8 +550,8 @@ dbus_enable="YES"</programlisting>
 	<filename>~/.xsession</filename> when logging in through a
 	graphical login manager like <application>XDM</application>).
 	A third way is to use the new
-	<filename>/usr/local/etc/fonts/local.conf</filename> file as demonstrated in
-	<xref linkend="antialias"/>.</para>
+	<filename>/usr/local/etc/fonts/local.conf</filename> file as
+	demonstrated in <xref linkend="antialias"/>.</para>
     </sect2>
 
     <sect2 xml:id="truetype">
@@ -661,8 +661,7 @@ dbus_enable="YES"</programlisting>
 	definition, and then the <literal><fontconfig></literal>
 	tag:</para>
 
-      <programlisting>
-      <?xml version="1.0"?>
+      <programlisting><?xml version="1.0"?>
       <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
       <fontconfig></programlisting>
 
@@ -783,8 +782,7 @@ dbus_enable="YES"</programlisting>
 	dramatic.  To enable this, add the line somewhere in the
 	<filename>local.conf</filename> file:</para>
 
-      <programlisting>
-	  <match target="font">
+      <programlisting><match target="font">
 	     <test qual="all" name="rgba">
 		 <const>unknown</const>
 	     </test>
@@ -818,48 +816,46 @@ dbus_enable="YES"</programlisting>
       </authorgroup>
     </info>
 
-      <indexterm><primary>X Display Manager</primary></indexterm>
-      <para><application>&xorg;</application> provides an X Display
-	Manager, <application>XDM</application>, which can be used for
-	login session management.  <application>XDM</application> provides a graphical
-	interface for choosing which display server to connect to
-	and for entering authorization information such as a login and
-	password combination.</para>
-
-      <para>  This section demonstrates how to configure the X Display
-	Manager on &os;.  Some desktop environments provide their own
-	graphical login manager.  Refer to <xref
-	  linkend="x11-wm-gnome"/> for instructions on how to
-	configure the GNOME Display Manager and <xref
-	  linkend="x11-wm-kde"/> for instructions on how to configure
-	the KDE Display Manager.</para>
+    <indexterm><primary>X Display Manager</primary></indexterm>
+    <para><application>&xorg;</application> provides an X Display
+      Manager, <application>XDM</application>, which can be used for
+      login session management.  <application>XDM</application>
+      provides a graphical interface for choosing which display server
+      to connect to and for entering authorization information such as
+      a login and password combination.</para>
+
+    <para>  This section demonstrates how to configure the X Display
+      Manager on &os;.  Some desktop environments provide their own
+      graphical login manager.  Refer to <xref
+	linkend="x11-wm-gnome"/> for instructions on how to configure
+      the GNOME Display Manager and <xref linkend="x11-wm-kde"/> for
+      instructions on how to configure the KDE Display Manager.</para>
 
     <sect2>
       <title>Configuring <application>XDM</application></title>
 
       <para>To install <application>XDM</application>, use the
 	<package>x11/xdm</package> package or port.  Once installed,
-	<application>XDM</application> can be configured to run when the 
-	machine boots up by editing this
-	entry in <filename>/etc/ttys</filename>:</para>
+	<application>XDM</application> can be configured to run when
+	the  machine boots up by editing this entry in
+	<filename>/etc/ttys</filename>:</para>
 
       <screen>ttyv8   "/usr/local/bin/xdm -nodaemon"  xterm   off secure</screen>
 
-      <para>Change the <literal>off</literal> to
-	<literal>on</literal> and save the edit.  The
-	<literal>ttyv8</literal> in this entry indicates that
-	<application>XDM</application> will run on the ninth
-	virtual terminal.</para>
+      <para>Change the <literal>off</literal> to <literal>on</literal>
+	and save the edit.  The <literal>ttyv8</literal> in this entry
+	indicates that <application>XDM</application> will run on the
+	ninth virtual terminal.</para>
 
       <para>The <application>XDM</application> configuration directory
 	is located in <filename>/usr/local/lib/X11/xdm</filename>.
 	This directory contains several files used to change the
 	behavior and appearance of <application>XDM</application>, as
 	well as a few scripts and programs used to set up the desktop
-	when <application>XDM</application> is running. <xref
-	  linkend="xdm-config-files"/> summarizes the function of
-	each of these files.  The exact syntax and usage of these
-	files is described in &man.xdm.1;.</para>
+	when <application>XDM</application> is running.  <xref
+	  linkend="xdm-config-files"/> summarizes the function of each
+	of these files.  The exact syntax and usage of these files is
+	described in &man.xdm.1;.</para>
 
       <table frame="none" pgwide="1" xml:id="xdm-config-files">
 	<title>XDM Configuration Files</title>
@@ -890,7 +886,7 @@ dbus_enable="YES"</programlisting>
 		<application>XDM</application> display chooser and
 		login screens.  The default configuration is a simple
 		rectangular login window with the hostname of the
-		machine displayed at the top in a large font and 
+		machine displayed at the top in a large font and
 		<quote>Login:</quote> and <quote>Password:</quote>
 		prompts below.  The format of this file is identical
 		to the app-defaults file described in the
@@ -955,13 +951,12 @@ dbus_enable="YES"</programlisting>
       <title>Configuring Remote Access</title>
 
       <para>By default, only users on the same system can login using
-	<application>XDM</application>.  To enable users on
-	other systems to connect to the display
-	server, edit the access control rules and enable
-	the connection listener.</para>
+	<application>XDM</application>.  To enable users on other
+	systems to connect to the display server, edit the access
+	control rules and enable the connection listener.</para>
 
-      <para>To configure <application>XDM</application> to
-	listen for any remote connection, comment out the
+      <para>To configure <application>XDM</application> to listen for
+	any remote connection, comment out the
 	<literal>DisplayManager.requestPort</literal> line in
 	<filename>/usr/local/lib/X11/xdm/xdm-config</filename> by
 	putting a <literal>!</literal> in front of it:</para>
@@ -971,9 +966,9 @@ dbus_enable="YES"</programlisting>
 DisplayManager.requestPort:     0</screen>
 
       <para>Save the edits and restart <application>XDM</application>.
-	To restrict remote access, look at the
-	example entries in <filename>/usr/local/lib/X11/xdm/Xaccess</filename> and refer to
-	&man.xdm.1; for further information.</para>
+	To restrict remote access, look at the example entries in
+	<filename>/usr/local/lib/X11/xdm/Xaccess</filename> and refer
+	to &man.xdm.1; for further information.</para>
     </sect2>
   </sect1>
 
@@ -993,9 +988,8 @@ DisplayManager.requestPort:     0</scree
       </authorgroup>
     </info>
 
-    <para>This section describes how to install three popular
-      desktop environments on a &os; system.  A
-      desktop environment can range
+    <para>This section describes how to install three popular desktop
+      environments on a &os; system.  A desktop environment can range
       from a simple window manager to a complete suite of desktop
       applications.  Over a hundred desktop environments are
       available in the <filename>x11-wm</filename> category of the
@@ -1004,79 +998,78 @@ DisplayManager.requestPort:     0</scree
     <sect2 xml:id="x11-wm-gnome">
       <title>GNOME</title>
 
-	<indexterm><primary>GNOME</primary></indexterm>
-	<para><application>GNOME</application> is a user-friendly
-	  desktop environment.  It
-	  includes a panel for starting applications and displaying
-	  status, a desktop, a set of tools and applications,
-	  and a set of conventions that make it easy for applications
-	  to cooperate and be consistent with each other.  More information
-	  regarding <application>GNOME</application> on &os; can be
-	  found at <link
+      <indexterm><primary>GNOME</primary></indexterm>
+      <para><application>GNOME</application> is a user-friendly
+	desktop environment.  It includes a panel for starting
+	applications and displaying status, a desktop, a set of tools
+	and applications, and a set of conventions that make it easy
+	for applications to cooperate and be consistent with each
+	other.  More information regarding
+	<application>GNOME</application> on &os; can be found at <link
 	    xlink:href="http://www.FreeBSD.org/gnome">http://www.FreeBSD.org/gnome</link>.
-	  That web site contains additional documentation
-	  about installing, configuring, and
-	  managing <application>GNOME</application> on &os;.</para>
+	That web site contains additional documentation about
+	installing, configuring, and managing
+	<application>GNOME</application> on &os;.</para>
+
+      <para>This desktop environment can be installed from a
+	package:</para>
+
+      <screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
+
+      <para>To instead build <application>GNOME</application> from
+	ports, use the following command.
+	<application>GNOME</application> is a large application and
+	will take some time to compile, even on a fast
+	computer.</para>
 
-	<para>This desktop environment can be installed from a package:</para>
-
-	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
-
-	<para>To instead build <application>GNOME</application> from
-	  ports, use the following command.
-	  <application>GNOME</application> is a large application
-	  and will take some time to compile, even on a fast
-	  computer.</para>
-
-	<screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/x11/gnome2</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>For proper operation, <application>GNOME</application>
-	  requires the <filename>/proc</filename> file system to be
-	  mounted.  Add this line to <filename>/etc/fstab</filename> to mount
-	  this file system automatically during system
-	  startup:</para>
-
-	<programlisting>proc           /proc       procfs  rw  0   0</programlisting>
-
-	<para>Once <application>GNOME</application> is installed,
-	  configure <application>&xorg;</application> to start
-	  <application>GNOME</application>.  The easiest way to do this
-	  is to enable the GNOME Display Manager,
-	  <application>GDM</application>,
-	  which is installed as part
-	  of the <application>GNOME</application> package or port.
-	  It can be enabled by adding this
-	  line to <filename>/etc/rc.conf</filename>:</para>
-
-	<programlisting>gdm_enable="YES"</programlisting>
-
-	<para>It is often desirable to also start all
-	  <application>GNOME</application> services.  To achieve this, add
-	  a second line to <filename>/etc/rc.conf</filename>:</para>
-
-	<programlisting>gnome_enable="YES"</programlisting>
-
-	<para><application>GDM</application>
-	  will now start automatically when the system boots.</para>
-
-	<para>A second method for starting
-	  <application>GNOME</application> is to type <command>startx</command>
-	  from the command-line after configuring
-	  <filename>~/.xinitrc</filename>.  If this file already exists,
-	  replace the line that starts the current window manager with
-	  one that starts
-	  <filename>/usr/local/bin/gnome-session</filename>.  If
-	  this file does not exist, create it with this command:</para>
-
-	<screen>&prompt.user; <userinput>echo "/usr/local/bin/gnome-session" > ~/.xinitrc</userinput></screen>
-
-	  <para>A third method is to use
-	    <application>XDM</application> as the display manager.  In this case,
-	    create an executable
-	    <filename>~/.xsession</filename>:</para>
+      <para>For proper operation, <application>GNOME</application>
+	requires the <filename>/proc</filename> file system to be
+	mounted.  Add this line to <filename>/etc/fstab</filename> to
+	mount this file system automatically during system
+	startup:</para>
+
+      <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
+
+      <para>Once <application>GNOME</application> is installed,
+	configure <application>&xorg;</application> to start
+	<application>GNOME</application>.  The easiest way to do this
+	is to enable the GNOME Display Manager,
+	<application>GDM</application>, which is installed as part of
+	the <application>GNOME</application> package or port.  It can
+	be enabled by adding this line to
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>gdm_enable="YES"</programlisting>
+
+      <para>It is often desirable to also start all
+	<application>GNOME</application> services.  To achieve this,
+	add a second line to
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>gnome_enable="YES"</programlisting>
+
+      <para><application>GDM</application> will now start
+	automatically when the system boots.</para>
+
+      <para>A second method for starting
+	<application>GNOME</application> is to type
+	<command>startx</command> from the command-line after
+	configuring <filename>~/.xinitrc</filename>.  If this file
+	already exists, replace the line that starts the current
+	window manager with one that starts
+	<filename>/usr/local/bin/gnome-session</filename>.  If this
+	file does not exist, create it with this command:</para>
+
+      <screen>&prompt.user; <userinput>echo "/usr/local/bin/gnome-session" > ~/.xinitrc</userinput></screen>
+
+      <para>A third method is to use <application>XDM</application> as
+	the display manager.  In this case, create an executable
+	<filename>~/.xsession</filename>:</para>
 
-	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/bin/gnome-session" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>
@@ -1086,115 +1079,112 @@ DisplayManager.requestPort:     0</scree
 
       <indexterm><primary>KDE</primary></indexterm>
 
-	<para><application>KDE</application> is another easy-to-use
-	  desktop environment.  This desktop provides a suite of
-	  applications with a consistent look and feel, a standardized
-	  menu and toolbars, keybindings, color-schemes,
-	  internationalization, and a centralized, dialog-driven
-	  desktop configuration.  More information on
-	  <application>KDE</application> can be found at
-	  <link xlink:href="http://www.kde.org/">http://www.kde.org/</link>.
-	  For &os;-specific information, consult <link
-	    xlink:href="http://freebsd.kde.org/">http://freebsd.kde.org</link>.</para>
-
-	<para>To install the <application>KDE</application> package,
-	  type:</para>
-
-	<screen>&prompt.root; <userinput>pkg install x11/kde4</userinput></screen>
-
-	<para>To instead build the <application>KDE</application>
-	  port, use the following command.  Installing the port will
-	  provide a menu for selecting which components to
-	  install.  <application>KDE</application> is a large application
-	  and will take some time to compile, even on a fast
-	  computer.</para>
+      <para><application>KDE</application> is another easy-to-use
+	desktop environment.  This desktop provides a suite of
+	applications with a consistent look and feel, a standardized
+	menu and toolbars, keybindings, color-schemes,
+	internationalization, and a centralized, dialog-driven desktop
+	configuration.  More information on
+	<application>KDE</application> can be found at <link
+	  xlink:href="http://www.kde.org/">http://www.kde.org/</link>.
+	For &os;-specific information, consult <link
+	  xlink:href="http://freebsd.kde.org/">http://freebsd.kde.org</link>.</para>
+
+      <para>To install the <application>KDE</application> package,
+	type:</para>
+
+      <screen>&prompt.root; <userinput>pkg install x11/kde4</userinput></screen>
+
+      <para>To instead build the <application>KDE</application> port,
+	use the following command.  Installing the port will provide a
+	menu for selecting which components to install.
+	<application>KDE</application> is a large application and will
+	take some time to compile, even on a fast computer.</para>
 
-	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<indexterm>
-	  <primary>KDE</primary>
-	  <secondary>display manager</secondary>
-	</indexterm>
+      <indexterm>
+	<primary>KDE</primary>
+	<secondary>display manager</secondary>
+      </indexterm>
 
-	<para><application>KDE</application> requires the
-	  <filename>/proc</filename> file system to be mounted.  Add
-	  this line to <filename>/etc/fstab</filename> to mount this
-	  file system automatically during system startup:</para>
-
-	<programlisting>proc           /proc       procfs  rw  0   0</programlisting>
-
-	<para>The installation of <application>KDE</application>
-	  includes the KDE Display Manager,
-	  <application>KDM</application>.  To enable this display
-	  manager, add this line to
-	  <filename>/etc/rc.conf</filename>:</para>
-
-	<programlisting>kdm4_enable="YES"</programlisting>
-
-	<para>A second method for launching
-	  <application>KDE</application> is to type
-	  <command>startx</command> from the command line.  For this
-	  to work, the following line is needed in
-	  <filename>~/.xinitrc</filename>:</para>
-
-	<programlisting>exec /usr/local/kde4/bin/startkde</programlisting>
-
-	<para>A third method for starting
-	  <application>KDE</application> is through
-	  <application>XDM</application>.  To do so, create an
-	  executable <filename>~/.xsession</filename> as
-	  follows:</para>
+      <para><application>KDE</application> requires the
+	<filename>/proc</filename> file system to be mounted.  Add
+	this line to <filename>/etc/fstab</filename> to mount this
+	file system automatically during system startup:</para>
+
+      <programlisting>proc           /proc       procfs  rw  0   0</programlisting>
+
+      <para>The installation of <application>KDE</application>
+	includes the KDE Display Manager,
+	<application>KDM</application>.  To enable this display
+	manager, add this line to
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>kdm4_enable="YES"</programlisting>
+
+      <para>A second method for launching
+	<application>KDE</application> is to type
+	<command>startx</command> from the command line.  For this to
+	work, the following line is needed in
+	<filename>~/.xinitrc</filename>:</para>
+
+      <programlisting>exec /usr/local/kde4/bin/startkde</programlisting>
+
+      <para>A third method for starting <application>KDE</application>
+	is through <application>XDM</application>.  To do so, create
+	an executable <filename>~/.xsession</filename> as
+	follows:</para>
 
-	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/kde4/bin/startkde" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
 
-      <para>Once <application>KDE</application> is started,
-	refer to its built-in help system for more information on how
-	to use its various menus and applications.</para>
+      <para>Once <application>KDE</application> is started, refer to
+	its built-in help system for more information on how to use
+	its various menus and applications.</para>
     </sect2>
 
     <sect2 xml:id="x11-wm-xfce">
       <title>Xfce</title>
 
-	<para><application>Xfce</application> is a desktop environment
-	  based on the GTK+ toolkit used by
-	  <application>GNOME</application>.  However, it is more
-	  lightweight and provides a simple, efficient, easy-to-use
-	  desktop.  It is fully configurable, has a main panel with menus, applets, and
-	  application launchers, provides a file manager and sound manager,
-	  and is themeable.  Since it is fast, light, and efficient,
-	  it is ideal for older or slower machines with memory
-	  limitations.  More information on <application>Xfce</application>
-	  can be found at <link
-	    xlink:href="http://www.xfce.org/">http://www.xfce.org</link>.</para>
+      <para><application>Xfce</application> is a desktop environment
+	based on the GTK+ toolkit used by
+	<application>GNOME</application>.  However, it is more
+	lightweight and provides a simple, efficient, easy-to-use
+	desktop.  It is fully configurable, has a main panel with
+	menus, applets, and application launchers, provides a file
+	manager and sound manager, and is themeable.  Since it is
+	fast, light, and efficient, it is ideal for older or slower
+	machines with memory limitations.  More information on
+	<application>Xfce</application> can be found at <link
+	  xlink:href="http://www.xfce.org/">http://www.xfce.org</link>.</para>
 
-	<para>To install the <application>Xfce</application> package:</para>
+      <para>To install the <application>Xfce</application>
+	package:</para>
 
-	<screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
 
-	<para>Alternatively, to build the port:</para>
+      <para>Alternatively, to build the port:</para>
 
-	<screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/xfce4</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/x11-wm/xfce4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-	<para>Unlike <application>GNOME</application> or
-	  <application>KDE</application>,
-	  <application>Xfce</application> does not provide its own
-	  login manager.  In order to start <application>Xfce</application>
-	  from the command line by typing <command>startx</command>,
-	  first add its entry to
-	  <filename>~/.xinitrc</filename>:</para>
-
-	<screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" > ~/.xinitrc</userinput></screen>
-
-	<para>An alternate method is to use
-	  <application>XDM</application>.  To configure this method,
-	  create an executable
-	  <filename>~/.xsession</filename>:</para>
+      <para>Unlike <application>GNOME</application> or
+	<application>KDE</application>,
+	<application>Xfce</application> does not provide its own login
+	manager.  In order to start <application>Xfce</application>
+	from the command line by typing <command>startx</command>,
+	first add its entry to <filename>~/.xinitrc</filename>:</para>
+
+      <screen>&prompt.user; <userinput>echo "/usr/local/bin/startxfce4" > ~/.xinitrc</userinput></screen>
+
+      <para>An alternate method is to use
+	<application>XDM</application>.  To configure this method,
+	create an executable <filename>~/.xsession</filename>:</para>
 
-	<screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
+      <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
 &prompt.user; <userinput>echo "/usr/local/bin/startxfce4" >> ~/.xsession</userinput>
 &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
     </sect2>


More information about the svn-doc-all mailing list