Merge branch 'asciidoc' into working

We're getting close to release, so might as well do this now so people can
actually update some of our documentation.

1 files changed, 8 insertions, 1 deletions

diff --git a/doc/.gitignore b/doc/.gitignore
index fcbfb09d..e10f61a4 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,2 +1,9 @@
-*.html
+PKGBUILD.5
+libalpm.3
+makepkg.8
+makepkg.conf.5
+pacman.8
+pacman.conf.5
+repo-add.8
+*.xml
 man3