Merge branch 'wzyboy-patch-1'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-03-25 23:26:20 +09:00
commit faa2c4467a
1 changed files with 2 additions and 2 deletions

View File

@ -10,7 +10,7 @@
#
# * The options which do not take argument in the command-line *take*
# argument in the configuration file. Specify 'yes' as argument
# (e.g., spdy-proxy=yes). If other string is given, it disables the
# (e.g., http2-proxy=yes). If other string is given, it disables the
# option.
#
# * To specify private key and certificate file, use private-key-file
@ -25,5 +25,5 @@
# backend=127.0.0.1,80
# private-key-file=/path/to/server.key
# certificate-file=/path/to/server.crt
# spdy-proxy=no
# http2-proxy=no
# workers=1