From fc42a53629eee92eb4155326841a270907640209 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:48:48 -0400
Subject: [PATCH] Documentation and some .gitignore updates

---
 .gitignore                 | 40 +++++++++++++++++++++-----------------
 distrib/gitblit.properties |  4 ++++
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0b215f1e..86347ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,22 @@
-/temp
-/lib
-/ext
-/build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
-/site
-/git
-/target
-/build.properties
-/war
-/*.war
-/proposals
-/*.jar
-/federation.properties
-/mailtest.properties
+/temp
+/lib
+/ext
+/build
+/keystore
+/*.zip
+/gitblit.properties
+/users.properties
+/site
+/git
+/target
+/build.properties
+/war
+/*.war
+/proposals
+/*.jar
+/federation.properties
+/mailtest.properties
+/.settings/*.prefs
+/src/WEB-INF/gitblit.properties
+/bin/
+/.settings/
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index a2f0ecb0..d5e45720 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -288,10 +288,13 @@ regex.global = true
 # Example global regex substitutions
 # Use !!! to separate the search pattern and the replace pattern
 # searchpattern!!!replacepattern
+# SINCE 0.5.0
 regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>
+# SINCE 0.5.0
 regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>
 
 # Example per-repository regex substitutions overrides global
+# SINCE 0.5.0
 regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a>
 
 #
@@ -320,6 +323,7 @@ mail.debug = false
 #
 # SINCE 0.6.0
 mail.username =
+# SINCE 0.6.0
 mail.password =
 
 # from address for generated emails
-- 
2.39.5