Suggestion for editing FreeBSD Handbook; X11, Chapter 5

[Sid]

Most of this is formatted, but I'm having trouble with spacing and tabs. Then my vim program stopped working correctly with tabs as two spaces as well, from the suggested ~/.vimrc configuration. This may also need small edits to the table of contents. This is better explained, and cleaned up. If someone can clean this up, and submit this as a bug for documentation, that would be appreciated. Thank you.

1236c1236
<       <title>The X Display Manager</title>
---
>       <title>X Display Manager and Xinit</title>
1244c1244
< 	  <contrib>Contributed by </contrib>
---
> 	  <contrib>Originally contributed by </contrib>
1252c1252
<       login session management.  <application>XDM</application>
---
>       login session management, and <application>xinit</application>, used for logging in from the console.  <application>XDM</application>
1258c1258
<       Manager on &os;.  Some desktop environments provide their own
---
>       Manager and Xinit on &os;.  Some desktop environments provide their own
1402a1403,1417
> 
>     <sect2>
>       <title>Xsession, .xsession and .xinitrc</title>
> 
>       <para>In your home directory, <filename>.xsession</filename> or <filename>.xinitrc</filename> require a minimum of:</para>
> 
>       <screen><userinput>#!/bin/sh</userinput><userinput>exec /usr/local/bin/windowmanager</userinput></screen>
>       <filename>.xsession</xsession> is required to use <application>XDM</application>, and its owner and group permissions must be set to read and execute.  To log in from a console, <filename>.xinitrc</filename>, at minimum, must be set to read.  If you choose to softlink <filename>.xinitrc</filename> to <filename>.xsession</filename>, then both files must be set to execute and read.
> 
>       <screen>chmod 550 .xsession</screen>
> 
>       <para><filename>~/.xsession</filename> does not replace <filename>/usr/local/lib/X11/xdm/Xsession</filename>, because <filename>Xsession</filename> contains scripts that refer to <filename>.xsession</filename> in your home directory, and it contains scripts to log errors.</para>
> 
>       <para>If your window manager of choice is capable, use it to start background wallpapers and desktop programs, instead of using <filename>.xsession<filename> or <filename>.xinitrc</filename>.</para>
>     </sect2>
1415c1430
< 	  <contrib>Contributed by </contrib>
---
> 	  <contrib>Originally contributed by </contrib>
1496,1513c1511,1514
<       <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 "exec /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>
< &prompt.user; <userinput>echo "exec /usr/local/bin/gnome-session" >> ~/.xsession</userinput>
< &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
---
>       <para>Another method for starting
> 	<application>GNOME</application> is to use
> 	<filename>~/.xinitrc</filename> or <filename>.xsession</filename> as described in <xref linked="x-xdm"/> with the following:</para>
> 	<programlisting>exec /usr/local/bin/gnome-session</programlisting>
1577,1581c1578,1580
<       <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>
---
>       <para>Another method for launching
> 	<application>KDE</application> is to use
> 	<filename>~/.xinitrc</filename> or <filename>~/.xsession</filename> as described in <xref linkend="x-xdm"/> with the following:</para>
1585,1593d1583
<       <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>
< &prompt.user; <userinput>echo "exec /usr/local/bin/startkde" >> ~/.xsession</userinput>
< &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
< 
1635c1625
< 	create an executable <filename>~/.xsession</filename>:</para>
---
> 	edit <filename>~/.xsession</filename> or <filename>~/.xinitrc</filename> according to <xref linkend="x-xdm"/> to:</para>
1637,1639c1627
<       <screen>&prompt.user; <userinput>echo "#!/bin/sh" > ~/.xsession</userinput>
< &prompt.user; <userinput>echo "exec /usr/local/bin/startxfce4 --with-ck-launch" >> ~/.xsession</userinput>
< &prompt.user; <userinput>chmod +x ~/.xsession</userinput></screen>
---
>       <screen><userinput>exec /usr/local/bin/startxfce4 --with-ck-launch</userinput></screen>