From 513a3239198d3e4ec26799046f75206a4d9c599c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 26 Nov 2005 02:37:28 +0100
Subject: Build docs by default in .bzr checkouts

---
 Makefile     | 1 +
 doc/Makefile | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 804de55b..47af3da8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 CFLAGS += -Wall
 
 all: $(OUTFILE)
+	$(MAKE) -C doc
 
 uninstall: uninstall-bin uninstall-doc
 	@echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
diff --git a/doc/Makefile b/doc/Makefile
index e3dde912..9b473df3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,9 @@
 -include ../Makefile.settings
 
+all:
+	# Only build the docs if this is a bzr checkout
+	test ! -d ../.bzr || $(MAKE) -C user-guide
+
 install:
 	mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/
 	install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
-- 
cgit v1.2.3


From 1aa7ec7d1f2cf23c28cae05b32bd7e4a4aaebc4d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 26 Nov 2005 02:40:03 +0100
Subject: Fix missing space after actions.

---
 doc/user-guide/docbook.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user-guide/docbook.xsl b/doc/user-guide/docbook.xsl
index cfb27702..9adff305 100644
--- a/doc/user-guide/docbook.xsl
+++ b/doc/user-guide/docbook.xsl
@@ -18,7 +18,7 @@
 	</xsl:template>
 
 	<xsl:template match="ircaction">
-		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
+		<xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
 	</xsl:template>
 
 	<xsl:template match="ircexample">
-- 
cgit v1.2.3