From 01cefcda17190b8b92cfbb1042754da7ee1a2080 Mon Sep 17 00:00:00 2001
From: Eric Lewis <eric.andrew.lewis@gmail.com>
Date: Thu, 11 Jun 2015 10:27:20 -0400
Subject: [PATCH 1/2] Explain why everything in the sites-enabled folder is
 included

---
 nginx.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nginx.conf b/nginx.conf
index 296b7ec..8ecfa66 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -130,5 +130,8 @@ http {
   # a specific directory, or on an individual server{} level.
   # gzip_static on;
 
+  # Include files in the sites-enabled folder. server{} configuration files should be 
+  # placed in the sites-available folder, and then the configuration should be enabled
+  # by creating a symlink to it in the sites-available folder.
   include sites-enabled/*;
 }

From 01af1c1e437733aa788245f5f4dba02e6462460a Mon Sep 17 00:00:00 2001
From: Eric Andrew Lewis <eric.andrew.lewis@gmail.com>
Date: Fri, 12 Jun 2015 09:52:16 -0400
Subject: [PATCH 2/2] Add an inline documentation link to the sites-enabled
 documentation page.

---
 nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 8ecfa66..be0c71c 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -130,8 +130,9 @@ http {
   # a specific directory, or on an individual server{} level.
   # gzip_static on;
 
-  # Include files in the sites-enabled folder. server{} configuration files should be 
+  # Include files in the sites-enabled folder. server{} configuration files should be
   # placed in the sites-available folder, and then the configuration should be enabled
   # by creating a symlink to it in the sites-available folder.
+  # See doc/sites-enabled.md for more info.
   include sites-enabled/*;
 }