Index: comment.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v
retrieving revision 1.57
diff -u -p -r1.57 comment.install
--- comment.install	11 Jan 2010 00:13:01 -0000	1.57
+++ comment.install	14 Jan 2010 00:57:44 -0000
@@ -406,7 +406,7 @@ function comment_schema() {
         'not null' => FALSE,
         'description' => "The comment author's e-mail address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on.",
       ),
-      'homepage' => array(
+      'webpage' => array(
         'type' => 'varchar',
         'length' => 255,
         'not null' => FALSE,
Index: comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.836
diff -u -p -r1.836 comment.module
--- comment.module	13 Jan 2010 14:25:59 -0000	1.836
+++ comment.module	14 Jan 2010 00:57:46 -0000
@@ -1330,7 +1330,7 @@ function comment_save($comment) {
   try {
     $defaults =  array(
       'mail' => '',
-      'homepage' => '',
+      'webpage' => '',
       'name' => '',
       'status' => user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED,
     );
@@ -1361,7 +1361,7 @@ function comment_save($comment) {
           'uid' => $comment->uid,
           'name' => $comment->name,
           'mail' => $comment->mail,
-          'homepage' => $comment->homepage,
+          'webpage' => $comment->webpage,
           'language' => $comment->language,
         ))
         ->condition('cid', $comment->cid)
@@ -1439,7 +1439,7 @@ function comment_save($comment) {
           'thread' => $thread,
           'name' => $comment->name,
           'mail' => $comment->mail,
-          'homepage' => $comment->homepage,
+          'webpage' => $comment->webpage,
           'language' => $comment->language,
         ))
         ->execute();
@@ -1719,7 +1719,7 @@ function comment_form($form, &$form_stat
   $comment += array(
     'name' => '',
     'mail' => '',
-    'homepage' => '',
+    'webpage' => '',
     'subject' => '',
     'comment' => '',
     'cid' => NULL,
@@ -1807,7 +1807,7 @@ function comment_form($form, &$form_stat
     );
   }
 
-  // Add author e-mail and homepage fields depending on the current user.
+  // Add author e-mail and webpage fields depending on the current user.
   $form['author']['mail'] = array(
     '#type' => 'textfield',
     '#title' => t('E-mail'),
@@ -1817,10 +1817,10 @@ function comment_form($form, &$form_stat
     '#description' => t('The content of this field is kept private and will not be shown publicly.'),
     '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
   );
-  $form['author']['homepage'] = array(
+  $form['author']['webpage'] = array(
     '#type' => 'textfield',
-    '#title' => t('Homepage'),
-    '#default_value' => $comment->homepage,
+    '#title' => t('Web page'),
+    '#default_value' => $comment->webpage,
     '#maxlength' => 255,
     '#size' => 30,
     '#access' => $is_admin || (!$user->uid && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT),
@@ -1982,7 +1982,7 @@ function comment_form_validate($form, &$
     }
   }
 
-  // Check validity of name, mail and homepage (if given).
+  // Check validity of name, mail and webpage (if given).
   if (!$user->uid || $form_state['values']['is_anonymous']) {
     $node = node_load($form_state['values']['nid']);
     if (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
@@ -2011,9 +2011,9 @@ function comment_form_validate($form, &$
         form_set_error('mail', t('You have to leave an e-mail address.'));
       }
 
-      if ($form_state['values']['homepage']) {
-        if (!valid_url($form_state['values']['homepage'], TRUE)) {
-          form_set_error('homepage', t('The URL of your homepage is not valid. Remember that it must be fully qualified, i.e. of the form <code>http://example.com/directory</code>.'));
+      if ($form_state['values']['webpage']) {
+        if (!valid_url($form_state['values']['webpage'], TRUE)) {
+          form_set_error('webpage', t('The URL of your webpage is not valid. Remember that it must be fully qualified, i.e. of the form <code>http://example.com/directory</code>.'));
         }
       }
     }
Index: comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.63
diff -u -p -r1.63 comment.test
--- comment.test	11 Jan 2010 16:25:16 -0000	1.63
+++ comment.test	14 Jan 2010 00:57:53 -0000
@@ -205,7 +205,7 @@ class CommentHelperCase extends DrupalWe
    * @return boolean Contact info is available.
    */
   function commentContactInfoAvailable() {
-    return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->drupalGetContent());
+    return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="webpage")/s', $this->drupalGetContent());
   }
 
   /**
@@ -1116,7 +1116,7 @@ class CommentRdfaTestCase extends Commen
 
   /**
    * Tests the presence of the RDFa markup for the title, date and author and
-   * homepage on registered users and anonymous comments.
+   * webpage on registered users and anonymous comments.
    */
   function testCommentRdfaMarkup() {
 
@@ -1142,29 +1142,29 @@ class CommentRdfaTestCase extends Commen
     $anonymous_user = array();
     $anonymous_user['name'] = $this->randomName();
     $anonymous_user['mail'] = 'tester@simpletest.org';
-    $anonymous_user['homepage'] = 'http://example.org/';
+    $anonymous_user['webpage'] = 'http://example.org/';
     $comment2 = $this->postComment($this->node2, $comment2_body, $comment2_subject, $anonymous_user);
     $this->drupalGet('node/' . $this->node2->nid);
 
     // Tests comment #2 as anonymous user.
     $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user);
-    // Tests the RDFa markup for the homepage (specific to anonymous comments).
-    $comment_homepage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[contains(@class, 'username') and @typeof='sioc:User' and @property='foaf:name' and @href='http://example.org/' and contains(@rel, 'foaf:page')]");
-    $this->assertTrue(!empty($comment_homepage), t('RDFa markup for the homepage of anonymous user found.'));
+    // Tests the RDFa markup for the webpage (specific to anonymous comments).
+    $comment_webpage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[contains(@class, 'username') and @typeof='sioc:User' and @property='foaf:name' and @href='http://example.org/' and contains(@rel, 'foaf:page')]");
+    $this->assertTrue(!empty($comment_webpage), t('RDFa markup for the webpage of anonymous user found.'));
     // There should be no about attribute on anonymous comments.
-    $comment_homepage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[@about]");
-    $this->assertTrue(empty($comment_homepage), t('No about attribute is present on anonymous user comment.'));
+    $comment_webpage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[@about]");
+    $this->assertTrue(empty($comment_webpage), t('No about attribute is present on anonymous user comment.'));
 
     // Tests comment #2 as logged in user.
     $this->drupalLogin($this->web_user);
     $this->drupalGet('node/' . $this->node2->nid);
     $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user);
-    // Tests the RDFa markup for the homepage (specific to anonymous comments).
-    $comment_homepage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[contains(@class, 'username') and @typeof='sioc:User' and @property='foaf:name' and @href='http://example.org/' and contains(@rel, 'foaf:page')]");
-    $this->assertTrue(!empty($comment_homepage), t('RDFa markup for the homepage of anonymous user found.'));
+    // Tests the RDFa markup for the webpage (specific to anonymous comments).
+    $comment_webpage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[contains(@class, 'username') and @typeof='sioc:User' and @property='foaf:name' and @href='http://example.org/' and contains(@rel, 'foaf:page')]");
+    $this->assertTrue(!empty($comment_webpage), t('RDFa markup for the webpage of anonymous user found.'));
     // There should be no about attribute on anonymous comments.
-    $comment_homepage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[@about]");
-    $this->assertTrue(empty($comment_homepage), t('No about attribute is present on anonymous user comment.'));
+    $comment_webpage = $this->xpath("//div[@typeof='sioc:Post']//span[@rel='sioc:has_creator']/a[@about]");
+    $this->assertTrue(empty($comment_webpage), t('No about attribute is present on anonymous user comment.'));
   }
 
   /**
Index: comment.tokens.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tokens.inc,v
retrieving revision 1.10
diff -u -p -r1.10 comment.tokens.inc
--- comment.tokens.inc	9 Jan 2010 21:54:00 -0000	1.10
+++ comment.tokens.inc	14 Jan 2010 00:57:53 -0000
@@ -55,7 +55,7 @@ function comment_token_info() {
     'name' => t("Email address"),
     'description' => t("The email address left by the comment author."),
   );
-  $comment['homepage'] = array(
+  $comment['webpage'] = array(
     'name' => t("Home page"),
     'description' => t("The home page URL left by the comment author."),
   );
@@ -166,8 +166,8 @@ function comment_tokens($type, $tokens, 
           $replacements[$original] = $sanitize ? check_plain($mail) : $mail;
           break;
 
-        case 'homepage':
-          $replacements[$original] = $sanitize ? filter_xss_bad_protocol($comment->homepage) : $comment->homepage;
+        case 'webpage':
+          $replacements[$original] = $sanitize ? filter_xss_bad_protocol($comment->webpage) : $comment->webpage;
           break;
 
         case 'title':