update

18 files changed, 2 insertions, 19 deletions

diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index 7e376c83a..3db711cc7 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -7,7 +7,6 @@
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index f04830927..52f742f6f 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -349,7 +349,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 8d97dff93..70b9dc6bc 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -215,7 +215,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 7a052805b..ceb139480 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -262,7 +262,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 9399df347..4b320a5c5 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -308,7 +308,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 239874f33..81e974cc2 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -357,7 +357,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 95590756c..8f0b08d31 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -2,6 +2,5 @@
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index cefe02270..89ea8a3a0 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -211,7 +211,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index f821a9d26..5503f4ea2 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -249,7 +249,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index a28895e0e..0a4152747 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -258,7 +258,6 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index 76ab2a298..906664d93 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -57,7 +57,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index f2752cf81..d5819c47c 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -207,7 +207,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 9026b7e85..74057c9a5 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -212,7 +212,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 91561e0f7..2bc45423c 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -206,7 +206,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index bc39a2292..ab53d3f90 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -261,7 +261,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 16e758664..b86c681e3 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,2 +1 @@
-./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 9026b7e85..74057c9a5 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -212,7 +212,6 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
-./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 6a1092e01..1c2b89ebd 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -2578,10 +2578,9 @@
 ./usr/X11R6/man/man7/X.7
 ./usr/X11R6/man/man7/XOrgFoundation.7
 ./usr/X11R6/man/man7/XProjectTeam.7
-./usr/X11R6/man/man7/security.7
+./usr/X11R6/man/man7/Xsecurity.7
 ./usr/X11R6/share/X11/XErrorDB
 ./usr/X11R6/share/X11/doc
-./usr/X11R6/share/X11/doc/MAINTAINERS
 ./usr/X11R6/share/X11/locale
 ./usr/X11R6/share/X11/locale/C
 ./usr/X11R6/share/X11/locale/C/Compose
@@ -3100,6 +3099,7 @@
 ./usr/X11R6/share/doc/renderproto/renderproto.txt
 ./usr/X11R6/share/doc/xextproto
 ./usr/X11R6/share/doc/xextproto/geproto.txt
+./usr/X11R6/share/doc/xorg-docs/MAINTAINERS
 ./usr/X11R6/share/doc/xtrans
 ./usr/X11R6/share/mk
 ./usr/X11R6/share/mk/automake.dep