Documentation and some .gitignore updates

diff --git a/.gitignore b/.gitignore
index 0b215f1eab2bb69dd8f2e7de108eccc50337ec51..86347ca9b18123844b5112b7a6a1891ab2abbac5 100644 (file)
--- 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\r
+/lib\r
+/ext\r
+/build\r
+/keystore\r
+/*.zip\r
+/gitblit.properties\r
+/users.properties\r
+/site\r
+/git\r
+/target\r
+/build.properties\r
+/war\r
+/*.war\r
+/proposals\r
+/*.jar\r
+/federation.properties\r
+/mailtest.properties\r
+/.settings/*.prefs\r
+/src/WEB-INF/gitblit.properties\r
+/bin/\r
+/.settings/\r

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index a2f0ecb0230c2a1eac64f16104a1bdbbf66c7d68..d5e457201f1a130562661926e1aaa2ab95f12838 100644 (file)
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -288,10 +288,13 @@ regex.global = true
 # Example global regex substitutions\r
 # Use !!! to separate the search pattern and the replace pattern\r
 # searchpattern!!!replacepattern\r
+# SINCE 0.5.0\r
 regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>\r
+# SINCE 0.5.0\r
 regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>\r
 \r
 # Example per-repository regex substitutions overrides global\r
+# SINCE 0.5.0\r
 regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a>\r
 \r
 #\r
@@ -320,6 +323,7 @@ mail.debug = false
 #\r
 # SINCE 0.6.0\r
 mail.username =\r
+# SINCE 0.6.0\r
 mail.password =\r
 \r
 # from address for generated emails\r