improve page/line breaks

diff --git a/man/ChangeLog b/man/ChangeLog
index 56a9b54261653dbd4fd227f6ab883bda7c3efe01..eb6bf9bce0c941309e66382fd6200c3d279143ee 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-29  Karl Berry  <karl@gnu.org>
+
+       * windows.texi (Basic Window): remove forced @break, no longer
+       desirable.
+       * frames.texi (Frame Commands),
+       * mark.texi (Marking Objects): reword to avoid bad page break.
+       * display.texi (Auto Scrolling): use @tie{} to avoid bad line break.
+
 2006-09-19  Richard Stallman  <rms@gnu.org>
 
        * frames.texi (Dialog Boxes): Clean up wording: avoid passive,

diff --git a/man/display.texi b/man/display.texi
index 74d2ba5eb62dd115c7ca4c0e66b410802b797eb4..73d91dfb1f29d858b2ff773fd21ac1ca45839d42 100644 (file)
--- a/man/display.texi
+++ b/man/display.texi
@@ -167,7 +167,7 @@ window.  However, if you set @code{scroll-conservatively} to a small
 number @var{n}, then if you move point just a little off the
 screen---less than @var{n} lines---then Emacs scrolls the text just
 far enough to bring point back on screen.  By default,
-@code{scroll-conservatively} is 0.
+@code{scroll-conservatively} is@tie{}0.
 
 @cindex aggressive scrolling
 @vindex scroll-up-aggressively

diff --git a/man/frames.texi b/man/frames.texi
index eda8148a63dca1cee29b7f7333b969660fdd458e..f31910144346cf5b95abbdf055c017c0dd34014d 100644 (file)
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -516,13 +516,13 @@ Here's a similar example for specifying a foreground color:
 @kindex C-z @r{(X windows)}
 @findex iconify-or-deiconify-frame
 Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}).
+When typed on an Emacs frame's icon, deiconify instead.
+
 The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under
 a graphical display that allows multiple applications to operate
 simultaneously in their own windows, so Emacs gives @kbd{C-z} a
 different binding in that case.
 
-If you type this command on an Emacs frame's icon, it deiconifies the frame.
-
 @item C-x 5 0
 @kindex C-x 5 0
 @findex delete-frame

diff --git a/man/mark.texi b/man/mark.texi
index 2736dccd297eeb5bbb4afda8635340646e7279b1..e39800ab1b5ea619fc64c7b18c63374173f8e548 100644 (file)
--- a/man/mark.texi
+++ b/man/mark.texi
@@ -334,11 +334,11 @@ Put region around current page (@code{mark-page}).
 @kbd{M-@@} (@code{mark-word}) puts the mark at the end of the next
 word, while @kbd{C-M-@@} (@code{mark-sexp}) puts it at the end of the
 next balanced expression (@pxref{Expressions}).  These commands handle
-arguments just like @kbd{M-f} and @kbd{C-M-f}.  If you repeat these
-commands, that extends the region.  For example, you can type either
-@kbd{C-u 2 M-@@} or @kbd{M-@@ M-@@} to mark the next two words.  This
-command also extends the region when the mark is active in Transient
-Mark mode, regardless of the last command.
+arguments just like @kbd{M-f} and @kbd{C-M-f}.  Repeating these
+commands extends the region.  For example, you can type either
+@kbd{C-u 2 M-@@} or @kbd{M-@@ M-@@} to mark the next two words.  These
+commands also extend the region in Transient Mark mode, regardless of
+the last command.
 
 @kindex C-x h
 @findex mark-whole-buffer
@@ -347,7 +347,7 @@ buffer.  For example, @kbd{M-h} (@code{mark-paragraph}) moves point to
 the beginning of the paragraph that surrounds or follows point, and
 puts the mark at the end of that paragraph (@pxref{Paragraphs}).  It
 prepares the region so you can indent, case-convert, or kill a whole
-paragraph.  With prefix argument, if the argument's value is positive,
+paragraph.  With a prefix argument, if the argument's value is positive,
 @kbd{M-h} marks that many paragraphs starting with the one surrounding
 point.  If the prefix argument is @minus{}@var{n}, @kbd{M-h} also
 marks @var{n} paragraphs, running back form the one surrounding point.

diff --git a/man/windows.texi b/man/windows.texi
index afb9f4273e652daec4d5202089badd654ad5979a..43609b4abdb22055afb32f6ea6cb11c0bdd2f05b 100644 (file)
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -64,10 +64,6 @@ modification status and major and minor modes of the buffer that is
 displayed in the window.  The selected window's mode line appears in a
 different color.  @xref{Mode Line}, for full details on the mode line.
 
-@iftex
-@break
-@end iftex
-
 @node Split Window
 @section Splitting Windows