diff --git a/cib/Makefile.am b/cib/Makefile.am
index 12d212a8f7..324451de94 100644
--- a/cib/Makefile.am
+++ b/cib/Makefile.am
@@ -1,67 +1,67 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include  -I$(top_srcdir)/include  \
 		  -I$(top_builddir)/libltdl  -I$(top_srcdir)/libltdl
 
 EXTRA_DIST	= cib.pam
 
 hadir		= $(sysconfdir)/ha.d
 halibdir	= $(CRM_DAEMON_DIR)
 commmoddir	= $(halibdir)/modules/comm
 
 COMMONLIBS	= $(top_builddir)/lib/common/libcrmcommon.la	\
 		  $(top_builddir)/lib/cib/libcib.la
 
 ## binary progs
 halib_PROGRAMS	= cib cibmon
 sbin_PROGRAMS   = cibpipe
 
 if BUILD_HELP
-man8_MANS =	$(sbin_PROGRAMS:%=%.8)
+man8_MANS =	
 %.8:	%
 	echo Creating $@
 	chmod a+x $<
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/cib/$<
 endif
 
 ## SOURCES
 noinst_HEADERS          = callbacks.h cibio.h cibmessages.h common.h notify.h
 
 cib_SOURCES		= io.c messages.c notify.c	\
 			callbacks.c main.c remote.c common.c
 
 cib_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
 			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
 
 cibmon_SOURCES		= cibmon.c
 cibmon_LDADD		= $(COMMONLIBS) 
 
 cibpipe_SOURCES		= cibpipe.c
 
 cibpipe_LDADD		= $(COMMONLIBS) $(CRYPTOLIB)
 cibpipe_CFLAGS		= -DCIBPIPE=1
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 #	cp -f $(top_srcdir)/crm/cib/cib.pam $(DESTDIR)/etc/pam.d/cib
 
 uninstall-local:
diff --git a/crmd/Makefile.am b/crmd/Makefile.am
index 64487b2039..622bf4fd99 100644
--- a/crmd/Makefile.am
+++ b/crmd/Makefile.am
@@ -1,74 +1,74 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 ## binary progs
 halib_PROGRAMS	= crmd atest
 
 ## SOURCES
 
 noinst_HEADERS	= crmd.h crmd_fsa.h crmd_messages.h fsa_defines.h 	\
 		fsa_matrix.h fsa_proto.h crmd_utils.h crmd_callbacks.h \
 		crmd_lrm.h te_callbacks.h tengine.h
 
 atest_SOURCES	= atest.c
 atest_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la
 
 
 crmd_SOURCES	= main.c crmd.c corosync.c					\
 		fsa.c control.c messages.c ccm.c callbacks.c		\
 		election.c join_client.c join_dc.c subsystems.c 	\
 		cib.c pengine.c tengine.c lrm.c 			\
 		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
 
 crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
 		$(top_builddir)/lib/transition/libtransitioner.la	\
 		$(top_builddir)/lib/pengine/libpe_rules.la		\
 		$(top_builddir)/lib/cib/libcib.la			\
 		$(top_builddir)/lib/common/libcrmcluster.la		\
 		$(top_builddir)/lib/common/libcrmcommon.la		\
 		$(CLUSTERLIBS) -llrm
 if BUILD_XML_HELP
-man8_MANS =	crmd.8
+man7_MANS =	crmd.7
 
 %.xml:	%
 	$(top_builddir)/crmd/$< metadata | $(XSLTPROC) --nonet --novalid --stringparam man.name $< $(top_srcdir)/xml/ocf-meta2man.xsl - > $(top_builddir)/crmd/$@
 
-%.8:	%.xml
+%.7:	%.xml
 	$(XSLTPROC) $(MANPAGE_XSLT) $(top_builddir)/crmd/$<
 endif
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
 
 install-exec-local:
 
 uninstall-local:
 
 graphs:	fsa_inputs.png fsa_inputs_by_action.png fsa_actions_by_state.png
 
 %.png: %.dot
 	dot -Tpng $< > $@ 
 
 %.dot : fsa_matrix.h make_dot.pl
 	perl $(top_srcdir)/crmd/make_dot.pl $(top_srcdir)/crmd/fsa_matrix.h $(top_builddir)/crmd
