Merge branch 'maint'

Conflicts:
	lib/libalpm/dload.c
	po/it.po
	scripts/makepkg.sh.in

1 files changed, 1 insertions, 0 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index cce0a711..7992e547 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \
 	-a pacman_date="`date +%Y-%m-%d`" \
 	-a sysconfdir=$(sysconfdir)
 A2X_OPTS = \
+	--no-xmllint \
 	-d manpage \
 	-f manpage \
 	--xsltproc-opts='-param man.endnotes.list.enabled 0' \