aboutsummaryrefslogtreecommitdiffstats
path: root/doc/install
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:31:33 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:31:33 +0100
commit652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (patch)
tree978ec145ff257097ea35ccfb0910ea10238094d7 /doc/install
parent6d7897a955319d7d83a558258936528d70501a89 (diff)
downloadvolse-hubzilla-652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90.tar.gz
volse-hubzilla-652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90.tar.bz2
volse-hubzilla-652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90.zip
Doco - note in Nginx file to kill a recurring support request.
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/sample-nginx.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf
index ade323a4f..f53a3d5fb 100644
--- a/doc/install/sample-nginx.conf
+++ b/doc/install/sample-nginx.conf
@@ -65,7 +65,9 @@ server {
charset utf-8;
root /var/www/red;
access_log /var/log/nginx/red.log;
- #Uncomment the following line to include a standard configuration file
+ #Uncomment the following line to include a standard configuration file
+ #Note that the most specific rule wins and your standard configuration
+ #will therefore *add* to this file, but not override it.
#include standard.conf
# allow uploads up to 20MB in size
client_max_body_size 20m;