Index: general.ent
===================================================================
--- general.ent	(revision 1218b084c9deac53741d9499965228a63ead876d)
+++ general.ent	(revision 2c08a0645179114b3b753a15dcc72823435fb4cb)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "24">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1218b084c9deac53741d9499965228a63ead876d)
+++ introduction/welcome/changelog.xml	(revision 2c08a0645179114b3b753a15dcc72823435fb4cb)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>May 24th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Merge 6.3 branch changes from r7479 - Completed removal
+          of xorg-proxy packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 16th, 2008</para>
       <itemizedlist>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 1218b084c9deac53741d9499965228a63ead876d)
+++ x/installing/x7app.xml	(revision 2c08a0645179114b3b753a15dcc72823435fb4cb)
@@ -127,28 +127,33 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+<!--      <segtitle>Installed Libraries</segtitle> -->
+<!--      <segtitle>Installed Directories</segtitle> -->
 
       <seglistitem>
         <seg>appres, atobm, bdftopcf, beforelight, bitmap, bmtoa, dga,
         editres, fontname.sh, fontprop.sh, fonttosfnt, fslsfonts, fstobdf,
-        iceauth, ico, lbxproxy, listres, mkcfm, mkfontdir, mkfontscale,
-        oclock, proxymngr, rstart, rstartd, sessreg, setxkbmap, showfont,
+<!--        iceauth, ico, lbxproxy, listres, mkcfm, mkfontdir, mkfontscale,
+        oclock, proxymngr, rstart, rstartd, sessreg, setxkbmap, showfont, -->
+        iceauth, ico, listres, mkcfm, mkfontdir, mkfontscale,
+        oclock, rstart, rstartd, sessreg, setxkbmap, showfont,
         showrgb, smproxy, startx, twm, viewres, x11perf, x11perfcomp, xauth,
         xauth_switch_to_sun-des-1, xbiff, xcalc, xclipboard, xclock, xcmsdb,
         xconsole, xcursorgen, xcutsel, xdbedizzy, xditview, xdm, xdmshell,
-        xdpr, xdpyinfo, xdriinfo, xedit, xev, xeyes, xfd, xfindproxy,
-        xfontsel, xfs, xfsinfo, xfwp, xgamma, xgc, xhost, xinit, xkbbell,
+<!--        xdpr, xdpyinfo, xdriinfo, xedit, xev, xeyes, xfd, xfindproxy,
+        xfontsel, xfs, xfsinfo, xfwp, xgamma, xgc, xhost, xinit, xkbbell, -->
+        xdpr, xdpyinfo, xdriinfo, xedit, xev, xeyes, xfd,
+        xfontsel, xfs, xfsinfo, xgamma, xgc, xhost, xinit, xkbbell,
         xkbcomp, xkbevd, xkbprint, xkbvleds, xkbwatch, xkill, xload, xlogo,
         xlsatoms, xlsclients, xlsfonts, xmag, xman, xmessage, xmh, xmodmap,
         xmore, xon, xphelloworld, xplsprinters, xpr, xprehashprinterlist,
         xprop, xpsimplehelloworld, xpxthelloworld, xrandr, xrdb, xrefresh,
-        xrx, xset, xsetmode, xsetpointer, xsetroot, xsm, xstdcmap, xtrapchar,
+<!--  xrx, xset, xsetmode, xsetpointer, xsetroot, xsm, xstdcmap, xtrapchar, -->
+        xset, xsetmode, xsetpointer, xsetroot, xsm, xstdcmap, xtrapchar,
         xtrapin, xtrapinfo, xtrapout, xtrapproto, xtrapreset, xtrapstats,
         xvidtune, xvinfo, xwd, xwininfo, and xwud</seg>
-        <seg>libxrx.{so,a} and libxrxnest.{so,a}</seg>
-        <seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
+<!--        <seg>libxrx.{so,a} and libxrxnest.{so,a}</seg> -->
+<!--        <seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
         lib/X11/{fs,lbxproxy,proxymgr,rstart,x11perfcomp,xdm,xedit,xinit,xsm}
-        and share/X11/{app-defaults,twm}</seg>
+        and share/X11/{app-defaults,twm}</seg> -->
       </seglistitem>
     </segmentedlist>
@@ -312,5 +317,5 @@
       </varlistentry>
 
-      <varlistentry id="lbxproxy-x7">
+<!--      <varlistentry id="lbxproxy-x7">
         <term><command>lbxproxy</command></term>
         <listitem>
@@ -320,5 +325,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="listres-x7">
@@ -373,5 +378,5 @@
       </varlistentry>
 
-      <varlistentry id="proxymngr-x7">
+<!--      <varlistentry id="proxymngr-x7">
         <term><command>proxymngr</command></term>
         <listitem>
@@ -381,5 +386,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="rstart-x7">
@@ -718,5 +723,5 @@
       </varlistentry>
 
-      <varlistentry id="xfindproxy-x7">
+<!--      <varlistentry id="xfindproxy-x7">
         <term><command>xfindproxy</command></term>
         <listitem>
@@ -726,5 +731,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="xfontsel-x7">
@@ -758,5 +763,5 @@
       </varlistentry>
 
-      <varlistentry id="xfwp-x7">
+<!--      <varlistentry id="xfwp-x7">
         <term><command>xfwp</command></term>
         <listitem>
@@ -766,5 +771,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="xgamma-x7">
@@ -1104,5 +1109,5 @@
       </varlistentry>
 
-      <varlistentry id="xrx-x7">
+<!--      <varlistentry id="xrx-x7">
         <term><command>xrx</command></term>
         <listitem>
@@ -1112,5 +1117,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
       <varlistentry id="xset-x7">
@@ -1297,5 +1302,5 @@
       </varlistentry>
 
-      <varlistentry id="libxrx-x7">
+<!--      <varlistentry id="libxrx-x7">
         <term><filename class='libraryfile'>libxrx.{so,a}</filename></term>
         <listitem>
@@ -1316,5 +1321,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
     </variablelist>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 1218b084c9deac53741d9499965228a63ead876d)
+++ x/installing/x7lib.xml	(revision 2c08a0645179114b3b753a15dcc72823435fb4cb)
@@ -191,10 +191,11 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+<!--      <segtitle>Installed Directory</segtitle> -->
 
       <seglistitem>
         <seg>cxpm, makestrs, sxpm, xft-config</seg>
         <seg>libAppleWM.{so,a}, libdmx.{so,a}, libfontenc.{so,a},
-        libFS.{so,a}, libICE.{so,a}, liblbxutil.{so,a}, liboldX.{so,a},
+<!--       libFS.{so,a}, libICE.{so,a}, liblbxutil.{so,a}, liboldX.{so,a}, -->
+        libFS.{so,a}, libICE.{so,a}, liboldX.{so,a},
         libSM.{so,a}, libWindowsWM.{so,a}, libX11.{so,a},
         libXaw6.{so,a}, libXaw7.{so,a}, libXaw8.{so,a}, libXaw.{so,a},
@@ -209,5 +210,5 @@
         libXv.{so,a}, libXxf86dga.{so,a}, libXxf86misc.{so,a},
         and libXxf86vm.{so,a}</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/X11</seg>
+<!--        <seg><envar>$XORG_PREFIX</envar>/share/X11</seg> -->
       </seglistitem>
     </segmentedlist>
@@ -310,5 +311,5 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="liblbxutil-x7">
         <term><filename class='libraryfile'>liblbxutil.{so,a}</filename></term>
@@ -320,5 +321,5 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="liboldX-x7">
         <term><filename class='libraryfile'>liboldX.{so,a}</filename></term>
