Merge https://github.com/friendica/red into pending_merge

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;