ident section has problems if more than one line. Given in to theXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM

    inevitable; trying to fix this to preserve the based on stuff will
    cause me to slip down a slippery slope into doctools.

15 files changed, 16 insertions, 19 deletions

diff --git a/sgml/Darwin.sgml b/sgml/Darwin.sgml
index 13a79d8..4ac8972 100644
--- a/sgml/Darwin.sgml
+++ b/sgml/Darwin.sgml
@@ -9,7 +9,6 @@
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.9 2001/12/13 07:09:05 torrey Exp $
 </ident>
 
 <toc>
diff --git a/sgml/Install.sgml b/sgml/Install.sgml
index d67021d..8dd9861 100644
--- a/sgml/Install.sgml
+++ b/sgml/Install.sgml
@@ -10,7 +10,6 @@
 
 <ident>
 $Id$  
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
 </ident>
 
 <abstract>
diff --git a/sgml/LynxOS.sgml b/sgml/LynxOS.sgml
index b44f7e1..4c5a56a 100644
--- a/sgml/LynxOS.sgml
+++ b/sgml/LynxOS.sgml
@@ -9,7 +9,6 @@
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 2000/03/03 21:28:08 dawes Exp $
 </ident>
 
 <toc>
diff --git a/sgml/NetBSD.sgml b/sgml/NetBSD.sgml
index b4d9e00..acec5be 100644
--- a/sgml/NetBSD.sgml
+++ b/sgml/NetBSD.sgml
@@ -12,7 +12,6 @@ Matthieu Herrb
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.67 2003/02/16 17:19:22 dawes Exp $
 </ident>
 <toc>
 
diff --git a/sgml/OS2Notes.sgml b/sgml/OS2Notes.sgml
index 8364a28..8fc5c1b 100644
--- a/sgml/OS2Notes.sgml
+++ b/sgml/OS2Notes.sgml
@@ -9,7 +9,6 @@
 
 <ident>
 $Id$ 
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.1 2001/06/04 13:50:15 dawes Exp $
 </ident>
 
 <toc>
diff --git a/sgml/OpenBSD.sgml b/sgml/OpenBSD.sgml
index ea0de88..533656a 100644
--- a/sgml/OpenBSD.sgml
+++ b/sgml/OpenBSD.sgml
@@ -11,7 +11,6 @@ for X11R&relvers;
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.32 2003/12/12 03:25:05 dawes Exp $
 </ident>
 
 <toc>
diff --git a/sgml/README.sgml b/sgml/README.sgml
index e8a0e6f..f202f20 100644
--- a/sgml/README.sgml
+++ b/sgml/README.sgml
@@ -17,7 +17,6 @@
 
 <ident>
 $Id$.
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.140 2004/02/24 03:41:40 dawes Exp $
 </ident>
 
 <abstract>
diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index f56a4dd..57ce243 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -7,11 +7,10 @@
 <title>Release Notes for X11R&relvers;
 <author>The X.org Foundation
 <and>The XFree86 Project, Inc.
-<date>29 March 2004
+<date>31 March 2004
 
 <ident>
-$Id$
-Based on: $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.115 2004/02/24 03:41:40 dawes Exp $
+$ Id: RELNOTES.sgml,v 1.1.4.4.2.2.4.3 2004/03/30 03:55:47 jg Exp $
 </ident>
 
 <abstract>
@@ -418,7 +417,19 @@ X11R&relvers; supports IPv6, based on the code contributed by Sun
 Microsystems, Inc. to X.Org. See <url name="X.org's document"
 url="http://www.x.org/IPV6_Specific_Changes.html"> for a detailed list
 of what these changes are and how your system is affected by them.
-
+<p>
+Note that in most environments script kiddies have generated sniffer
+scripts that will easily grab passwords on a network. By default,
+therefore, many software vendors now ship X with remote access disabled.
+<p>
+Unless you are confident of your network, direct use of IPv6 (or, for
+that matter, IPv4) over the network to your X server is not
+recommended; instead, we recommend the use of ssh ("ssh -X -C") to
+provide strong cryptography (and possibly compression) for network
+transparent use of X.  Work is beginning to address this with a more
+fully integrated encryption scheme that would avoid the extra process
+context switches and improve performance over ssh (how much is
+unknown).
 <sect2>Protocol names and aliases. 
 <p>
 <itemize>
diff --git a/sgml/SCO.sgml b/sgml/SCO.sgml
index 6785e4e..1a4db91 100644
--- a/sgml/SCO.sgml
+++ b/sgml/SCO.sgml
@@ -11,7 +11,6 @@
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.22 2003/02/17 18:58:07 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
diff --git a/sgml/Solaris.sgml b/sgml/Solaris.sgml
index 37a786e..ba85f63 100644
--- a/sgml/Solaris.sgml
+++ b/sgml/Solaris.sgml
@@ -10,8 +10,6 @@
 
 <ident>
 $Id$.
-Based on
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3 2002/01/25 21:55:53 tsi Exp $
 </ident>
 
 <!-- Table of contents -->
diff --git a/sgml/Versions.sgml b/sgml/Versions.sgml
index 4bb1fcb..9d8f130 100644
--- a/sgml/Versions.sgml
+++ b/sgml/Versions.sgml
@@ -12,7 +12,6 @@
 
 <ident>
 $Id$
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.3 2002/12/21 03:37:09 dawes Exp $
 </ident>
 
 <abstract>
diff --git a/sgml/XKB-Config.sgml b/sgml/XKB-Config.sgml
index e13b2d9..0658dfe 100644
--- a/sgml/XKB-Config.sgml
+++ b/sgml/XKB-Config.sgml
@@ -9,7 +9,6 @@
 
 <ident>
 $Id$
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.3 2003/04/07 15:29:21 eich Exp $
 </ident>
 
 <abstract>
diff --git a/sgml/XKB-Enhancing.sgml b/sgml/XKB-Enhancing.sgml
index d46e72b..3ed1524 100644
--- a/sgml/XKB-Enhancing.sgml
+++ b/sgml/XKB-Enhancing.sgml
@@ -7,7 +7,6 @@
 
 <ident>
 $Id$
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.1 2002/12/10 03:52:56 dawes Exp $
 </ident>
 
 <abstract>
diff --git a/sgml/dps.sgml b/sgml/dps.sgml
index 821bcce..795bb77 100644
--- a/sgml/dps.sgml
+++ b/sgml/dps.sgml
@@ -11,7 +11,7 @@
 <ident>
 Updated by Jim Gettys.
 $Id$
-Based on: $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v 1.1 2001/03/02 02:45:37 dawes Exp $</ident>
+</ident>
 
 <toc>
 
diff --git a/sgml/fonts.sgml b/sgml/fonts.sgml
index 5c48aae..e1c4e62 100644
--- a/sgml/fonts.sgml
+++ b/sgml/fonts.sgml
@@ -10,7 +10,6 @@
 
 <ident>
 $Id$ 
-Based on $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.23 2003/11/24 01:57:56 dawes Exp $. Updated by Jim Gettys.
 </ident>
 
 <toc>