Merge branch 'stable'

diff --combined Makefile
index 9831bcf8b197d7aba383c7f5d6659ef668a33dcf,33c606dafa005437604873875cddf47c8badd035..707d4462a778606e1591adaad41e2d555e255dfa
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- CGIT_VERSION = v0.8.2
+ CGIT_VERSION = v0.8.2.1
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@@ -100,8 -100,7 +100,8 @@@ ifdef NEEDS_LIBICON
  endif
  
  
 -.PHONY: all libgit test install uninstall clean force-version get-git
 +.PHONY: all libgit test install uninstall clean force-version get-git \
 +      doc man-doc html-doc clean-doc
  
  all: cgit
  
@@@ -150,22 -149,8 +150,22 @@@ uninstall
        rm -f $(CGIT_DATA_PATH)/cgit.css
        rm -f $(CGIT_DATA_PATH)/cgit.png
  
 -clean:
 +doc: man-doc html-doc pdf-doc
 +
 +man-doc: cgitrc.5.txt
 +      a2x -f manpage cgitrc.5.txt
 +
 +html-doc: cgitrc.5.txt
 +      a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
 +
 +pdf-doc: cgitrc.5.txt
 +      a2x -f pdf cgitrc.5.txt
 +
 +clean: clean-doc
        rm -f cgit VERSION *.o *.d
  
 +clean-doc:
 +      rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 +
  get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git