Index: modules/comment/comment.module
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/comment/comment.module,v
retrieving revision 1.902
diff -u -p -r1.902 comment.module
--- modules/comment/comment.module	3 Oct 2010 01:15:33 -0000	1.902
+++ modules/comment/comment.module	4 Oct 2010 00:09:30 -0000
@@ -386,10 +386,10 @@ function comment_permission() {
       'title' => t('View comments'),
     ),
     'post comments' => array(
-      'title' => t('Post comments with approval'),
+      'title' => t('Post comments'),
     ),
-    'post comments without approval' => array(
-      'title' => t('Post comments without approval'),
+    'bypass comment approval' => array(
+      'title' => t('Bypass comment approval'),
     ),
     'edit own comments' => array(
       'title' => t('Edit own comments'),
@@ -1421,7 +1421,7 @@ function comment_save($comment) {
       'mail' => '',
       'homepage' => '',
       'name' => '',
-      'status' => user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED,
+      'status' => user_access('bypass comment approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED,
     );
     foreach ($defaults as $key => $default) {
       if (!isset($comment->$key)) {
@@ -1867,7 +1867,7 @@ function comment_form($form, &$form_stat
     else {
       $author = ($comment->name ? $comment->name : variable_get('anonymous', t('Anonymous')));
     }
-    $status = (user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED);
+    $status = (user_access('bypass comment approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED);
     $date = '';
   }
 
@@ -2282,7 +2282,7 @@ function theme_comment_post_forbidden($v
     if (!isset($authenticated_post_comments)) {
       // We only output a link if we are certain that users will get permission
       // to post comments by logging in.
-      $authenticated_post_comments = array_key_exists(DRUPAL_AUTHENTICATED_RID, user_roles(TRUE, 'post comments') + user_roles(TRUE, 'post comments without approval'));
+      $authenticated_post_comments = array_key_exists(DRUPAL_AUTHENTICATED_RID, user_roles(TRUE, 'post comments') + user_roles(TRUE, 'bypass comment approval'));
     }
 
     if ($authenticated_post_comments) {
Index: modules/comment/comment.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/comment/comment.test,v
retrieving revision 1.89
diff -u -p -r1.89 comment.test
--- modules/comment/comment.test	30 Aug 2010 00:22:03 -0000	1.89
+++ modules/comment/comment.test	4 Oct 2010 00:09:10 -0000
@@ -440,7 +440,7 @@ class CommentPreviewTest extends Comment
    */
   function testCommentEditPreview() {
     $langcode = LANGUAGE_NONE;
-    $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'post comments without approval'));
+    $web_user = $this->drupalCreateUser(array('access comments', 'post comments', 'bypass comment approval'));
     $this->drupalLogin($this->admin_user);
     $this->setCommentPreview(DRUPAL_OPTIONAL);
     $this->setCommentForm(TRUE);
@@ -495,7 +495,7 @@ class CommentAnonymous extends CommentHe
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => TRUE,
       'post comments' => TRUE,
-      'post comments without approval' => TRUE,
+      'bypass comment approval' => TRUE,
     ));
     $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
     $this->drupalLogout();
@@ -579,7 +579,7 @@ class CommentAnonymous extends CommentHe
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => FALSE,
       'post comments' => FALSE,
-      'post comments without approval' => FALSE,
+      'bypass comment approval' => FALSE,
     ));
 
     // Attempt to view comments while disallowed.
@@ -598,7 +598,7 @@ class CommentAnonymous extends CommentHe
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => TRUE,
       'post comments' => FALSE,
-      'post comments without approval' => FALSE,
+      'bypass comment approval' => FALSE,
     ));
     $this->drupalGet('node/' . $this->node->nid);
     $this->assertPattern('/<div ([^>]*?)id="comments"([^>]*?)>/', t('Comments were displayed.'));
@@ -890,7 +890,7 @@ class CommentApprovalTest extends Commen
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => TRUE,
       'post comments' => TRUE,
-      'post comments without approval' => FALSE,
+      'bypass comment approval' => FALSE,
     ));
     $this->drupalLogin($this->admin_user);
     $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
@@ -959,7 +959,7 @@ class CommentApprovalTest extends Commen
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => TRUE,
       'post comments' => TRUE,
-      'post comments without approval' => FALSE,
+      'bypass comment approval' => FALSE,
     ));
     $this->drupalLogin($this->admin_user);
     $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info.
Index: modules/rdf/rdf.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/rdf/rdf.test,v
retrieving revision 1.27
diff -u -p -r1.27 rdf.test
--- modules/rdf/rdf.test	9 Sep 2010 20:22:00 -0000	1.27
+++ modules/rdf/rdf.test	4 Oct 2010 00:09:10 -0000
@@ -411,7 +411,7 @@ class RdfCommentAttributesTestCase exten
     user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array(
       'access comments' => TRUE,
       'post comments' => TRUE,
-      'post comments without approval' => TRUE,
+      'bypass comment approval' => TRUE,
     ));
     // Allows anonymous to leave their contact information.
     $this->setCommentAnonymous(COMMENT_ANONYMOUS_MAY_CONTACT);
