commit 27ae93d26b27081999863aefb4281bd3341c9a1b
parent 95a2db7a4a46de1e2f5816148ff8895a6c034f02
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 27 Jun 2005 05:01:32 +0000
clarify and consolidate the descriptions of the "fill" and "tabsize"
options in the documentation (e.g. "fill 0" acts just like "fill
[negative number]")
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2776 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
5 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -375,15 +375,24 @@ CVS code -
similar areas onto the same line. (DLR)
- Add GCC builtins to the "c-file" regexes. (Mike Frysinger)
- Simplify the file extension regex for groff. (DLR)
+ - Clarify and consolidate the descriptions of "fill" and
+ "tabsize". (DLR)
+- nano.1:
+ - Clarify and consolidate the descriptions of --fill and
+ --tabsize. (DLR)
- nanorc.5:
- Update the description of how the "color" regex works. (DLR)
- Clarify descriptions of the characters that aren't allowed
in the "punct" or "brackets" options. (DLR)
- Use .B instead of \fB ... \fP where possible, as nano.1 does.
(DLR)
+ - Clarify and consolidate the descriptions of "fill" and
+ "tabsize". (DLR)
- nano.texi:
- Update the "Feature Toggles" section to match current nano.
(DLR)
+ - Clarify and consolidate the descriptions of --fill and
+ --tabsize. (DLR)
- configure.ac:
- Minor tweaks to some of the test blocks to avoid XSI:isms.
(DLR, adapted from a Debian patch for GNU ed by David
diff --git a/doc/man/nano.1 b/doc/man/nano.1
@@ -6,7 +6,7 @@
.\" Public License for copying conditions. There is NO warranty.
.\"
.\" $Id$
-.TH NANO 1 "version 1.3.8" "June 17, 2005"
+.TH NANO 1 "version 1.3.8" "June 27, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
@@ -91,7 +91,8 @@ Enable smooth scrolling. Text will scroll line-by-line, instead of the
usual chunk-by-chunk behavior.
.TP
.B \-T \fIcols\fP (\-\-tabsize=\fIcols\fP)
-Set the size (width) of a tab to \fIcols\fP columns.
+Set the size (width) of a tab to \fIcols\fP columns. The value of
+\fIcols\fP must be greater than 0. The default value is 8.
.TP
.B \-U (\-\-quickblank)
Do quick statusbar blanking. Statusbar messages will disappear after 1
@@ -140,10 +141,10 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
by the terminal.
.TP
.B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
-Wrap lines at column \fIcols\fP. By default, this is the width of the
-screen, less eight. If this value is negative, wrapping will occur at
-\fIcols\fP columns from the right of the screen, allowing the wrap point
-to vary along with the screen width if resized.
+Wrap lines at column \fIcols\fP. If this value is 0 or less, wrapping
+will occur at the width of the screen less \fIcols\fP columns, allowing
+the wrap point to vary along with the width of the screen if the screen
+is resized. The default value is -8.
.TP
.B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
Enable alternative spell checker command.
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
@@ -6,7 +6,7 @@
.\" Public License for copying conditions. There is NO warranty.
.\"
.\" $Id$
-.TH NANORC 5 "version 1.3.8" "June 26, 2005"
+.TH NANORC 5 "version 1.3.8" "June 27, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
@@ -68,8 +68,9 @@ Constantly display the cursor position in the status bar.
Use cut to end of line by default.
.TP
.B set fill \fIn\fP
-Wrap lines at column number \fIn\fP. If \fIn\fP is 0 or less, the line
-length will be the screen width less \fIn\fP. The default value is -8.
+Wrap lines at column number \fIn\fP. If \fIn\fP is 0 or less, the
+maximum line length will be the screen width less \fIn\fP columns. The
+default value is -8.
.TP
.B set/unset historylog
Enable \fI~/.nano_history\fP for saving and reading search/replace
@@ -151,8 +152,8 @@ calls \fIspell\fP.
Allow nano to be suspended.
.TP
.B set tabsize \fIn\fP
-Use a tab size of \fIn\fP columns instead of the default (8); must be
-greater than 0.
+Use a tab size of \fIn\fP columns. The value of \fIn\fP must be greater
+than 0. The default value is 8.
.TP
.B set/unset tabstospaces
Convert typed tabs to spaces.
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
@@ -37,7 +37,7 @@
# set cut
## Set the line length for wrapping text and justifying paragraphs.
-## If fill is negative, the line length will be the screen width less
+## If fill is 0 or less, the line length will be the screen width less
## this number.
##
# set fill -8
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
@@ -9,7 +9,7 @@
@smallbook
@set EDITION 0.1
@set VERSION 1.3.8
-@set UPDATED 21 Jun 2005
+@set UPDATED 27 Jun 2005
@dircategory Editors
@direntry
@@ -162,7 +162,8 @@ beginning with 'r' (e.g. "rnano").
Enable smooth scrolling.
@item -T [num], --tabsize=[#cols]
-Set the displayed tab length to [#cols] columns.
+Set the displayed tab length to #cols columns. The value of #cols must
+be greater than 0. The default value is 8.
@item -U, --quickblank
Do quick statusbar blanking. Statusbar messages will disappear after 1
@@ -211,10 +212,10 @@ Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
editor can be can be stopped and started.
@item -r [#cols], --fill=[#cols].
-Wrap lines at column #cols. By default this is the width of the screen,
-less eight. If this value is negative, wrapping will occur at #cols
-from the right of the screen, allowing it to vary along with the screen
-width if the screen is resized.
+Wrap lines at column #cols. If this value is 0 or less, wrapping will
+occur at #cols less the width of the screen, allowing it to vary along
+with the width of the screen if the screen is resized. The default
+value is -8.
@item -s [prog], --speller=[prog]
Invoke [prog] as the spell checker. By default, @code{nano} uses the
