[pan2: 9/14] Final fixes to the help system

[Heinrich MÃller <henmull src gnome org>]

commit 28093f06bde45dc90900e208b998fcd21b64466f
Author: Petr Kovar <pknbe volny cz>
Date:   Wed Jan 26 23:38:11 2011 +0100

    Final fixes to the help system

 Makefile.am      |    3 +--
 autogen.sh       |    2 +-
 configure.in     |    2 +-
 help/C/pan.xml   |   11 +++++++----
 help/Makefile.am |    2 +-
 help/pan.omf.in  |    2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b175e91..9284c2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po uulib pan
+SUBDIRS = help po uulib pan
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -19,7 +19,6 @@ EXTRA_DIST = \
  ChangeLog \
  Pan.ico \
  gnome-doc-utils.make \
- m4 \
  pan.spec \
  pan.png \
  $(DESKTOP_IN_FILES) \
diff --git a/autogen.sh b/autogen.sh
index 2d63202..e8d7483 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 5b63ee3..acc8cd8 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 AM_MAINTAINER_MODE
 
 GNOME_DOC_INIT
-AC_CONFIG_MACRO_DIR([m4])
+
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl glib, gmime, and gtk are mandatory prerequisites.
diff --git a/help/C/pan.xml b/help/C/pan.xml
index 2c6ae77..c74d364 100644
--- a/help/C/pan.xml
+++ b/help/C/pan.xml
@@ -37,8 +37,11 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <articleinfo> 
-    <abstract role="description"><para>Manual for the Pan Newsreader.</para></abstract>
-    <title><application>Pan</application> Manual v1.0</title>       
+    <abstract role="description">
+      <para>Pan is a powerful and user-friendly USENET newsreader for GTK+.</para>
+    </abstract>
+
+    <title><application>Pan</application> Manual</title> 
 
     <copyright> 
       <year>2006</year> 
@@ -58,11 +61,11 @@
     <publisher> 
       <publishername>Pan Documentation Project</publishername> 
     </publisher> 
-
-   
+  
    <!-- This file  contains link to license for the documentation (GNU FDL), and 
         other legal stuff such as "NO WARRANTY" statement. Please do not change 
 	any of this. -->
+
     &legal;
 
     <authorgroup> 
diff --git a/help/Makefile.am b/help/Makefile.am
index 2b72b2f..186e49b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -5,6 +5,6 @@ dist-hook: doc-dist-hook
 DOC_MODULE = pan
 DOC_ENTITIES = legal.xml
 DOC_INCLUDES =
-DOC_FIGURES = pan_window.png
+DOC_FIGURES = figures/pan_window.png
 DOC_LINGUAS =
 
diff --git a/help/pan.omf.in b/help/pan.omf.in
index 90702d0..b758d1e 100644
--- a/help/pan.omf.in
+++ b/help/pan.omf.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <omf>
   <resource>
-    <subject category="Internet"/>
+    <subject category="GNOME|Internet"/>
     <type>manual</type>
     <identifier url="pan.xml"/>
     <relation seriesid="0f3b9550-d2ae-d04e-9240-0e0958ed87d8b0"/>