@@ -569,7 +569,7 @@ class RdfTrackerAttributesTestCase exten
       'create article content' => TRUE,
       'access comments' => TRUE,
       'post comments' => TRUE,
-      'post comments without approval' => TRUE,
+      'bypass comment approval' => TRUE,
     ));
   }
 
Index: modules/search/search.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/search/search.test,v
retrieving revision 1.75
diff -u -p -r1.75 search.test
--- modules/search/search.test	24 Sep 2010 00:37:44 -0000	1.75
+++ modules/search/search.test	4 Oct 2010 00:09:10 -0000
@@ -363,7 +363,7 @@ class SearchRankingTestCase extends Drup
 
   function testRankings() {
     // Login with sufficient privileges.
-    $this->drupalLogin($this->drupalCreateUser(array('post comments without approval', 'create page content')));
+    $this->drupalLogin($this->drupalCreateUser(array('bypass comment approval', 'create page content')));
 
     // Build a list of the rankings to test.
     $node_ranks = array('sticky', 'promote', 'relevance', 'recent', 'comments', 'views');
@@ -518,7 +518,7 @@ class SearchRankingTestCase extends Drup
    */
   function testDoubleRankings() {
     // Login with sufficient privileges.
-    $this->drupalLogin($this->drupalCreateUser(array('post comments without approval', 'create page content')));
+    $this->drupalLogin($this->drupalCreateUser(array('bypass comment approval', 'create page content')));
 
     // See testRankings() above - build a node that will rank high for sticky.
     $settings = array(
@@ -695,7 +695,7 @@ class SearchCommentTestCase extends Drup
       filter_permission_name($full_html_format),
       'administer permissions',
       'create page content',
-      'post comments without approval',
+      'bypass comment approval',
       'access comments',
     );
     $this->admin_user = $this->drupalCreateUser($permissions);
@@ -949,7 +949,7 @@ class SearchCommentCountToggleTestCase e
     parent::setUp('search');
 
     // Create searching user.
-    $this->searching_user = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'post comments without approval'));
+    $this->searching_user = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'bypass comment approval'));
 
     // Create initial nodes.
     $node_params = array('type' => 'article', 'body' => array(LANGUAGE_NONE => array(array('value' => 'SearchCommentToggleTestCase'))));
@@ -1082,7 +1082,7 @@ class SearchKeywordsConditions extends D
   function setUp() {
     parent::setUp('search', 'search_extra_type');
     // Create searching user.
-    $this->searching_user = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'post comments without approval'));
+    $this->searching_user = $this->drupalCreateUser(array('search content', 'access content', 'access comments', 'bypass comment approval'));
     // Login with sufficient privileges.
     $this->drupalLogin($this->searching_user);
     // Test with all search modules enabled.
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.239
diff -u -p -r1.239 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php	1 Oct 2010 18:37:22 -0000	1.239
+++ modules/simpletest/drupal_web_test_case.php	4 Oct 2010 00:09:10 -0000
@@ -991,7 +991,7 @@ class DrupalWebTestCase extends DrupalTe
    *   A fully loaded user object with pass_raw property, or FALSE if account
    *   creation fails.
    */
-  protected function drupalCreateUser($permissions = array('access comments', 'access content', 'post comments', 'post comments without approval')) {
+  protected function drupalCreateUser($permissions = array('access comments', 'access content', 'post comments', 'bypass comment approval')) {
     // Create a role with the given permission set.
     if (!($rid = $this->drupalCreateRole($permissions))) {
       return FALSE;
Index: modules/simpletest/tests/upgrade/drupal-6.bare.database.php
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/simpletest/tests/upgrade/drupal-6.bare.database.php,v
retrieving revision 1.1
diff -u -p -r1.1 drupal-6.bare.database.php
--- modules/simpletest/tests/upgrade/drupal-6.bare.database.php	28 Jun 2010 02:05:47 -0000	1.1
+++ modules/simpletest/tests/upgrade/drupal-6.bare.database.php	4 Oct 2010 00:09:11 -0000
@@ -6986,7 +6986,7 @@ db_insert('permission')->fields(array(
 ->values(array(
   'pid' => '2',
   'rid' => '2',
-  'perm' => 'access comments, access content, post comments, post comments without approval',
+  'perm' => 'access comments, access content, post comments, bypass comment approval',
   'tid' => '0',
 ))
 ->execute();
Index: modules/simpletest/tests/upgrade/drupal-6.filled.database.php
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/simpletest/tests/upgrade/drupal-6.filled.database.php,v
retrieving revision 1.3
diff -u -p -r1.3 drupal-6.filled.database.php
--- modules/simpletest/tests/upgrade/drupal-6.filled.database.php	11 Sep 2010 00:39:49 -0000	1.3
+++ modules/simpletest/tests/upgrade/drupal-6.filled.database.php	4 Oct 2010 00:09:11 -0000
@@ -11040,7 +11040,7 @@ db_insert('permission')->fields(array(
 ->values(array(
   'pid' => '2',
   'rid' => '2',
-  'perm' => 'access comments, access content, post comments, post comments without approval',
+  'perm' => 'access comments, access content, post comments, bypass comment approval',
   'tid' => '0',
 ))
 ->execute();
Index: modules/tracker/tracker.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/tracker/tracker.test,v
retrieving revision 1.20
diff -u -p -r1.20 tracker.test
--- modules/tracker/tracker.test	5 Aug 2010 23:53:39 -0000	1.20
+++ modules/tracker/tracker.test	4 Oct 2010 00:09:11 -0000
@@ -17,7 +17,7 @@ class TrackerTest extends DrupalWebTestC
   function setUp() {
     parent::setUp('comment', 'tracker');
 
-    $permissions = array('access comments', 'create page content', 'post comments', 'post comments without approval');
+    $permissions = array('access comments', 'create page content', 'post comments', 'bypass comment approval');
     $this->user = $this->drupalCreateUser($permissions);
     $this->other_user = $this->drupalCreateUser($permissions);
 
Index: modules/trigger/trigger.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/trigger/trigger.test,v
retrieving revision 1.36
diff -u -p -r1.36 trigger.test
--- modules/trigger/trigger.test	5 Aug 2010 23:53:39 -0000	1.36
+++ modules/trigger/trigger.test	4 Oct 2010 00:09:11 -0000
@@ -495,7 +495,7 @@ class TriggerUserActionTestCase extends 
    * Tests user action assignment and execution.
    */
   function testUserActionAssignmentExecution() {
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'bypass comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     $triggers = array('comment_presave', 'comment_insert', 'comment_update');
@@ -517,7 +517,7 @@ class TriggerUserActionTestCase extends 
     // the comment is updated.
     user_save($account, array('status' => TRUE));
 
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'bypass comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     // Our original comment will have been comment 1.
@@ -526,7 +526,7 @@ class TriggerUserActionTestCase extends 
     $this->assertTrue($comment_author_account->status == 0, t('Comment author account (uid=@uid) is blocked after update to comment', array('@uid' => $comment_author_uid)));
 
     // Verify that the comment was updated.
-    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'post comments without approval', 'edit own comments'));
+    $test_user = $this->drupalCreateUser(array('administer actions', 'create article content', 'access comments', 'administer comments', 'bypass comment approval', 'edit own comments'));
     $this->drupalLogin($test_user);
 
     $this->drupalGet("node/$node->nid");
@@ -627,7 +627,7 @@ class TriggerOtherTestCase extends Trigg
     variable_set($action_id, FALSE);
 
     // Create a node and add a comment to it.
-    $web_user = $this->drupalCreateUser(array('create article content', 'access content', 'post comments without approval', 'post comments'));
+    $web_user = $this->drupalCreateUser(array('create article content', 'access content', 'bypass comment approval', 'post comments'));
     $this->drupalLogin($web_user);
     $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1));
     $edit = array();
Index: modules/user/user.test
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/modules/user/user.test,v
retrieving revision 1.101
diff -u -p -r1.101 user.test
--- modules/user/user.test	27 Aug 2010 11:28:45 -0000	1.101
+++ modules/user/user.test	4 Oct 2010 00:09:11 -0000
@@ -571,7 +571,7 @@ class UserCancelTestCase extends DrupalW
     variable_set('user_cancel_method', 'user_cancel_delete');
 
     // Create a user.
-    $account = $this->drupalCreateUser(array('cancel account', 'post comments', 'post comments without approval'));
+    $account = $this->drupalCreateUser(array('cancel account', 'post comments', 'bypass comment approval'));
     $this->drupalLogin($account);
     // Load real user object.
     $account = user_load($account->uid, TRUE);
Index: profiles/standard/standard.install
===================================================================
RCS file: /Users/wright/drupal/local_repo/drupal/profiles/standard/standard.install,v
retrieving revision 1.25
diff -u -p -r1.25 standard.install
--- profiles/standard/standard.install	1 Oct 2010 01:37:13 -0000	1.25
+++ profiles/standard/standard.install	4 Oct 2010 00:09:11 -0000
@@ -401,7 +401,7 @@ function standard_install() {
   // Enable default permissions for system roles.
   $filtered_html_permission = filter_permission_name($filtered_html_format);
   user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access content', 'access comments', $filtered_html_permission));
-  user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access content', 'access comments', 'post comments', 'post comments without approval', $filtered_html_permission));
+  user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access content', 'access comments', 'post comments', 'bypass comment approval', $filtered_html_permission));
 
   // Create a default role for site administrators, with all available permissions assigned.
   $admin_role = new stdClass();