? drush-1000662.patch
? drush-977048_6.patch
? drush-999480.patch
? drush-backend-term-2.patch
? drush-help-cmd-bootstrap.patch
? drush-helptexts.diff
? p_7.patch
? includes/table.inc
Index: commands/core/core.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/core.drush.inc,v
retrieving revision 1.156
diff -u -r1.156 core.drush.inc
--- commands/core/core.drush.inc	29 Dec 2010 07:16:33 -0000	1.156
+++ commands/core/core.drush.inc	30 Dec 2010 12:20:18 -0000
@@ -40,11 +40,11 @@
     'topics' => array('docs-readme'),
   );
   $items['core-cron'] = array(
-    'description' => 'Run all cron hooks.',
+    'description' => 'Run all cron hooks in all active modules for specified site.',
     'aliases' => array('cron'),
   );
   $items['updatedb'] = array(
-    'description' => dt('Execute the update.php process from the command line'),
+    'description' => 'Apply any database updates required (as with running update.php).',
     'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_SITE,
     'aliases' => array('updb'),
   );
@@ -66,7 +66,7 @@
     'topics' => array('docs-readme'),
   );
   $items['php-eval'] = array(
-    'description' => 'Evaluate arbitrary php code after bootstrapping Drupal.',
+    'description' => 'Evaluate arbitrary php code after bootstrapping Drupal (if available).',
     'examples' => array(
       'drush php-eval "variable_set(\'hello\', \'world\');"' => 'Sets the hello variable using Drupal API.',
     ),
@@ -122,7 +122,7 @@
     ),
   );
   $items['core-rsync'] = array(
-    'description' => 'Rsync the Drupal tree to/from another server using ssh.  Relative paths start from the Drupal root folder if a site alias is used; otherwise they start from the current working directory.',
+    'description' => 'Rsync the Drupal tree to/from another server using ssh.',
     'bootstrap' => DRUSH_BOOTSTRAP_DRUSH, // No bootstrap.
     'arguments' => array(
       'source' => 'May be rsync path or site alias. See rsync documentation and example.aliases.drushrc.php.',
@@ -177,7 +177,7 @@
   );
 
   $items['drupal-directory'] = array(
-    'description' => dt('Return path to a given module/theme directory. See --help for more details.'),
+    'description' => dt('Return path to a given module/theme directory.'),
     'arguments' => array(
       'target' => 'A module/theme name, or special names like root, files, private, or an alias : path alias string such as @alias:%files. Defaults to root.',
     ),
@@ -288,39 +288,21 @@
  */
 function core_drush_help($section) {
   switch ($section) {
-    case 'drush:cron':
-      return dt("Runs all cron hooks in all active modules for specified site.");
-    case 'drush:status':
-      return dt("View the Drupal version and DB credentials for the current site.");
     case 'drush:php-script':
       return dt("Runs the given php script(s) after a full Drupal bootstrap. A useful alternative to eval command when your php is lengthy or you can't be bothered to figure out bash quoting. If you plan to share a script with others, consider making a full drush command instead, since that's more self-documenting.  Drush provides commandline options to the script via drush_get_option('option-name'), and commandline arguments can be accessed either via drush_get_arguments(), which returns all arguments in an array, or drush_shift(), which removes the next argument from the list and returns it.");
-    case 'drush:cache-clear':
-      return dt("Delete a specific drupal cache, or all caches.");
-    case 'drush:search-status':
-      return dt("Show how many items remain to be indexed for search, and the total number of items.");
-    case 'drush:search-index':
-      return dt("Index the remaining search items.");
-    case 'drush:search-reindex':
-      return dt("Force the search index to be rebuilt.");
-    case 'drush:updatedb':
-      return dt("Run update.php just as a web browser would.");
     case 'drush:rsync':
-      return dt("Sync the entire drupal directory or a subdirectory to a <destination> using ssh. Excludes reserved files and directories for supported VCSs. Useful for pushing copies of your tree to a staging server, or retrieving a files directory from a remote site. Local paths should be specified relative to Drupal root.");
-    case 'drush:php-eval':
-      return dt("Run arbitrary PHP code in the context of Drupal");
-    case 'drush:site-install':
-      return dt("Install Drupal using specified install profile.");
+      return dt("Sync the entire drupal directory or a subdirectory to a <destination> using ssh. Excludes reserved files and directories for supported VCSs. Useful for pushing copies of your tree to a staging server, or retrieving a files directory from a remote site. Relative paths start from the Drupal root directory if a site alias is used; otherwise they start from the current working directory.");
     case 'drush:drupal-directory':
-      return dt("Return the filesystem path for projects/themes and other key folders. Used by `cli` command for handy commands `cdd` and `lsd`. If you want to use this command directly, you usually want to prefix the command with cd and enclose the command invocation in backticks. See Examples below.");
+      return dt("Return the filesystem path for modules/themes and other key folders. Used by `cli` command for handy commands `cdd` and `lsd`. If you want to use this command directly, you usually want to prefix the command with cd and enclose the command invocation in backticks. See Examples below.");
     case 'drush:core-cli':
-      return dt("Enter a new shell optimized for drush use.  All .bashrc customizations are still available. See help for more details.");
-    case 'error:DRUSH_DRUPAL_DB_ERROR' :
+      return dt("Enter a new shell optimized for drush use. All .bashrc customizations are still available.");
+    case 'error:DRUSH_DRUPAL_DB_ERROR':
       $message = dt("Drush was not able to start (bootstrap) the Drupal database.\n");
       $message .= dt("Hint: This error often occurs when Drush is trying to bootstrap a site that has not been installed or does not have a configured database.\n");
       $message .= dt("\nDrush was attempting to connect to : \n!credentials\n", array('!credentials' => _core_site_credentials()));
       $message .= dt("You can select another site with a working database setup by specifying the URI to use with the --uri parameter on the command line or \$options['uri'] in your drushrc.php file.\n");
       return $message;
-    case 'error:DRUSH_DRUPAL_BOOTSTRAP_ERROR' :
+    case 'error:DRUSH_DRUPAL_BOOTSTRAP_ERROR':
       $message = dt("Drush was not able to start (bootstrap) Drupal.\n");
       $message .= dt("Hint: This error can only occur once the database connection has already been successfully initiated, therefore this error generally points to a site configuration issue, and not a problem connecting to the database.\n");
       $message .= dt("\nDrush was attempting to connect to : \n!credentials\n", array('!credentials' => _core_site_credentials()));
Index: commands/pm/pm.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/pm/pm.drush.inc,v
retrieving revision 1.186
diff -u -r1.186 pm.drush.inc
--- commands/pm/pm.drush.inc	27 Dec 2010 15:46:16 -0000	1.186
+++ commands/pm/pm.drush.inc	30 Dec 2010 12:20:19 -0000
@@ -52,13 +52,17 @@
     case 'drush:pm-enable':
       return dt('Enable one or more extensions (modules or themes). Enable dependant extensions as well.');
     case 'drush:pm-disable':
-      return dt('Disable one or more extensions. Disable dependant extensions as well.');
+      return dt('Disable one or more extensions (modules or themes). Disable dependant extensions as well.');
     case 'drush:pm-updatecode':
-      return dt("Display available update information and allow updating of all enabled projects latest recommended release. Note: The user is asked to confirm before the actual update. Use the --yes option to answer yes automatically. Backups are performed unless diectory is already under version control.");
+    case 'drush:pm-update':
+      $message = dt("Display available update information for Drupal core and all enabled projects and allow updating to latest recommended releases.");
+      if ($section == 'drush:pm-update') {
+        $message .= ' '.dt("Also apply any database updates required (same as pm-updatecode + updatedb).");
+      }
+      $message .= ' '.dt("Note: The user is asked to confirm before the actual update. Backups are performed unless directory is already under version control.");
+      return $message;
     case 'drush:pm-updatecode-notify-pending-db-updates':
       return dt("This is a helper command needed by updatecode. It is used to check for db updates in a backend process after code updated have been performed. We need to run this task in a separate process to not conflict with old code already in memory.");
-    case 'drush:pm-update':
-      return dt("Display available update information and aallow updating of all enabled projects latest recommended release, followed by applying any database updates required (as with running update.php). Note: The user is asked to confirm before the actual update. Use the --yes option to answer yes automatically.");
       case 'drush:pm-releases':
       return dt("View all releases for a given drupal.org project. Useful for deciding which version to install/update.");
     case 'drush:pm-download':
@@ -154,7 +158,7 @@
     'deprecated-aliases' => array('refresh'),
   );
   $items['pm-updatecode'] = array(
-    'description' => 'Update your projects to latest recommended release.',
+    'description' => 'Update Drupal core and contrib projects to latest recommended releases.',
     'drupal dependencies' => array($update),
     'arguments' => array(
       'projects' => 'Optional. A list of installed projects to update.',
@@ -170,7 +174,7 @@
   ) + $engines;
   // Merge all items from above.
   $items['pm-update'] = array_merge($items['pm-updatecode'], array(
-    'description' => 'Update your project code and apply any pending database updates (equivalent to update.php).',
+    'description' => 'Update Drupal core and contrib projects and apply any pending database updates (Same as pm-updatecode + updatedb).',
     'aliases' => array('up'),
     'deprecated-aliases' => array('update'),
   ));