diff --git a/drupalorg_handbook/drupalorg_handbook.module b/drupalorg_handbook/drupalorg_handbook.module
index 0e5748a..ec1e4d7 100644
--- a/drupalorg_handbook/drupalorg_handbook.module
+++ b/drupalorg_handbook/drupalorg_handbook.module
@@ -329,7 +329,7 @@ function drupalorg_handbook_block($op = 'list', $delta = 0, $edit = array()) {
         case 'license':
           if ($section === 'documentation') {
             return array(
-              'content' => t('Drupal’s online documentation is © 2000-!year by the individual contributors and can be used in accordance with the <a href="@ccl_url">Creative Commons License, Attribution-ShareAlike 2.0</a>. PHP code is distributed under the <a href="@gpl_url">GNU General Public License</a>.', array('!year' => date('Y'), '@ccl_url' => url('node/14307'), '@gpl_url' => url('http://www.gnu.org/licenses/old-licenses/gpl-2.0.html'))),
+              'content' => t('Drupal’s online documentation is © 2000-!year by the individual contributors and can be used in accordance with the <a href="@ccl_url">Creative Commons License, Attribution-ShareAlike 2.0</a>. PHP code is distributed under the <a href="@gpl_url">GNU General Public License</a>. Comments on documentation pages are used to improve content and then deleted.', array('!year' => date('Y'), '@ccl_url' => url('node/14307'), '@gpl_url' => url('http://www.gnu.org/licenses/old-licenses/gpl-2.0.html'))),
             );
           }
           break;
@@ -338,10 +338,10 @@ function drupalorg_handbook_block($op = 'list', $delta = 0, $edit = array()) {
           return array(
             'subject' => t('Help maintain the Community Documentation'),
             'content' => '<p>' . t('The Drupal.org online Community Documentation is written and maintained by the Drupal community. When you are logged in, you can:') . '</p>' .
-            '<p>' . t('Edit most Documentation pages by clicking “Edit” at the top of the page.') . '</p>' .
-            '<p>' . t('Add new pages by using the “add a child page” link at the bottom of the page. Check the <a href="@issues_url">Documentation issue queue</a> for new page requests by others.', array('@issues_url' => url('project/issues/documentation'))) . '</p>' .
+            '<p>' . t('Edit most Documentation pages by clicking "Edit" at the top of the page.') . '</p>' .
+            '<p>' . t('Add new pages by using the "Add child page" link at the bottom of the page. Check the <a href="@issues_url">Documentation issue queue</a> for new page requests by others.', array('@issues_url' => url('project/issues/documentation'))) . '</p>' .
             '<p>' . t('Leave comments to report problems on pages (also edit the page to change the page status).') . '</p>' .
-	    '<p>' . t('Create Documentation issues to request new documentation and make moderation reports (spam or inappropriate content).') . '</p>',
+            '<p>' . t('Create Documentation issues to request new documentation and make moderation reports (inappropriate content).') . '</p>',
 	    );
 
         case 'meta-sidebar':
@@ -445,3 +445,27 @@ function theme_drupalorg_handbook_footer_line() {
      '!irclink' => l(t('IRC'), 'node/108355'),
     )) . '</strong></p>';
 }
+
+/**
+ * Implements hook_form_FORM_ID_alter() for comment_form().
+ *
+ * Adds a disclaimer if a book node is being commented on.
+ */
+function drupalorg_handbook_comment_form_alter(&$form, $form_state) {
+  // Make sure we are on a form to add a new comment (not edit existing),
+  // and that the node ID is set.
+  if (isset($form['#parameters']['nid']) && !isset($form['#parameters']['cid'])) {
+    $node = node_load($form['#parameters']['nid']);
+    if (isset($node) && isset($node->book['bid'])) {
+      // This is a node in a book. Display disclaimer.
+      $form['drupalorg-disclaimer'] = array(
+        '#type' => 'markup',
+        '#weight' => -2,
+        '#value' => '<ul>' .
+        '<li>' . t('Is your comment an addition, problem report, or example? Instead of adding a comment, edit the page content directly. Or, add a comment here, but be aware that comments are removed after edits are made.') . '</li>' .
+        '<li>' . t('Is your comment a question or request for support? Take it to the <a href="!forums">forums</a>. Comments are not answered here, and comments not providing useful information are removed.', array('!forums' => url('forum'))) . '</li>' .
+        '</ul>',
+      );
+    }
+  }
+}