diff --git a/fencing/Makefile.am b/fencing/Makefile.am
index 70313db7b1..cb3fb7e48d 100644
--- a/fencing/Makefile.am
+++ b/fencing/Makefile.am
@@ -1,69 +1,70 @@
 # Author: Sun Jiang Dong <sunjd@cn.ibm.com>
 # Copyright (c) 2004 International Business Machines
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES = Makefile.in
 
 SUBDIRS = 
 
 ## binary progs
 halibdir	= $(CRM_DAEMON_DIR)
 halib_PROGRAMS	= stonithd stonith-test
 
 sbin_PROGRAMS  = stonith_admin
 sbin_SCRIPTS   = fence_legacy
 
+man7_MANS      = 
 man8_MANS      = 
 
 if BUILD_XML_HELP
-man8_MANS +=	stonithd.8
+man7_MANS +=	stonithd.7
 stonithd.xml:	stonithd
 	$(top_builddir)/fencing/$< metadata | $(XSLTPROC) --nonet --novalid --stringparam man.name $< $(top_srcdir)/xml/ocf-meta2man.xsl - > $(top_builddir)/fencing/$@
 
-stonithd.8:	stonithd.xml
+stonithd.7:	stonithd.xml
 	$(XSLTPROC) $(MANPAGE_XSLT) $(top_builddir)/fencing/$<
 endif
 
 if BUILD_HELP
 man8_MANS +=	$(sbin_PROGRAMS:%=%.8) fence_legacy.8
 %.8:	%
 	echo Creating $@
 	chmod a+x $<
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/fencing/$<
 endif
 
 stonith_test_SOURCES	= test.c
 
 stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/common/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 stonith_admin_SOURCES	= admin.c
 
 stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/cib/libcib.la		\
 			$(top_builddir)/lib/pengine/libpe_status.la	\
 			$(top_builddir)/lib/common/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
 
 stonithd_SOURCES	= main.c commands.c remote.c
 
 stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/common/libcrmcluster.la	\
 			$(top_builddir)/lib/fencing/libstonithd.la	\
 			$(CRYPTOLIB) $(CLUSTERLIBS)
