diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:33:30 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:33:30 +0100 |
| commit | 9aadf82972dbbba90ccf0abe9bf6ff41c1dca8e1 (patch) | |
| tree | cf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 | |
| parent | 409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff) | |
| parent | ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (diff) | |
| download | volse-hubzilla-9aadf82972dbbba90ccf0abe9bf6ff41c1dca8e1.tar.gz volse-hubzilla-9aadf82972dbbba90ccf0abe9bf6ff41c1dca8e1.tar.bz2 volse-hubzilla-9aadf82972dbbba90ccf0abe9bf6ff41c1dca8e1.zip | |
Merge pull request #582 from beardy-unixer/master
Doco
| -rw-r--r-- | doc/install/sample-nginx.conf | 4 |
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; |