From ecf0450558ed5cfe0824c5e6b7f79e321cff1cdf Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 5 Mar 2007 17:56:26 +0000
Subject: [PATCH] update the clipboard docs to talk about the clipboard and
 uncommitted assets

---
 lib/WebGUI/i18n/English/WebGUI.pm                        | 9 ++++++++-
 .../i18n/English/Workflow_Activity_TrashClipboard.pm     | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 13706e2c1..53e6767a8 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -3072,6 +3072,11 @@ that Asset and all Assets below it.</p>
 
 <p>The clipboard contents may be managed individually. You may delete or paste an item by selecting the appropriate icon.  You may also empty the entire contents of the clipboard to the trash by choosing the Empty clipboard menu option.</p>
 
+<p>The clipboard will only show Assets that you placed there or that are under your current version tag.</p>
+
+<p>If you are an Admin, you may access the System Clipboard, which will display all Assets by any user which are committed
+or are under your current version tag.</p>
+
 <p><b>Title</b><br />The name of the item in the clipboard.  You may view the item by selecting the title.</p>
 
 <p><b>Type</b><br />The type of content.  For instance, a Page, Article, EventsCalendar, etc.</p>
@@ -3082,7 +3087,9 @@ that Asset and all Assets below it.</p>
 
 <p><b>Username</b><br />The username of the individual who placed the item in the clipboard.  This optional field is only visible in shared clipboard environments or when an administrator is managing the system clipboard.</p>|,
 
-		lastUpdated => 1146593054,
+|,
+
+		lastUpdated => 1173117114,
 	},
 
 	'419' => {
diff --git a/lib/WebGUI/i18n/English/Workflow_Activity_TrashClipboard.pm b/lib/WebGUI/i18n/English/Workflow_Activity_TrashClipboard.pm
index d715b7749..31805d0e0 100644
--- a/lib/WebGUI/i18n/English/Workflow_Activity_TrashClipboard.pm
+++ b/lib/WebGUI/i18n/English/Workflow_Activity_TrashClipboard.pm
@@ -20,9 +20,9 @@ our $I18N = {
 	},
 
 	'trash clipboard body' => {
-		message => q|<p>This workflow activity will move all assets from the Clipboard to the Trash after they have been in the Clipboard for the specified interval.</p>
+		message => q|<p>This workflow activity will move all assets from the Clipboard to the Trash after they have been in the Clipboard for the specified interval, if those Assets are committed.  Uncommitted Assets will stay in the Clipboard until after they are committed <i>and</i> they are older than the interval.</p>
 <p>WebGUI ships with a default Workflow that moves all assets from the Clipboard to the Trash if they have been in the Clipboard for 30 days.</p>|,
-		lastUpdated => 0,
+		lastUpdated => 1173117358,
 	},
 
 };