Some updates to the apidoc rules

Ganeti/HTools/Cluster.hs

 {-| Implementation of cluster-wide logic.
 
 This module holds all pure cluster-logic; I\/O related functionality
-goes into the "Main" module.
+goes into the "Main" module for the individual binaries.
 
 -}
 
@@ -45,6 +45,7 @@ import Ganeti.HTools.Utils
 
 type NodeList = Container.Container Node.Node
 type InstanceList = Container.Container Instance.Instance
+-- | A separate name for the cluster score type
 type Score = Double
 
 -- | The description of an instance placement.

Ganeti/HTools/Version.hs.in

+-- Hey Emacs, this is a -*- haskell -*- file
+
 module Ganeti.HTools.Version
     (
-      version -- ^ the version of the tree
+      version
     ) where
 
+-- | The version of the tree
 version = "(htools) version %ver%"

Makefile

@@ -24,8 +24,8 @@ doc: $(DOCS)
 	done
 	haddock --odir $(HDDIR) --html --ignore-all-exports \
 		-t htools -p haddock-prologue \
-		--source-module="Ganeti/HTools/%{MODULE/.//}.html" \
-		--source-entity="Ganeti/HTools/%{MODULE/.//}.html#%{NAME}" \
+		--source-module="%{MODULE/.//}.html" \
+		--source-entity="%{MODULE/.//}.html#%{NAME}" \
 		$(HSRCS)
 
 clean: