[PATCH 1/2] cgitrc.5.txt: clarify enable-git-config option

[PATCH 1/2] cgitrc.5.txt: clarify enable-git-config option

[jamie.couture]

Due to config parsing order nuances, enable-git-config must come before
the scan-path option.  Otherwise, scan-path logic will run with the
default setting 0, and will be skipped regardless of being explicitly
enabled in cgitrc.

Fixed some spelling mistakes.

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgitrc.5.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 5887cee..5956662 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -150,9 +150,11 @@ enable-git-config::
 	any repo specific settings. This option is used in conjunction with
 	"scan-path" to augment repo-specific settings. The keys gitweb.owner,
 	gitweb.category, and gitweb.description will map to the cgit keys
-	repo.owner, repo.section, and repo.desc, respectivly. All git config
-	keys that begin with "cgit." will be mapped to the corresponding "repo."
-	key in cgit. Default value: "0". See also: scan-path, section-from-path.
+	repo.owner, repo.section, and repo.desc, respectively.  All git config
+	keys that begin with "cgit." will be mapped to the corresponding
+	"repo." key in cgit. Default value: "0". *This option must be enabled
+	prior to setting 'scan-path'*.  See also: scan-path,
+	section-from-path.
 
 favicon::
 	Url used as link to a shortcut icon for cgit. If specified, it is
-- 
1.7.11.7

[PATCH 2/2] cgitrc.5.txt: fix typos

[jamie.couture]

Signed-off-by: Jamie Couture <jamie.couture at gmail.com>
---
 cgitrc.5.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 5956662..a956acf 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -265,7 +265,7 @@ nocache::
 	value: "0".
 
 noplainemail::
-	If set to "1" showing full author email adresses will be disabled.
+	If set to "1" showing full author email addresses will be disabled.
 	Default value: "0".
 
 noheader::
@@ -289,7 +289,7 @@ remove-suffix::
 
 renamelimit::
 	Maximum number of files to consider when detecting renames. The value
-	 "-1" uses the compiletime value in git (for further info, look at
+	 "-1" uses the compile-time value in git (for further info, look at
 	  `man git-diff`). Default value: "-1".
 
 repo.group::
@@ -559,7 +559,7 @@ environment variable will be unset.
 MACRO EXPANSION
 ---------------
 The following cgitrc options supports a simple macro expansion feature,
-where tokens prefixed with "$" are replaced with the value of a similary
+where tokens prefixed with "$" are replaced with the value of a similarly
 named environment variable:
 
 - cache-root
@@ -586,7 +586,7 @@ EXAMPLE CGITRC FILE
 -------------------
 
 ....
-# Enable caching of up to 1000 output entriess
+# Enable caching of up to 1000 output entries
 cache-size=1000
 
 
-- 
1.7.11.7