[gh-312] Merging trunk into test

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/testing@1549 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl.module

@@ -369,6 +369,13 @@ function unl_permission() {
  */
 function unl_preprocess_page(&$vars) {
   switch (current_path()) {
+    case 'admin/help':
+      // Override default help_help text about what to do after install
+      $vars['page']['help']['system_help']['#markup'] = '<h2>UNLcms Help</h2><p>Help is available from:</p>
+                      <ul><li><a href="http://unlcms.unl.edu/guide">Online Guide</a></li>
+                          <li><a href="http://unlcms.unl.edu/community">Users Group</a>, the second Tuesday of each month at 3:00pm in Nebraska Union</li>
+                          <li><a href="http://wdn.unl.edu/help/irc.shtml">WDN Chat Room</a></li></ul>
+                      <p>Below are help topics automatically generated by Drupal.</p><hr />';
     case 'admin/modules':
       if (!unl_user_is_administrator()) {
         // Changed here rather than using hook_help because the later merely appends to the existing text.