(Truncation): Clean up previous change.

2 files changed, 19 insertions, 19 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5e5365cd031..bcb79dea2ee 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-09  Richard Stallman  <rms@gnu.org>
+
+        * display.texi (Truncation): Clean up previous change.
+
 2006-07-08  Richard Stallman  <rms@gnu.org>
 
         * commands.texi (Interactive Call): Use 3 as prefix in example
diff --git a/lispref/display.texi b/lispref/display.texi
index 2354ad689f2..a0c5a4756b7 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -125,25 +125,21 @@ pending, use @code{(sit-for -1)}.
 @cindex @samp{$} in display
 @cindex @samp{\} in display
 
-  When a line of text extends beyond the right edge of a window, the
-line can either be continued on the next screen line, or truncated to
-one screen line.  The additional screen lines used to display a long
-text line are called @dfn{continuation} lines.  Normally, tiny arrow images
-are displayed in the window fringes to indicate truncated and continued
-lines (*note Fringes).
-
-   On a text terminal, a `$' in the rightmost column of the window
-indicates truncation; a `\' on the rightmost column indicates a
-continued line that "wraps" onto the next line.  (The display table can
-specify alternative indicators; see *Note Display Tables.)
-
-  On a graphical display, the @samp{$} and @samp{\} indicators are
-replaced with arrow images displayed in the window fringes
-(@pxref{Fringes}).
-
-  Note that continuation is different from filling; continuation happens
-on the screen only, not in the buffer contents, and it breaks a line
-precisely at the right margin, not at a word boundary.  @xref{Filling}.
+  When a line of text extends beyond the right edge of a window, Emacs
+can @dfn{continue} the line (make it ``wrap'' to the next screen
+line), or @dfn{truncate} the line (limit it to one screen line).  The
+additional screen lines used to display a long text line are called
+@dfn{continuation} lines.  Continuation is not the same as filling;
+continuation happens on the screen only, not in the buffer contents,
+and it breaks a line precisely at the right margin, not at a word
+boundary.  @xref{Filling}.
+
+   On a graphical display, tiny arrow images in the window fringes
+indicate truncated and continued lines (@pxref{Fringes}).  On a text
+terminal, a @samp{$} in the rightmost column of the window indicates
+truncation; a @samp{\} on the rightmost column indicates a line that
+``wraps''.  (The display table can specify alternate characters to use
+for this; @pxref{Display Tables}).
 
 @defopt truncate-lines
 This buffer-local variable controls how Emacs displays lines that extend