.

2 files changed, 9 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 746809c12c7..6eb3aba5d22 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-29  Reuben Thomas  <rrt@sc3d.org>
+
+        * whitespace.el (whitespace-report): Simplify documentation.
+
 2014-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * whitespace.el: Use font-lock-flush.  Minimize refontifications.
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 2217506fff5..72919340a29 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1737,21 +1737,14 @@ whitespace problems in buffer.
 
 Report if some of the following whitespace problems exist:
 
-* If `indent-tabs-mode' is non-nil:
-   empty                1. empty lines at beginning of buffer.
-   empty                2. empty lines at end of buffer.
-   trailing             3. SPACEs or TABs at end of line.
-   indentation          4. 8 or more SPACEs at beginning of line.
-   space-before-tab     5. SPACEs before TAB.
-   space-after-tab      6. 8 or more SPACEs after TAB.
-
-* If `indent-tabs-mode' is nil:
    empty                1. empty lines at beginning of buffer.
    empty                2. empty lines at end of buffer.
    trailing             3. SPACEs or TABs at end of line.
-   indentation          4. TABS at beginning of line.
-   space-before-tab     5. SPACEs before TAB.
-   space-after-tab      6. 8 or more SPACEs after TAB.
+   space-before-tab     4. SPACEs before TAB.
+   space-after-tab      5. 8 or more SPACEs after TAB.
+   indentation          6. If `indent-tabs-mode':
+                           8 or more SPACEs at beginning of line
+                           else: TABS at beginning of line.
 
 See `whitespace-style' for documentation.
 See also `whitespace-cleanup' and `whitespace-cleanup-region' for