From bca59d6ac06b1e85c97e27705a97626ce77835df Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Fri, 11 Mar 2005 20:22:48 +0000
Subject: [PATCH] add a slightly tweaked version of Mike Frysinger's manpage
regex, and do various documentation updates
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2351 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
doc/man/nano.1 | 8 ++++----
doc/man/nanorc.5 | 2 +-
doc/nanorc.sample | 11 +++++++++++
doc/texinfo/nano.texi | 13 ++++++-------
5 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fe26708c..0d00ad04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -333,9 +333,11 @@ CVS code -
- Add the hexadecimal equivalents of the decimal values
suggested for whitespace display, now that it can handle
multibyte characters. (DLR)
+ - Add "manpage" regex. (Mike Frysinger, minor tweaks by DLR)
- nano.1. nanorc.5, nano.texi:
- Add the "morespace" option, and sync with the descriptions in
nanorc.sample in a few places. (DLR)
+ - Miscellaneous wording tweaks. (DLR)
- src/Makefile.am:
- Add chars.c to nano_SOURCES. (DLR)
- If we're installing and the "rnano" symlink already exists,
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index f074c111..b6a694e7 100644
--- 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.5" "January 17, 2005"
+.TH NANO 1 "version 1.3.6" "March 11, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
@@ -119,11 +119,11 @@ Indent new lines to the previous line's indentation. Useful when
editing source code.
.TP
.B \-k (\-\-cut)
-Enable cut from cursor to end of line with ^K.
+Enable cut from cursor to end of line.
.TP
.B \-l (\-\-nofollow)
If the file being edited is a symbolic link, replace the link with
-a new file, do not follow it. Good for editing files in
+a new file instead of following it. Good for editing files in
.IR /tmp ,
perhaps?
.TP
@@ -148,7 +148,7 @@ to vary along with the screen width if resized.
Enable alternative spell checker command.
.TP
.B \-t (\-\-tempfile)
-Always save changed buffer without prompting. Same as Pico -t option.
+Always save changed buffer without prompting. Same as Pico's -t option.
.TP
.B \-v (\-\-view)
View file (read only) mode.
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c9469ca4..d1ef27e6 100644
--- 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.5" "January 17, 2005"
+.TH NANORC 5 "version 1.3.6" "March 11, 2005"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 63d7f778..8ce43fcb 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -241,6 +241,17 @@
# color brightyellow "^@@.*"
# color magenta "^diff.*"
+## Here is an example for manpages
+##
+# syntax "manpage" "\.[1-9]x?$"
+# color green "\.(S|T)H.*$"
+# color brightgreen "\.(S|T)H" "\.TP"
+# color brightred "\.(BR?|I[PR]?).*$"
+# color brightblue "\.(BR?|I[PR]?|PP)"
+# color brightred start="\\f[BI]" end="\\f[PR]"
+# color brightblue "\\f[BIPR]"
+# color yellow "\.(br|DS|RS|RE|PD)"
+
## Here is an example for your .nanorc
##
# syntax "nanorc" "(\.|/|)nanorc$"
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index be0e4a71..23947c51 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
@c Run `makeinfo' rather than `texinfo-format-buffer'.
@smallbook
@set EDITION 0.1
-@set VERSION 1.3.5
-@set UPDATED 17 Jan 2005
+@set VERSION 1.3.6
+@set UPDATED 11 Mar 2005
@dircategory Editors
@direntry
@@ -23,7 +23,7 @@
@titlepage
@title GNU @code{nano}
@subtitle a small and friendly text editor.
-@subtitle version 1.3.5
+@subtitle version 1.3.6
@author Chris Allegretta
@page
@@ -181,16 +181,15 @@ Automatically indent new lines to the same number of spaces and tabs as
the previous line.
@item -k, --cut
-Makes ^K cut from the current cursor position to the end of the current
-line.
+Cut from the current cursor position to the end of the current line.
@item -l, --nofollow
-When writing files, if the given file is a symbolic link it is removed
+When writing files, if the given file is a symbolic link, it is removed
and a new file is created.
@item -m, --mouse
Enables the use of the mouse to select text (currently only useful for
-running under the X window system).
+running under the X Window System).
@item -o [dir], --operatingdir=[dir]
Set operating directory. Makes @code{nano} set up something similar to
--
GitLab