From 9f9601690aa6c9fabdc1ee6416667530c29164d9 Mon Sep 17 00:00:00 2001
From: Henry Tang <henry.tang@longtermresults.nl>
Date: Fri, 14 Nov 2008 09:08:43 +0000
Subject: [PATCH] Version tag mode: updated help text, changelog and credits.

---
 docs/changelog/7.x.x.txt          |  2 +-
 docs/credits.txt                  |  1 +
 lib/WebGUI/i18n/English/WebGUI.pm | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a36f122e1..57748b44e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,7 +3,7 @@
    not be imported, only the surveys themselves.
  - Made syndicated content asset use cache.
  - fixed #8837: When you move an asset to a new version, only the current version is moved, instead of all of them.
-
+ - Added version tag modes: multiple tags per user, single tag per user, site wide version tag and auto commit (thanks to Long Term Results B.V.)
 
 7.6.3
  - improved performance of file uploads
diff --git a/docs/credits.txt b/docs/credits.txt
index 540e51f10..730008a4d 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -65,6 +65,7 @@ Contributing Developers..............Meg O'Keefe Andrea / Plain Black
                                      Zhou Xiaopeng / WebGUI Worldwide
                                      Gerald Young
                                      Tabitha Zipperer / Plain Black
+                                     Henry Tang / Long Term Results B.V.
 
 The following are people/companies who didn't directly contribute
 to WebGUI, but whose work has made WebGUI possible:
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 3abd1f27a..d0406f142 100755
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -4152,16 +4152,25 @@ LongTruncOk=1</p>
             message => q{Version tag mode},
         },
         'version tag mode help' => {
-            message => q{Version tag mode help...TODO},
+            message => q{Determine version tag behaviour.
+<ul>
+<li>Multiple version tags per user: each user can have multiple open version tags.</li>
+<li>Single version tag per user: each user only has one open version tag. Existing open version tag is reclaimed automatically.</li>
+<li>One site-wide version tag: users work on one site-wide version tag.</li>
+<li>Commit automatically: version tags are committed automatically.</li>
+</ul>
+
+Users may override this setting in their profile.
+},
         },
         'versionTagMode multiPerUser' => {
-            message => q{Multi version tags per user},
+            message => q{Multiple version tags per user},
         },
         'versionTagMode singlePerUser' => {
             message => q{Single version tag per user},
         },
         'versionTagMode siteWide' => {
-            message => q{One site wide version tag},
+            message => q{One site-wide version tag},
         },
         'versionTagMode autoCommit' => {
             message => q{Commit automatically},