Update to 2.6.0. Changes since previous stable branch (2.4.x):

Version 2.6.0
-------------
* Updated GNOME System Administrator's Guide         (Eugene O'Connor)
* Further updates to User Guide for GNOME 2.6.       (Brian Casey)

Version 2.5.90
--------------
* Updated User Guide for GNOME 2.6                (Brian Casey)

Version 2.5.0
-------------
* Now installing the User Guide as a single document,
  rather than by chapter.                         (Shaun McCance)

3 files changed, 20 insertions, 24 deletions

diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index 423231f8770..435e9774b3a 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.6 2004/03/07 12:09:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/01 18:57:26 jmmv Exp $
 #
 
-DISTNAME=	gnome2-user-docs-2.4.1
-PKGREVISION=	1
+DISTNAME=	gnome2-user-docs-2.6.0
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome2-user-docs/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome2-user-docs/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	The GNOME 2 users guide
 
-DEPENDS=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS=	gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
diff --git a/misc/gnome2-user-docs/PLIST b/misc/gnome2-user-docs/PLIST
index c4fc5e2d4fa..ee3367318f7 100644
--- a/misc/gnome2-user-docs/PLIST
+++ b/misc/gnome2-user-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/14 21:57:34 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/01 18:57:26 jmmv Exp $
 share/gnome/help/gnome-access-guide/C/accessintro.xml
 share/gnome/help/gnome-access-guide/C/dtconfig.xml
 share/gnome/help/gnome-access-guide/C/figures/button.png
@@ -31,12 +31,13 @@ share/gnome/help/introduction-to-gnome/C/figures/typical_anno_desktop.png
 share/gnome/help/introduction-to-gnome/C/introduction-to-gnome.xml
 share/gnome/help/introduction-to-gnome/C/legal.xml
 share/gnome/help/system-admin-guide/C/appendixa.xml
-share/gnome/help/system-admin-guide/C/figures/gconf_editor_anno_window.png
+share/gnome/help/system-admin-guide/C/appendixb.xml
+share/gnome/help/system-admin-guide/C/fontconfig.xml
 share/gnome/help/system-admin-guide/C/gconf.xml
-share/gnome/help/system-admin-guide/C/gdm.xml
 share/gnome/help/system-admin-guide/C/glossary.xml
 share/gnome/help/system-admin-guide/C/help.xml
 share/gnome/help/system-admin-guide/C/legal.xml
+share/gnome/help/system-admin-guide/C/lockdown.xml
 share/gnome/help/system-admin-guide/C/menustructure.xml
 share/gnome/help/system-admin-guide/C/mimetypes.xml
 share/gnome/help/system-admin-guide/C/performance.xml
@@ -48,6 +49,7 @@ share/gnome/help/user-guide/C/figures/applet_popup.png
 share/gnome/help/user-guide/C/figures/ask_pointer.png
 share/gnome/help/user-guide/C/figures/caution.png
 share/gnome/help/user-guide/C/figures/column_resize_pointer.png
+share/gnome/help/user-guide/C/figures/com_file_manager_menu.png
 share/gnome/help/user-guide/C/figures/copy_pointer.png
 share/gnome/help/user-guide/C/figures/corner_resize_pointer.png
 share/gnome/help/user-guide/C/figures/file_manager_menu.png
@@ -68,6 +70,10 @@ share/gnome/help/user-guide/C/figures/menu_panel.png
 share/gnome/help/user-guide/C/figures/move_panel_object_pointer.png
 share/gnome/help/user-guide/C/figures/move_pointer.png
 share/gnome/help/user-guide/C/figures/naut_audioview_window.png
+share/gnome/help/user-guide/C/figures/naut_browser_filesystem.png
+share/gnome/help/user-guide/C/figures/naut_browser_window.png
+share/gnome/help/user-guide/C/figures/naut_computer_contents.png
+share/gnome/help/user-guide/C/figures/naut_computer_launcher.png
 share/gnome/help/user-guide/C/figures/naut_home_launcher.png
 share/gnome/help/user-guide/C/figures/naut_iconview_anno_window.png
 share/gnome/help/user-guide/C/figures/naut_iconview_window.png
@@ -112,7 +118,6 @@ share/gnome/help/user-guide/C/figures/window_list_applet.png
 share/gnome/help/user-guide/C/figures/window_list_group_applet.png
 share/gnome/help/user-guide/C/figures/window_menu.png
 share/gnome/help/user-guide/C/figures/workspace_switcher_applet.png
-share/gnome/help/user-guide/C/front.xml
 share/gnome/help/user-guide/C/glossary.xml
 share/gnome/help/user-guide/C/gosbasic.xml
 share/gnome/help/user-guide/C/goscustaccess.xml
@@ -128,6 +133,7 @@ share/gnome/help/user-guide/C/gosstartsession.xml
 share/gnome/help/user-guide/C/legal.xml
 share/gnome/help/user-guide/C/part1.xml
 share/gnome/help/user-guide/C/part2.xml
+share/gnome/help/user-guide/C/plaingnomestartpreftools.xml
 share/gnome/help/user-guide/C/user-guide.xml
 share/gnome/help/user-guide/C/wgosbasic.xml
 share/gnome/help/user-guide/C/wgoscustaccess.xml
@@ -143,23 +149,13 @@ share/gnome/help/user-guide/C/wgosstartsession.xml
 share/omf/gnome2-user-docs/gnome-access-guide-C.omf
 share/omf/gnome2-user-docs/introduction-to-gnome-C.omf
 share/omf/gnome2-user-docs/system-admin-guide-C.omf
-share/omf/user-guide/gosbasic-C.omf
-share/omf/user-guide/goscustaccess-C.omf
-share/omf/user-guide/goscustdesk-C.omf
-share/omf/user-guide/goscustlookandfeel-C.omf
-share/omf/user-guide/gosdeskback-C.omf
-share/omf/user-guide/goseditmainmenu-C.omf
-share/omf/user-guide/gosmetacity-C.omf
-share/omf/user-guide/gosnautilus-C.omf
-share/omf/user-guide/gosoverview-C.omf
-share/omf/user-guide/gospanel-C.omf
-share/omf/user-guide/gosstartsession-C.omf
+share/omf/user-guide/user-guide-C.omf
 @dirrm share/omf/user-guide
 @dirrm share/omf/gnome2-user-docs
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/user-guide/C/figures
 @dirrm share/gnome/help/user-guide/C
 @dirrm share/gnome/help/user-guide
-@dirrm share/gnome/help/system-admin-guide/C/figures
 @dirrm share/gnome/help/system-admin-guide/C
 @dirrm share/gnome/help/system-admin-guide
 @dirrm share/gnome/help/introduction-to-gnome/C/figures
@@ -168,3 +164,4 @@ share/omf/user-guide/gosstartsession-C.omf
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
+@comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/misc/gnome2-user-docs/distinfo b/misc/gnome2-user-docs/distinfo
index a401174c885..e2e7b537936 100644
--- a/misc/gnome2-user-docs/distinfo
+++ b/misc/gnome2-user-docs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/12/14 21:57:34 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/04/01 18:57:26 jmmv Exp $
 
-SHA1 (gnome2-user-docs-2.4.1.tar.bz2) = c5648d10f1f71709360e365df5559d4c8bef8b62
-Size (gnome2-user-docs-2.4.1.tar.bz2) = 1428178 bytes
+SHA1 (gnome2-user-docs-2.6.0.tar.bz2) = fa78ddb558f76f98eb951133b8f735c1dde6075d
+Size (gnome2-user-docs-2.6.0.tar.bz2) = 1449994 bytes