diff --git a/pengine/Makefile.am b/pengine/Makefile.am
index 83949164ec..541195258f 100644
--- a/pengine/Makefile.am
+++ b/pengine/Makefile.am
@@ -1,95 +1,96 @@
 #
 # Copyright (C) 2004 Andrew Beekhof
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 MAINTAINERCLEANFILES    = Makefile.in
 
 INCLUDES        = -I$(top_builddir)/include -I$(top_srcdir)/include	\
 		-I$(top_builddir)           -I$(top_srcdir)		\
 		-I$(top_builddir)/libltdl   -I$(top_srcdir)/libltdl
 
 halibdir	= $(CRM_DAEMON_DIR)
 
 PE_TESTS	= $(wildcard test10/*.scores)
 
 testdir			= $(datadir)/$(PACKAGE)/tests/pengine
 test_SCRIPTS		= regression.sh
 test_DATA		= regression.core.sh ptest.supp
 
 test10dir		= $(datadir)/$(PACKAGE)/tests/pengine/test10
 test10_DATA		= $(PE_TESTS) $(PE_TESTS:%.scores=%.xml) $(PE_TESTS:%.scores=%.exp) $(PE_TESTS:%.scores=%.dot)
 
 COMMONLIBS	= 					\
 		$(top_builddir)/lib/common/libcrmcommon.la		\
 		$(top_builddir)/lib/pengine/libpe_status.la		\
 		libpengine.la $(CURSESLIBS) $(CLUSTERLIBS) 
 
 ## libraries
 lib_LTLIBRARIES	= libpengine.la
 
 ## binary progs
 halib_PROGRAMS	= pengine
 sbin_PROGRAMS	= ptest
 
+man7_MANS =
 man8_MANS =
 
 if BUILD_HELP
 man8_MANS +=	ptest.8
 ptest.8:	ptest
 	$(HELP2MAN) --output $@ --no-info --section 8 --name "Part of the Pacemaker cluster resource manager" $(top_builddir)/pengine/$<
 endif
 
 if BUILD_XML_HELP
-man8_MANS +=	pengine.8
+man7_MANS +=	pengine.7
 
 pengine.xml:	pengine
 	$(top_builddir)/pengine/$< metadata | $(XSLTPROC) --nonet --novalid --stringparam man.name $< $(top_srcdir)/xml/ocf-meta2man.xsl - > $(top_builddir)/pengine/$@
 
-pengine.8:	pengine.xml
+pengine.7:	pengine.xml
 	$(XSLTPROC) $(MANPAGE_XSLT) $(top_builddir)/pengine/$<
 endif
 
 ## SOURCES
 noinst_HEADERS	= allocate.h utils.h pengine.h
 #utils.h pengine.h
 
 libpengine_la_LDFLAGS	= -version-info 3:0:0
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
 			native.c group.c clone.c master.c graph.c
 libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
 	$(top_builddir)/lib/cib/libcib.la
 
 pengine_SOURCES	= main.c
 pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 
 ptest_SOURCES	= ptest.c 
 ptest_LDADD	= $(top_builddir)/lib/cib/libcib.la			\
 		$(top_builddir)/lib/transition/libtransitioner.la	\
 		$(COMMONLIBS)
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
 	-chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
 	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PE_STATE_DIR)
 	-chmod 750 $(DESTDIR)/$(PE_STATE_DIR)
 
 uninstall-local:
 
 clean-generic:
 	rm -f test10/*.pe.*
diff --git a/xml/ocf-meta2man.xsl b/xml/ocf-meta2man.xsl
index 9a85adca72..8dd5391202 100644
--- a/xml/ocf-meta2man.xsl
+++ b/xml/ocf-meta2man.xsl
@@ -1,224 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  version="1.0">
 
  <xsl:output indent="yes"
              doctype-public="-//OASIS//DTD DocBook XML V4.4//EN"
              doctype-system="docbookx.dtd"/>
 
  <!--<xsl:strip-space elements="longdesc shortdesc"/>-->
 
 
  <!--  -->
  <xsl:param name="man.name">NA</xsl:param>
 
  <!--  -->
- <xsl:param name="man.vol">8</xsl:param>
+ <xsl:param name="man.vol">7</xsl:param>
 
  <!--  -->
  <xsl:param name="variable.prefix"> </xsl:param>
  
  <!--  -->
  <xsl:param name="command.prefix"> </xsl:param>
  
  <!-- Separator between different action/@name -->
  <xsl:param name="separator"> | </xsl:param>
 
  <xsl:template match="/">
   <refentry>
     <xsl:apply-templates mode="root"/>
   </refentry>
  </xsl:template>
 
  <xsl:template match="resource-agent" mode="root">
   <xsl:param name="this" select="self::resource-agent"/>
   <info>
     <author>
       <personname>
 	<firstname>Andrew</firstname>
 	<surname>Beekhof</surname>
 	<email>andrew@beekhof.net</email>
       </personname>
     </author>
   </info>
   <refmeta>
     <refentrytitle><xsl:value-of select="concat($command.prefix, @name)"/></refentrytitle>
     <manvolnum><xsl:value-of select="$man.vol"/></manvolnum>
     <refmiscinfo>
       <source></source>
       <manual>Pacemaker Configuration</manual>
     </refmiscinfo>
   </refmeta>
   <refnamediv>
     <refname>
       <xsl:choose>
 	<xsl:when test="$man.name = 'NA'">
 	  <xsl:value-of select="concat($command.prefix, @name)"/>
 	</xsl:when>
 	<xsl:otherwise>
 	  <xsl:value-of select="$man.name"/>
 	</xsl:otherwise>
       </xsl:choose>
     </refname>
     <refpurpose><xsl:apply-templates select="shortdesc"/></refpurpose>
   </refnamediv>
   <xsl:apply-templates select="$this" mode="synopsis"/>
   <xsl:apply-templates select="$this" mode="description"/>
   <xsl:apply-templates select="$this" mode="parameters"/>
  </xsl:template>
 
 
  <!-- Empty Templates -->
  <xsl:template match="node()" mode="root"/>
  
  <xsl:template match="*" mode="synopsis"/>
  <xsl:template match="*" mode="description"/>
  <xsl:template match="*" mode="parameters"/>
  
  <!-- Mode synopsis -->
  <xsl:template match="resource-agent" mode="synopsis">
   <xsl:text>&#10;</xsl:text>
   <refsect1><xsl:text>&#10;  </xsl:text>
    <title>Synopsis</title>
    <xsl:text>&#10;  </xsl:text>
    <para>
     <xsl:apply-templates select="parameters/parameter" mode="synopsis"/>
     <xsl:text>&#10;  </xsl:text>
     <literal/>
     <xsl:text>&#10;  </xsl:text>
     <xsl:apply-templates select="actions" mode="synopsis">
      <xsl:with-param name="name" select="@name"/>
     </xsl:apply-templates>
    </para>
    <xsl:text>&#10;</xsl:text>
   </refsect1>
  </xsl:template>
 
  <xsl:template match="parameters/parameter" mode="synopsis">
   <xsl:if test="not(@unique='1')">
    <xsl:text>[</xsl:text>
   </xsl:if>
   
   <command><xsl:value-of select="concat($variable.prefix, @name)"/></command>
   <xsl:text>=</xsl:text>
   <xsl:value-of select="content/@type"/>
   
   <xsl:if test="not(@unique='1')">
    <xsl:text>]</xsl:text>
   </xsl:if>
   
   <xsl:text> </xsl:text>
  </xsl:template>
 
 
   <xsl:template match="actions" mode="synopsis">
    <xsl:param name="name"/>
    
    <command><xsl:value-of select="$name"/></command>
    <xsl:text> [</xsl:text>
    <xsl:apply-templates select="action" mode="synopsis"/>
    <xsl:text>]</xsl:text>
   </xsl:template>
  
  
   <xsl:template match="action" mode="synopsis">
    <xsl:value-of select="@name"/>
    <xsl:if test="following-sibling::action">
      <xsl:value-of select="$separator"/>
    </xsl:if>
   </xsl:template>
 
 
  <!-- Mode Description --> 
  <xsl:template match="resource-agent" mode="description">
     <xsl:text>&#10;&#10;</xsl:text>
     <refsect1><xsl:text>&#10;  </xsl:text>
       <title>Description</title>
       <xsl:apply-templates mode="description"/>
     </refsect1>
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
  
   <xsl:template match="longdesc" mode="description">
     <para>
      <xsl:apply-templates mode="description"/>
     </para>
   </xsl:template>
  
  
   <!-- Mode Parameters -->
   <xsl:template match="resource-agent" mode="parameters">
    <xsl:text>&#10;&#10;</xsl:text>
     <refsect1><xsl:text>&#10;  </xsl:text>
       <title>Supported Parameters</title>
       <xsl:apply-templates mode="parameters"/>
     </refsect1>
     <xsl:text>&#10;</xsl:text>
   </xsl:template>
  
  <xsl:template match="resource-agent/shortdesc|resource-agent/longdesc" mode="parameters"/>
  
   <xsl:template match="parameters" mode="parameters">
    <variablelist>
     <xsl:apply-templates mode="parameters"/>
    </variablelist>
   </xsl:template>
   
   
   <xsl:template match="parameter" mode="parameters">
    <varlistentry>
     <term>
       <command><xsl:value-of select="concat($variable.prefix, @name)"/></command>
       <xsl:text> = </xsl:text>
       <xsl:value-of select="content/@type"/>
       <xsl:if test="content/@default">
 	<xsl:text> [</xsl:text>
 	<xsl:value-of select="content/@default"/>
 	<xsl:text>]</xsl:text>
       </xsl:if>
     </term>
     <xsl:text>&#10;</xsl:text>
     <xsl:choose>
       <xsl:when test="longdesc/text() = shortdesc/text()">
 	<listitem>
 	  <para>
 	    <xsl:value-of select="shortdesc/text()"/>
 	  </para>
 	</listitem>
       </xsl:when>
       <xsl:otherwise>
 	<listitem>
 	  <para>
 	    <xsl:value-of select="shortdesc/text()"/>
 	  </para>
 	  <para>
 	    <xsl:value-of select="longdesc/text()"/>
 	  </para>
 	</listitem>
       </xsl:otherwise>
     </xsl:choose>
     <!--xsl:if test="longdesc">
       <xsl:if test="longdesc != shortdesc">
 	<listitem>
 	  <xsl:text>&#10;</xsl:text>
 	  <xsl:apply-templates select="longdesc" mode="parameters"/>
 	</listitem>
       </xsl:if>
     </xsl:if-->
     <xsl:text>&#10;</xsl:text>
    </varlistentry>
   </xsl:template>
   
   
    <xsl:template match="longdesc" mode="parameters">
     <para>
       <xsl:apply-templates select="text()" mode="parameters"/>
     </para>
   </xsl:template>
  
   
   <xsl:template match="shortdesc" mode="parameters">
    <xsl:apply-templates select="text()" mode="parameters"/>
   </xsl:template>
   
 </xsl:stylesheet>