Index: .cvsignore
===================================================================
RCS file: /cvs/gnome/rhythmbox/.cvsignore,v
retrieving revision 1.6
diff -p -u -r1.6 .cvsignore
--- .cvsignore	24 Sep 2005 15:39:24 -0000	1.6
+++ .cvsignore	18 Feb 2006 13:00:12 -0000
@@ -1,3 +1,4 @@
+gnome-doc-utils.make
 *.gz
 *.spec
 autom4te*.cache
@@ -20,4 +21,4 @@ mkinstalldirs
 .arch-ids
 INSTALL
 depcomp
-gtk-doc.make
+gtk-doc.make
\ No newline at end of file
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/Makefile.am,v
retrieving revision 1.45
diff -p -u -r1.45 Makefile.am
--- Makefile.am	9 Dec 2005 13:57:03 -0000	1.45
+++ Makefile.am	18 Feb 2006 13:00:12 -0000
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.7
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable-scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
 SUBDIRS = macros lib metadata player rhythmdb widgets sources iradio podcast remote daapsharing shell data po help tests doc
@@ -10,6 +10,7 @@ SUBDIRS = macros lib metadata player rhy
 EXTRA_DIST = 			\
 	autogen.sh		\
 	config.h.in		\
+	gnome-doc-utils.make	\
 	intltool-merge.in	\
 	intltool-update.in	\
 	intltool-extract.in	\
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/rhythmbox/autogen.sh,v
retrieving revision 1.14
diff -p -u -r1.14 autogen.sh
--- autogen.sh	28 Aug 2005 14:56:06 -0000	1.14
+++ autogen.sh	18 Feb 2006 13:00:12 -0000
@@ -18,4 +18,4 @@ which gnome-autogen.sh || {
 }
 
 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I macros"
-REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.209
diff -p -u -r1.209 configure.ac
--- configure.ac	17 Feb 2006 10:19:59 -0000	1.209
+++ configure.ac	18 Feb 2006 13:00:13 -0000
@@ -665,6 +665,9 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+dnl Enable gnome-doc-utils
+GNOME_DOC_INIT
+
 dnl Enable gtk-doc
 GTK_DOC_CHECK(1.4)
 
@@ -690,8 +693,6 @@ data/rhythmbox.pc
 sources/Makefile
 daapsharing/Makefile
 help/Makefile
-help/C/Makefile
-help/ja/Makefile
 po/Makefile.in
 tests/Makefile
 doc/Makefile
Index: help/.cvsignore
===================================================================
RCS file: /cvs/gnome/rhythmbox/help/.cvsignore,v
retrieving revision 1.2
diff -p -u -r1.2 .cvsignore
--- help/.cvsignore	1 Sep 2003 04:20:31 -0000	1.2
+++ help/.cvsignore	18 Feb 2006 13:00:13 -0000
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 .arch-ids
+*.omf
\ No newline at end of file
Index: help/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/help/Makefile.am,v
retrieving revision 1.3
diff -p -u -r1.3 Makefile.am
--- help/Makefile.am	3 Sep 2004 03:14:32 -0000	1.3
+++ help/Makefile.am	18 Feb 2006 13:00:13 -0000
@@ -1,3 +1,12 @@
 ## arch-tag: Automake rules for main help directory
 
-SUBDIRS = C ja
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = rhythmbox
+DOC_ENTITIES = fdl-appendix.xml legal.xml authors.xml quick-reference.xml user-guide.xml
+DOC_INCLUDES = 
+DOC_FIGURES = figures/rb-iradio-main.png      \
+              figures/rb-notification-area-menu.png
+
+DOC_LINGUAS =
\ No newline at end of file
Index: help/C/rhythmbox.xml
===================================================================
RCS file: /cvs/gnome/rhythmbox/help/C/rhythmbox.xml,v
retrieving revision 1.8
diff -p -u -r1.8 rhythmbox.xml
--- help/C/rhythmbox.xml	18 Feb 2006 11:50:35 -0000	1.8
+++ help/C/rhythmbox.xml	18 Feb 2006 13:00:18 -0000
@@ -6,6 +6,7 @@
 <!ENTITY appsystem "0.9">
 <!ENTITY manversion "0.1.0">
 <!ENTITY date "February 2006">
+<!ENTITY app "Rhythmbox Music Player">
 <!ENTITY application "<application>Rhythmbox</application>">
 <!ENTITY fr "<application>Rhythmbox</application>">
 <!ENTITY playlist "playlist">
@@ -45,7 +46,7 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo>
-  	<title>&fr; Manual</title>
+  	<title>&app; Manual</title>
 	<copyright>
 		<year>2002</year>
 		<holder>Mark Finlay</holder>
@@ -90,8 +91,12 @@
 			</affiliation>
 		</author>
 	</authorgroup>
-	<releaseinfo>This is the &fr; User's Manual</releaseinfo>
+	<releaseinfo>This manual describes &app;.</releaseinfo>
 	</articleinfo>
+	<abstract role="description">
+      <para>User manual for the Rhythmbox music player.</para>
+    </abstract>
+
   <indexterm zone="index">
     <primary>Rhythmbox</primary>
   </indexterm>
Index: macros/.cvsignore
===================================================================
RCS file: /cvs/gnome/rhythmbox/macros/.cvsignore,v
retrieving revision 1.4
diff -p -u -r1.4 .cvsignore
--- macros/.cvsignore	24 Sep 2005 15:40:37 -0000	1.4
+++ macros/.cvsignore	18 Feb 2006 13:00:19 -0000
@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 intltool.m4
 gtk-doc.m4
+gnome-doc-utils.m4
