From 2ef6742ad9d8522d7a217c33048cfc9e779ad72d Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sat, 13 Apr 2013 22:59:37 +0200
Subject: Update Makefile & Changelog

---
 CHANGELOG | 1 +
 Makefile  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index af453182..49834df0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ For more detailed changelog, see the roadmap:
 http://dev.louiz.org/projects/poezio/roadmap
 
 * Poezio 0.8 - dev
+- The documentation now uses Sphinx/reST instead of AsciiDoc
 - Add User Tune/Nickname/Mood/Activity/Gaming support
 - More theming options
 - Add xml:lang support
diff --git a/Makefile b/Makefile
index 3c69722b..b9bdad54 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ clean:
 	find ./ -name \*.pyo -delete
 	find ./ -name \*~ -delete
 	find ./ -name "#*#" -delete
-	find ./ -name "*.html" -delete
+	rm -r doc/build/
 
 install: all
 	mkdir -p $(DESTDIR)$(prefix)
@@ -43,7 +43,7 @@ uninstall:
 	rm -rf $(DESTDIR)$(MANDIR)/man1/poezio.1
 
 doc:
-	find doc -name \*.txt -exec asciidoc -a toc {} \;
+	make -C doc/ html
 pot:
 	xgettext src/*.py --from-code=utf-8 --keyword=_ -o locale/poezio.pot
 
-- 
cgit v1.2.3