From: Fredrik Tolf Date: Tue, 13 Dec 2011 01:57:27 +0000 (+0100) Subject: Merge branch 'master' into python3 X-Git-Tag: 0.10~14 X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=c221b22d61df5882462eab41e5c79ae2a3ea9642;hp=a83cfbbc86364b00ad24c0dc7e626345a2185287 Merge branch 'master' into python3 --- diff --git a/INSTALL b/INSTALL index 7575c51..efed246 100644 --- a/INSTALL +++ b/INSTALL @@ -14,11 +14,11 @@ probably want to run `make install' as root). If you are compiling from the Git repository, you will need to run `./bootstrap' first, in order to create the `configure' script. -Ashd has few dependencies. Apart from a function C compiler and +Ashd has few dependencies. Apart from a functional C compiler and standard system headers, it needs libmagic. GnuTLS and libattr may be used optionally. If compiling from the Git repository, the GNU autotools and Asciidoc need also be installed. On a Debian-based -system, those dependencies correspond, in order, the the packages +system, those dependencies correspond, in order, to the packages build-essential, libmagic-dev, libgnutls-dev, libattr1-dev, autoconf, automake and asciidoc. diff --git a/doc/htparser.doc b/doc/htparser.doc index 698e559..6e2c239 100644 --- a/doc/htparser.doc +++ b/doc/htparser.doc @@ -92,7 +92,7 @@ EXAMPLES `htparser plain:port=8080 -- dirplex /srv/www`:: The same as the previous example, but uses port 8080 instead, - so that it can be started without root privileges.] + so that it can be started without root privileges. `htparser plain ssl:cert=/etc/ssl/private/web.pem -- dirplex /srv/www`::