Showing quotes where quotes are needed, removing some unneeded spaces,

and doing some other tweaks.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4836 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index e866c315db15ecb7000ff2bba71c875a796796ab..21f18849cef52e9da466cce2de48a4db2d2831de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
        and remove an unneeded call of wattroff().
        * doc/man/nanorc.5, doc/texinfo/nano.tex: Document the settings
        of titlecolor, statuscolor, keycolor and functioncolor.
+       * doc/man/nanorc.5, doc/texinfo/nano.tex: Show quotes where quotes
+       are needed, remove some unneeded spaces, and do other tweaks.
 
 2014-05-03  Benno Schulenberg  <bensberg@justemail.net>
        * src/*.h, src/*.c: Add the ability to colour four elements of

diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index df9673aa81d4c179526beb0ecf2efaa1cc627581..3b4619ec65cd4948b7a55c86d515a26be06eecde 100644 (file)
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -250,31 +250,32 @@ spaces.  They must be single-column characters.
 Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
 .TP
-.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
+.BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
 Defines a syntax named \fIstr\fP which can be activated via the
-\-Y/\-\-syntax command line option, or will be automatically activated if
+.BR \-Y / \-\-syntax
+command-line option, or will be automatically activated if
 the current filename matches the extended regular expression
 \fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
-will apply to \fIsyntax\fP until a new syntax is defined.
+will apply to this \fIstr\fP syntax until a new syntax is defined.
 
-The \fInone\fP syntax is reserved; specifying it on the command line is
-the same as not having a syntax at all.  The \fIdefault\fP syntax is
+The \fBnone\fP syntax is reserved; specifying it on the command line is
+the same as not having a syntax at all.  The \fBdefault\fP syntax is
 special: it takes no \fIfileregex\fP, and applies to files that don't
 match any other syntax's \fIfileregex\fP.
 .TP
-.B linter \fIprogram\fP [\fIarg\fP ... ]
+.BI linter " program " \fR[ "arg " \fR...]
 For the currently defined syntax, use the given \fIprogram\fR
 to invoke the linter (this overrides the speller function when
 defined).
 .TP
-.B magic ["\fIregex\fP" ... ]
+.BR magic " [""\fIregex\fR"" ...]
 For the currently defined syntax, add one or more regexes which 
 will be compared against the \fBmagic\fP database when attempting
 to determine which highlighting rules to use for a given file.  This 
 functionality only works when \fBlibmagic\fP is installed on the 
 system and will be silently ignored otherwise.
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 For the currently defined syntax, display all expressions matching
 the extended regular expression \fIregex\fP with foreground color
 \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
@@ -285,10 +286,10 @@ foreground.  If your terminal supports transparency, not specifying a
 \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
 background.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 Same as above, except that the expression matching is case insensitive.
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
 Display expressions which start with the extended regular expression
 \fIsr\fP and end with the extended regular expression \fIer\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
@@ -297,15 +298,15 @@ highlighting to span multiple lines.  Note that all subsequent instances
 of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until
 the first instance of \fIer\fP.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
 Same as above, except that the expression matching is case insensitive.
 .TP
-.B include "\fIsyntaxfile\fP"
+.BR include " ""\fIsyntaxfile\fR"""
 Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
 \fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
 \fBicolor\fP commands.
 .TP
-.B extendsyntax \fIstr\fP \fIdirective\fP [ \fIarg\fP ... ]
+.BI extendsyntax " str directive " \fR[ "arg " \fR...]
 Extend the syntax previously defined as \fIstr\fP to include
 new information.  Allows you to add a new \fIcolor\fP, \fIicolor\fP,
 \fImagic\fP, \fIheader\fP, or \fIlinter\fP directive to a syntax
@@ -315,11 +316,11 @@ system-installed syntax definitions (which are normally not writable).
 .SH KEY BINDINGS
 Key bindings may be reassigned via the following commands:
 .TP
-.B bind \fIkey\fP \fIfunction\fP \fImenu\fP
+.BI bind " key function menu"
 Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
 context of menu \fImenu\fP.
 .TP
-.B unbind \fIkey\fP \fImenu\fP
+.BI unbind " key menu"
 Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all 
 menus where it exists by using \fBall\fP).
 

diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 274275057c8bbc631b1d8560f6a43534e3d88795..51a885d01e7931b08efc864444bbf81c9e82e802 100644 (file)
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -562,7 +562,7 @@ length will be the screen width less "n" columns.  The default value is
 -8.
 
 @item set functioncolor fgcolor,bgcolor
-Specify the color (combination) to use for the function descriptions
+Specify the color combination to use for the function descriptions
 in the two help lines at the bottom of the screen.
 See "set titlecolor" for more details.
 
@@ -570,7 +570,7 @@ See "set titlecolor" for more details.
 Enable ~/.nano_history for saving and reading search/replace strings.
 
 @item set keycolor fgcolor,bgcolor
-Specify the color (combination) to use for the shortcut key combos
+Specify the color combination to use for the shortcut key combos
 in the two help lines at the bottom of the screen.
 See "set titlecolor" for more details.
 
@@ -682,7 +682,7 @@ Use spelling checker "spellprog" instead of the built-in one, which
 calls "spell".
 
 @item set statuscolor fgcolor,bgcolor
-Specify the color (combination) to use for the statusbar.
+Specify the color combination to use for the statusbar.
 See "set titlecolor" for more details.
 
 @item set/unset suspend
@@ -699,7 +699,7 @@ Convert typed tabs to spaces.
 Save automatically on exit, don't prompt.
 
 @item set titlecolor fgcolor,bgcolor
-Specify the color (combination) to use for the titlebar.
+Specify the color combination to use for the titlebar.
 Valid color names for foreground and background are:
 white, black, red, blue, green, yellow, magenta, and cyan.
 And either "fgcolor" or ",bgcolor" may be left out.
@@ -718,23 +718,23 @@ spaces.  They must be single-column characters.
 Detect word boundaries more accurately by treating punctuation
 characters as part of a word.
 
-@item syntax "str" ["fileregex" @dots{} ]
+@item syntax "str" ["fileregex" @dots{}]
 Defines a syntax named "str" which can be activated via the -Y/--syntax
 command line option, or will be automatically activated if the current
 filename matches the extended regular expression "fileregex".  All
-following "color" and "icolor" statements will apply to "syntax" until a
-new syntax is defined.
+following "color" and "icolor" statements will apply to this "str"
+syntax until a new syntax is defined.
 
 The "none" syntax is reserved; specifying it on the command line is the
 same as not having a syntax at all.  The "default" syntax is special: it
 takes no "fileregex", and applies to files that don't match any other
 syntax's "fileregex".
 
-@item linter program [arg @dots{} ]
+@item linter program [arg @dots{}]
 For the currently defined syntax, use the given program to invoke the
 linter (this overrides the speller function when defined).
 
-@item magic ["regex" @dots{} ]
+@item magic ["regex" @dots{}]
 For the currently defined syntax, add one or more regexes which will be
 compared against the magic database when attempting to determine which
 highlighting rules to use for a given file.  This functionality only works
@@ -768,7 +768,7 @@ Same as above, except that the expression matching is case insensitive.
 Read in self-contained color syntaxes from "syntaxfile".  Note that
 "syntaxfile" can only contain "syntax", "color", and "icolor" commands.
 
-@item extendsyntax str directive [arg @dots{} ]
+@item extendsyntax str directive [arg @dots{}]
 Extend the syntax previously defined as str to include new information.
 Allows you to add a new color, icolor, magic, header, or linter directive
 to an already defined syntax.  Useful when you want to add to definitions