GNU nano 2.1.8 release

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

.cvsignore

@@ -1,25 +0,0 @@
-ABOUT-NLS
-COPYING
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-confdefs.h
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-config.rpath
-configure
-config.guess
-config.sub
-depcomp
-install-sh
-missing
-mkinstalldirs
-nano.spec
-stamp-h
-stamp-h.in
-stamp-h1

.gitignore

@@ -0,0 +1,26 @@
+*.o
+.deps
+.libs
+Makefile
+Makefile.in
+
+/ABOUT-NLS
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.log
+/config.h
+/config.h.in
+/config.rpath
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/missing
+/mkinstalldirs
+/stamp-h1
+
+/nano.spec
+/src/nano

AUTHORS

@@ -4,15 +4,15 @@ nano editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Original program author, stable series maintainer.
+	* Original program author, former stable series maintainer.
 
-David Lawrence Ramsey <pooka_regent@sluggy.net>
-	* Development series maintainer.  Multiple buffer support,
+David Lawrence Ramsey <pooka109@gmail.com>
+	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
 	  wrapping code, spelling fixes, const mode, parts of the UTF-8
 	  support, and various other fixes.
 
-Jordi Mallach <jordi@sindominio.net>
+Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
 	* Internationalization support head, ca.po maintainer.
 
@@ -35,3 +35,9 @@ David Benbennick <dbenbenn@math.cornell.edu>
 	* Wrap and justify bugfixes/enhancements, new color syntax
 	  code, memleak fixes, parts of the UTF-8 support, and other
 	  miscellaneous fixes.
+
+Mike Frysinger <vapier@gentoo.org>
+	* Gentoo package maintainer.  Whitespace display mode,
+	  --enable-utf8/--disable-utf8 configure options for ncurses,
+	  many new color regexes and improvements to existing color
+	  regexes for nanorc.sample, and miscellaneous bug fixes.

BUGS

@@ -1,4 +1,5 @@
 ** Open BUGS **
+- Cutting the line at the top of the screen recenters to center (71)
 
 ** Fixed BUGS **
 - Marked cutting sometimes leaves a newline in the file unintelligently,
@@ -8,18 +9,18 @@
   certain col values. (9) [FIXED]
 - edit_refresh() and update_line() do not handle selecting text when the
   cursor is beyond COLS (10) [FIXED]
-- no way to do a replace with the empty string (11) [FIXED, yay!]
+- No way to do a replace with the empty string (11) [FIXED, yay!]
 - Spelling support is not elegant like Pico's integration of the 'spell'
-  program.  Nano only uses ispell (for now) (12) [FIXED]
+  program.  nano only uses ispell (for now) (12) [FIXED]
 - Moving to the end of a line when close to a multiple of COLS and at
   least COLS * 2 does not make the screen jump early like it would for
   if we were around COLS (bugs in edit_refresh, update_line) (13)
   [FIXED, mostly]
-- When at the very bottom of the edit window, do_wrap goes berserk and
+- When at the very bottom of the edit window, do_wrap() goes berserk and
   puts the cursor somewhere bad; subsequent keystrokes crash the program
   (14) [FIXED, mostly]
-- Doing a replacement of a substring of the replace string (e.g. replacing
-  "ed" with "fred" causes an infinite loop). (15) [FIXED]
+- Doing a replacement of a substring of the replace string (e.g.
+  replacing "ed" with "fred" causes an infinite loop). (15) [FIXED]
 - Cutting a file with marked text and both marker ends on the same line
   causes a random segfault (16) [FIXED]
 - Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3.
@@ -27,25 +28,28 @@
 - The wrapping code does not work right for lines like the following:
  *                                                                     *
   Error is in do_wrap, must be rewritten. (18) [FIXED]
-- Nano fails to follow symlinks, even though -l isn't being used (20).
+- nano fails to follow symlinks, even though -l isn't being used (20).
   [Bug in global flag init, FIXED]
-- When using --help or --version, the SIGINT character gets lost. (21) [FIXED]
+- When using --help or --version, the SIGINT character gets lost. (21)
+  [FIXED]
 - edit_refresh() and update_line() (and related functions) have 
   trouble when a tab is the character that is the boundary at COLS (23)
   [FIXED]
-- There is an off-by-one error in keeping track of totsize.  It is caused
-  by the fact that we count the newline at the end when we read in a file
-  but we do not, in fact, display this newline.  This should go away
-  implicitly when the "Magic Line" returns, but it is noted here for
-  documentation's sake. (24) [FIXED]
+- There is an off-by-one error in keeping track of totsize.  It is
+  caused by the fact that we count the newline at the end when we read
+  in a file but we do not, in fact, display this newline.  This should
+  go away implicitly when the "Magic Line" returns, but it is noted here
+  for documentation's sake. (24) [FIXED]
 - In replace with completely adjacent strings, every other search string
-  will be missed (try replace ':' in a string like ':::::::::') (28) [FIXED]
-- If nano opens a read-only file with the --tempfile option, and a change
-  is made to the buffer, and a write is attempted, nano will not give you
-  a dialog about not being able to write the file, and it will not let the
-  user exit (29, discovered by Joshua Jensen) [FIXED]
+  will be missed (try replace ':' in a string like ':::::::::') (28)
+  [FIXED]
+- If nano opens a read-only file with the --tempfile option, and a
+  change is made to the buffer, and a write is attempted, nano will not
+  give you a dialog about not being able to write the file, and it will
+  not let the user exit (29, discovered by Joshua Jensen) [FIXED]
 - Using nano -k, marked text is not cut properly. (31) [FIXED]
-- Invoking -t or -k has the effect of invoking both options. (32) [FIXED]
+- Invoking -t or -k has the effect of invoking both options. (32)
+  [FIXED]
 - totsize becomes incorrect after word-wrapping (25) [FIXED]
 - Wrapping a line with autoindent mode sometimes causes a segfault (19)
   [FIXED]
@@ -55,51 +59,52 @@
   [FIXED]
 - In replace, there is no way to accept the default replace string. (27)
   [FIXED]
-- Using nano -t, user can not exit until a filename is given via ^O. (30)
-  [FIXED]
+- Using nano -t, user can not exit until a filename is given via ^O.
+  (30) [FIXED]
 - totsize problems still abound in do_justify (33) [FIXED]
 - Using -k, cut text is not pasted properly. (34) [FIXED].
-- Using -k, pasted text is not updated properly if it goes beyond editbot. (35)
-  [FIXED]
+- Using -k, pasted text is not updated properly if it goes beyond
+  editbot. (35) [FIXED]
 - Doing a cut with -k can screw up the filestruct; fault is in cutting
- code. (36)  [FIXED]
+  code. (36) [FIXED]
 - Hitting enter on the magic line makes new lines, but they are not
   written out to disk when saved..... (37). [FIXED]
-- Page up and page down do not work the same way as in Pico (# of lines). (38)
-  [FIXED]
+- Page up and page down do not work the same way as in Pico (# of
+  lines). (38) [FIXED]
 - When doing a search and the marker is set, the screen does not always
   properly update the inverted text (39). [FIXED]
 - Searches for a string that only exists on one line multiple times will
   fail after finding the last occurrence (discovered by Ken Tyler) (40).
   [FIXED]
-- Alt-Z is currently broken to toggle suspend.  I guess I still don't know
-  signals very well =-) (41) [FIXED].
-- Unable to cut the entire file using the marker (discovered by Ken Tyler)
-  (42). [FIXED]
-- The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
-- When reading in a file, if the file is a directory, the contents of the
-  file being edited are blown away (discovered by  Chris Pimlot) (44). [FIXED]
-- in certain terms, nano will leave a "ghost" of screen upon exit
-  when called from inside mutt (among other settings) (45). [FIXED]
+- Meta-Z is currently broken to toggle suspend.  I guess I still don't
+  know signals very well =-) (41) [FIXED].
+- Unable to cut the entire file using the marker (discovered by Ken
+  Tyler) (42). [FIXED]
+- The keypad does not work when nano runs in the Gnome terminal (43).
+  [FIXED]
+- When reading in a file, if the file is a directory, the contents of
+  the file being edited are blown away (discovered by  Chris Pimlot)
+  (44). [FIXED]
+- In certain terms, nano will leave a "ghost" of screen upon exit when
+  called from inside mutt (among other settings) (45). [FIXED]
 - In replace, hitting the Goto line shortcut key does nothing after a
   search string is entered (discovered by Rocco Corsi) (46) [FIXED].
-- When typing in a string in search or replace and hitting CASE_SENSITIVE
-  or the other search string, the current string edit is blown away in
-  favor of the last stored search (47) [FIXED]
+- When typing in a string in search or replace and hitting
+  CASE_SENSITIVE or the other search string, the current string edit is
+  blown away in favor of the last stored search (47) [FIXED]
 - If nano fails to open a file when it starts up, doing almost anything
   causes a segfault (discovered by Ben Roberts) (48). [FIXED]
 - In certain terminals, nano would not work properly with keypad().
   Turned out to be the silly timeout(0) call, which is completely
-  unneeded, anyway.  (49) [FIXED]
-- With less than a page of text, doing a page down will move the
-  current line to the top of the screen, which it shouldn't do.  (50) 
-  [FIXED]
-- with PDCURSES, running meta-X turns off the keypad.  (51) [FIXED]
+  unneeded, anyway. (49) [FIXED]
+- With less than a page of text, doing a page down will move the current
+  line to the top of the screen, which it shouldn't do. (50) [FIXED]
+- With PDCurses, running Meta-X turns off the keypad. (51) [FIXED]
 - Resizing the window completely screws up the display if in any other
   mode than normal editing (help screen, search and replace, file
-  browser..) (52) [FIXED]
-- Alt speller argument (-s, --speller) does not take a string argument of
-  more than one word. (53) [FIXED].
+  browser...) (52) [FIXED]
+- Alt speller argument (-s, --speller) does not take a string argument
+  of more than one word. (53) [FIXED].
 - Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
   (filename~)?" line in TODO file) (discovered by
   higuita@cadernoverde.com) (54) [FIXED].
@@ -109,31 +114,48 @@
   the first fail if no string is entered (56) [FIXED].
 - Page down on a file of editwinrows fails (again). Reported by Ryan
   Krebs (57) [FIXED].
-- File browser aborts on Solaris in qsort() call.  (Reported by
-  Matthias Andree) (58) [FIXED].
-- Can modify the current file in view mode with ^W^R (discovered by Rocco
-  Corsi) (58) [FIXED].
-- When page up is used after two page down's, the screen doesn't update
+- File browser aborts on Solaris in qsort() call. (Reported by Matthias
+  Andree) (58) [FIXED].
+- Can modify the current file in view mode with ^W^R (discovered by
+  Rocco Corsi) (58) [FIXED].
+- When page up is used after two page downs, the screen doesn't update
   properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systems, marked cutting sna paste often screws up the
-  last line in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
+- On BSD systems, marked cutting and paste often screws up the last line
+  in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
 - Blank lines are not kept when cutting with -k (discovered by Rocco)
   (61) [FIXED].
-- Nano will not suspend properly inside of mutt (62) [FIXED].
+- nano will not suspend properly inside of mutt (62) [FIXED].
 - When switching from Pico mode to normal mode, the previous search is
   not displayed until cancelling the search (63) [FIXED].
 - If you change search options but don't change the search string in
-  normal mode, hitting  enter causes the search/replace to abort (64)
+  normal mode, hitting Enter causes the search/replace to abort (64)
   (Jordi Mallach) [FIXED].
 - Cutting one line of text causes the screen to recenter the line
   (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
-- When cutting marked text including the bottom of the file, a new   
-  "magic line" is not created" (reported by David Lawrence
-  Ramsey, fixed by David Lawrence Ramsey & Chris) (66) [FIXED].
-- ^C does not work after a suspend in tcsh (discovered by
-  Trevor Cordes) (68) [FIXED].
+- When cutting marked text including the bottom of the file, a new
+  "magic line" is not created" (reported by David Lawrence Ramsey, fixed
+  by David Lawrence Ramsey & Chris) (66) [FIXED].
+- ^C does not work after a suspend in tcsh (discovered by Trevor Cordes)
+  (68) [FIXED].
 - Home and End control keys (^A, ^E) do not always work in filename
   prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
 - Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
+- Meta-space and ^Space are not yet handled  in new backend code (77) [FIXED]
+- F-keys do not work with new shortcut backend (72) [FIXED]
+- Many menu items are probably missing from the new backend (73) [FIXED]
+- Need a 'check-vitals-mapped' function to check that the end used didn't
+  unbind all the keys for exit or cancel before starting up the editor (74) [FIXED]
+- Browser and prompt code still implement old switch on raw key input instead
+  of new if block for subnfunc values (75) [FIXED]
+- New backend code probably does not compile under anything but default options, 
+  if that (76) [FIXED]
+- -enable-tiny does not work with new code (78) [FIXED]
+- If a user only binds meta sequences to a function like left, right
+  page up/down, insert, and unbinds all other control and F keys for it,
+  nano will do the wrong thing when reading the key which is normally
+  assigned to it (79 - may not be worth fixing) [FIXED]
+- Segfault editing at COLS presumably due to new color syntax 
+  highlighting (80) [FIXED]
+
 
 $Id$

COPYING

@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

COPYING.DOC

@@ -0,0 +1,397 @@
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.

Makefile.am

@@ -3,8 +3,9 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
-		README THANKS TODO UPGRADE config.rpath install-sh missing \
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \
+		ChangeLog.pre-2.1 INSTALL NEWS README README.SVN \
+		THANKS TODO UPGRADE config.rpath install-sh missing \
 		mkinstalldirs nano.spec
 
 ACLOCAL_AMFLAGS = -I m4

NEWS

@@ -1,6 +1,332 @@
+2009.02.07 - GNU nano 2.1.8 "unsafe at any speed" is released.  This
+		release include some long overdue performance 
+		improvements in syntax color highlighting, the ability
+		to abort running searches (useful mainly when
+		editing very large files) and the ability to use nano
+		like a pager for viewing standard input (i.e. "nano -").
+		Additionally, there are gentoo syntax highlighting 
+		updates and fixes for issues with reading files 
+		in a directory with strange parent directory permissions. 
+		The key bindings code was also substantially changed 
+		in order to be more ISO-C compatible.  Be sure to use 
+		the Savannah page not only for bug reports but for any 
+		features you would like to see before the next stable 
+		series is released.  Have fun with it!
+		
+
+2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those
+		campaign promises of lower bug rates and 50% more pie.
+		This release includes a new check for external
+		modifications when saving a file, some code and 
+		documentation cleanups, and more bug fixes for 
+		the new undo code (but we continue to welcome your bug
+		reports via the Savananh bug page at 
+		http://savannah.gnu.org/bugs/?func=additem&group=nano.
+		Come get some.
+
+2008.10.03 - GNU nano 2.1.6 was for new features before it was against
+		them.  This release includes more undo capability, 
+		several new syntax highlighting configurations including
+		Objective C, OCaml, and Fortran, and a new capability
+		to activate highlighting based on the 1st line of the
+		file being edited.  Also, the new default configure 
+		options now include color syntax highlighting, .nanorc
+		support, multibuffer and extras.  These items can still
+		be disabled and are not enabled with --enable-tiny.  Bug
+		fixes include better signal handling under Cygwin, and 
+		that's about it.  Again please remember to
+		submit bug reports via Savannah at 
+		http://savannah.gnu.org/bugs/?func=additem&group=nano
+		as undo functions certainly need more testing.  
+		Bon appetit.
+
+2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
+		contains a better fix for incorrectly reported successful
+		writes on full filesystems, more helpful messages when
+		an internal error occurs in the undo code, and fixes for 
+		various combinations of configure-time options and 
+		compiler flags.  Also included is new support for 
+		changing the rc file name at configure time, and
+		using GNU-style regexes for word-boundaries on systems 
+		which do not support them natively, as well as the ever 
+		popular translation updates.  Rock the tarball.
+
+2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
+		includes fixes for several severe issues with the new
+		undo/redo code.  Also the behavior of writing
+		files when using backup mode has changed as well: if writing
+		the backup file fails, nano will not attempt to write the
+		current file.  This should help folks who enjoy "extreme
+		text editing" i.e. editing files on file systems which
+		are likely to run out of space; see Savannah bug 24000.
+		Have fun with it!
+
+2008.08.04 - GNY nano 2.1.3 "least stable version ever" is released.  This
+		release includes new (and experimental) undo and redo
+		functionality for most text operations.  The default 
+		key bindings are Meta-U for undo and Meta-E for redo, but
+		these can be remapped using the new 2.1 keybinding code.
+		Also included are some fixes for configuring using wide 
+		curses, crashing when invoking the help menu with 
+		certain locales, and not saving the search history when
+		compiled with configure options.
+
+2008.04.24 - GNU nano 2.1.2 "New York City" is released.  This release
+		contains fixes for binding bad keys, some 
+		configure-specific compilation failures, and more issues 
+		with the new input back end and in particular the status 
+		bar.  Also fixed are some long standing issues with 
+		compiling on AIX, and a segfault when making the terminal
+		window too small.  Rest in Peace Tim and George!
+
+2008.04.01 - GNU nano 2.1.1 wont get fooled again.  This release contains
+		fixes for the new user-rebindable keys (in particular
+		bracket match which was mis-bound), and various
+		problems with translations and configure-related 
+		compilation problems are now fixed as well.
+		It also contains new syntax highlighting 
+		definitions for TCL, PHP, Gentoo and Debian-related 
+		files, and some documentation updates as well. 
+		Please continue to send reports with the key 
+		binding code to the Savannah page
+		(https://savannah.gnu.org/bugs/?group=nano).
+		
+2008.03.18 - GNU nano 2.1.0 "under old mismanagement" is released.
+		This first release in the 2.1 development series
+		introduces rebinadble keys for most actions inside
+                the editor.  Please see the nanorc(5) page for
+		more information on configuring key bindings.  Please 
+		also report all keybinding bugs (crashes, missing 
+		menu functions) using the Savannah bug tracker URL,
+		https://savannah.gnu.org/bugs/?group=nano and
+		thanks for sticking with us!
+
+2007.12.20- GNU nano 2.0.7 keeps its balance.  This release fixes
+		several bugs, among others: a segfault and several
+		cursor positioning problems when uncutting text or
+		inserting files into the current buffer; a problem where
+		the total number of characters would be miscalculated
+		when replacing single-byte characters with multibyte
+		ones; several minor issues with the statusbar prompt
+		involving text display and mouse support; and several
+		oddities when tab-completing in the middle of a line.
+		It also improves autodetection of DOS and Mac format
+		files, properly supports the mouse wheel when using a
+		version of ncurses built with the --enable-ext-mouse
+		option, fixes some problems under NetBSD curses, adds a
+		lot of translation updates, and adds more minor
+		documentation updates.  Slang curses emulation support
+		has also been changed to turn off all the options that
+		--enable-tiny does, as it's hopelessly broken otherwise.
+		Finally, nano is now licensed under the GNU GPL version
+		3 or later, and its documentation is now dual-licensed
+		under the GNU GPL version 3 or later and the GNU FDL
+		version 1.2 or later.  Have fun.
+
+2007.04.26- GNU nano 2.0.6 "that was quick" is released.  This release
+		fixes a potential segfault after justifying text marked
+		from the bottom up.  It also adds one more minor
+		documentation update.  Enjoy.
+
+2007.04.22- GNU nano 2.0.5 braces for impact.  Among other things, this
+		release fixes various problems (including a segfault)
+		when trying to open or save a file in a directory
+		beginning with "~" that isn't a home directory; fixes a
+		problem where a file with no name could be saved over an
+		existing filename with no warning about overwriting it;
+		properly disallows opening directories or device files
+		from "include" commands in nanorc files; no longer
+		displays a misleading prompt when trying to save in
+		restricted mode with the mark on; and properly supports
+		the Cancel and Shift-Cancel keys.  It also improves
+		several color syntaxes to highlight trailing whitespace,
+		just as the Java syntax does, and adds yet more minor
+		documentation updates.  Have fun.
+
+2007.04.06 - GNU nano 2.0.4 heralds the dawn.  This release contains
+		proper support for the Ctrl-[arrow key], Shift-[arrow
+		key], and F13-F16 keys under Xfce's Terminal.  It also
+		adds still more minor documentation updates.  Enjoy.
+
+2007.01.29 - GNU nano 2.0.3 flows toward its ending.  This release
+		contains several minor optimizations to make the
+		executable a little smaller under some circumstances,
+		some translation updates, improvements to the color
+		syntax for Python, and still more minor documentation
+		updates.  Have fun.
+
+2006.12.20 - GNU nano 2.0.2 forges ahead.  This release fixes a segfault
+		when trying to save in a nonexistent directory; fixes
+		handling of strings containing nulls at the "Write File",
+		"Insert File", "Execute Command", and "Go to Directory"
+		prompts; fixes several minor memory leaks; fixes two
+		more potential compilation warnings; adds a few
+		translation updates; and adds a few more minor
+		documentation updates.  Enjoy.
+
+2006.11.20 - GNU nano 2.0.1 emerges from its cocoon.  This release
+		contains several bugfixes: saving one file over another
+		will now always warn about overwriting it, overwriting
+		a file is no longer possible when saving a new file in
+		restricted mode, and zero-length Unicode characters are
+		now highlighted properly when nano is built without
+		regular expression support.  It also adds several minor
+		documentation updates.  Have fun with it.
+
+2006.11.06 - GNU nano 2.0.0 does its little dance.  This release adds
+		documentation updates and a few cosmetic tweaks.
+			For those who haven't been following nano 1.3
+		development, there are a ton of new features, including
+		support for UTF-8, moving to a specified line and column
+		instead of just a line, improved color syntax
+		highlighting, inserting previously untypeable characters
+		using "Verbatim Input" mode, and copying text into the
+		cutbuffer without cutting it.  There are also fixes for
+		some long-standing bugs, such as the "NumLock glitch"
+		from nano 1.2.x, and the inability to unjustify text
+		after resizing.  Finally, there are also a ton of
+		translation updates and new translations, as well as new
+		color syntaxes.  See the UPGRADE file for more
+		information, and enjoy the new stable release.
+
+2006.10.25 - GNU nano 1.9.99pre3 learns to appreciate life.  This
+		release fixes a bug where the screen sometimes wouldn't
+		be updated properly after copying text into the
+		cutbuffer, fixes a potential warning while compiling,
+		and fixes a few other minor inconsistencies.  Have fun.
+
+2006.10.02 - GNU nano 1.9.99pre2 crosses the threshold.  This release
+		fixes a few more bugs: cursor positioning after leaving
+		the statusbar prompt has been fixed, and verbatim input
+		at the statusbar prompt now properly handles newlines.
+		Enjoy.
+
+2006.08.29 - GNU nano 1.9.99pre1 passes through the flames.  This
+		release fixes various bugs in the last version: the
+		mouse support properly ignores everything except clicks
+		of the left mouse button; the statusbar is now blanked
+		properly when it should be; indenting and unindenting
+		operate on the current line when the mark is off; nano
+		should build on Tru64, NetBSD, and other systems that
+		use termcap instead of terminfo in their curses
+		libraries; the built-in file browser now properly
+		navigates file lists that take up only one row; the
+		cursor position is now completely restored after
+		inserting a file into the current buffer, and after
+		inserting the output of a command into a new buffer; the
+		^X shortcut at the search prompt has been removed, as
+		official Pico doesn't include it and it's too easily
+		confused with Exit; the screen is updated properly after
+		scrolling a line without moving the cursor; the keyboard
+		input routines behave more consistently; and so on.
+		Have fun with it.
+
+2006.06.26 - GNU nano 1.3.12 escapes the darkness.  This release
+		contains the last new features that nano will have
+		before 2.0: copying text into the cutbuffer without
+		cutting it, indenting lines of marked text with a single
+		keystroke, reworked help text that should be easier for
+		new users, searching for filenames in the file browser,
+		the ability to include color regexes in files separate
+		from nanorc files, etc.  It also contains many bugfixes.
+		Text can now be unjustified after justifying it and
+		resizing the window; the screen is now cleared when
+		suspending; the "default" color syntax is now handled
+		properly at all times; lines of text containing tabs are
+		now wrapped at the right place; double-column characters
+		are now properly displayed when past the right edge of
+		the screen; invalid multi-line color regexes are now
+		ignored; and so on.  Enjoy.
+
+2006.03.30 - GNU nano 1.3.11 awakens from its fever dream.  This release
+		focuses mostly on bugfixes, which include better
+		handling of the cursor at the statusbar prompt, support
+		for certain combinations of Shift and keypad keys in
+		both normal and --rebind-keypad mode, a fix for a minor
+		display problem after some searches, a real fix for a
+		long-standing segfault when displaying overly long
+		lines, and a real fix for nano's not hanging up properly
+		in xterm under certain circumstances.  There are also
+		several new features, such as the ability to set the
+		characters used as brackets when searching for matching
+		brackets, and tab completion of directories at the "Go
+		To Directory" prompt.  Have fun.
+
+2005.12.23 - GNU nano 1.3.10 rises to the surface.  This release
+		contains several new features as well as fixes for
+		several longstanding bugs.  The former include the
+		ability to scroll up or down single lines without
+		scrolling the cursor, reworked bracket searching code
+		that doesn't require regular expression support,
+		reworked command execution code that uses $SHELL if
+		available instead of hardcoding "/bin/sh", and the
+		ability to no longer add newlines to files that don't
+		end in them via the -L/--nonewlines option.  The latter
+		include fixes to the statusbar prompt so that mouse
+		clicks work properly on it, fixes to the Yes/No/All
+		prompt so that mouse clicks on it work properly when
+		-O/--morespace is used, and fixes to the resize handling
+		so that nano dies properly when the terminal is too
+		small to display a prompt.  Enjoy.
+
+2005.10.23 - GNU nano 1.3.9 breaks through the wall.  This release
+		includes major enhancements as well as bugfixes.  The
+		enhancements include better handling of invalid UTF-8,
+		expansion of the word count option to also count lines
+		and characters in the file or selection, more efficient
+		screen update routines, a readded -K/--rebindkeypad
+		option to work around numeric keypad problems on
+		terminals that don't show the usual NumLock glitch, a
+		new -W/--wordbounds option to properly detect words
+		containing punctuation when moving among them, and
+		massive improvements to the color code such as handling
+		of unspecified foreground colors, more efficient memory
+		usage for color regexes, and new reserved syntaxes
+		"default" and "none".  The bugfixes include fixes for
+		the rewritten history code, fixes for potential line
+		numbering problems on 64-bit platforms, fixes for a few
+		long-standing minor display problems, a fix for erroneous
+		hangups occurring while waiting for input, and a fix for
+		a segfault when displaying certain overly long lines.
+		Have fun with it.
+
+2005.06.30 - GNU nano 1.3.8 floats at its own level.  This release
+		contains several new features.  Among other things, you
+		can now move to a specified column number as well as
+		line number within a file, file backups saved in a
+		backup directory will have unique names, the search and
+		replace history routines should work more consistently,
+		you can get a word count by pressing Meta-D at the edit
+		window, and there's a new -E/--tabstospaces option to
+		convert all typed tabs to spaces (--backupdir's short
+		option has been changed to -C).  In terms of bugfixes,
+		this release contains fixes for minor problems with
+		screen updates, UTF-8 display, and flow control; a fix
+		for a segfault when displaying some lines ending with
+		tabs; better handling of constant cursor position
+		display; improved color parsing in the rcfile; and
+		support for the "Regexp" toggle in tiny mode
+		(-R/--regexp is gone, and --restricted's short option
+		has been changed to -R), among other things.  Enjoy.
+
+2005.04.10 - GNU nano 1.3.7 claws its way to the top.  This release
+		mostly contains bugfixes for the massive amount of new
+		code in 1.3.6.  Among other things, nano builds with
+		debug support again; going into the help browser at the
+		"Read File" prompt no longer kicks you out of the prompt
+		after you exit the help browser; paragraph searching no
+		longer skips over certain cases of single-line
+		paragraphs; the titlebar no longer cuts off some UTF-8
+		strings prematurely; and the text displayed in the help
+		browser is now wrapped as it was in nano 1.2.x, taking
+		UTF-8 support into account.  New features include an
+		--enable/disable-utf8 configure option to explicitly
+		turn detection of UTF-8 support on or off, and sample
+		regexes for C++ as well as C.  Have fun.
+
 2005.03.20 - GNU nano 1.3.6 "shout it from the rooftops" is released.
 		This release finally includes the long-awaited support
-		for UTF-8.   Other new features include the ability to
+		for UTF-8.  Other new features include the ability to
 		insert UTF-8 characters using verbatim input; the
 		ability to delete all text from the cursor position to
 		the end of the file via ^W^X as (patched) Pico does;
@@ -51,8 +377,8 @@
 		and replacing all text in a file now properly updates
 		the screen in all cases.  New features include sample
 		regexes for patch files, improvements to the sample
-		regexes for C files, and support for strings 
-		greater than 1023 characters and/or containing nulls in
+		regexes for C files, and support for strings greater
+		than 1023 characters and/or containing nulls in
 		.nano_history.  Additionally, the full justify keystroke
 		has been changed to match current Pico, and whitespace
 		display mode is now turned off by default.  Enjoy.
@@ -126,7 +452,7 @@
 		broken regex detection, search history recall, and
 		keypad handling with -K.  Debugging strings are no
 		longer translated and comments denote where translations
-		should be as short as possible (i.e, the statusbar).
+		should be as short as possible (i.e. the statusbar).
 		There are new examples for syntax highlighting, and
 		documentation updates and fixes.  The 1.3.0 CVS tree
 		will be opening soon for all your nano desires, so stay
@@ -211,7 +537,7 @@
 		direct to the development list (nano-devel@gnu.org).
 
 10/24/2002 - GNU nano 1.1.12 "Make Jordi happy" is released.  This
-		release demonstrated that nano is starting to freeze for
+		release demonstrates that nano is starting to freeze for
 		version 1.2.  New features include a Meta-Y toggle for
 		syntax highlighting, pluralized i18n, and a handler for
 		SIGTERM.  Nano now ignores XOFF (^S) to stop accidental
@@ -259,7 +585,7 @@
 		mode (^O,M-P), a new "syntax" command in the .nanorc to
 		allow multiple syntax highlighting types, and a new -Y,
 		--syntax flag to set a specific one if there's no
-		filename regex to match it against (i.e, w/mutt).  The
+		filename regex to match it against (i.e. w/mutt).  The
 		^space and M-space keys will now show up in the help
 		menu, which itself has been tweaked a bit, and many more
 		configure options should now cooperate (like the odd
@@ -289,7 +615,7 @@
 		shows column as well as character position, and
 		multibuffer allows duplicate files, even unnamed ones.
 		Also, the static shortcut and toggle lengths are
-		history, nano now reads $SYSCONFDIR/nanorc if rc file
+		history, nano now reads SYSCONFDIR/nanorc if rc file
 		support is enabled, and nano is now built with (and
 		requires for rebuilding) autoconf 2.5.
 			This release also includes fixes for some memory
@@ -399,6 +725,27 @@
 		introduce lots of bugs ;-)  Have fun with it, but be
 		careful, unstable means unstable.
 
+07/01/2001 - GNU nano 1.0.3 is the "mutt" release.  This release
+		features oodles of bug fixes with cutting text,
+		especially with the -k (cut to end) option.  There is
+		also a new suspend handler which should make nano play
+		better with mutt (the code for which came from mutt
+		itself; many many thanks to Jordi Mallach and Tom Lear
+		for working late into the night fixing this).  Nano now
+		also features mutt's case insensitive string compare
+		function for more speed and less memory usage.  Two new
+		translations are included, Ukrainian and Russian.
+	
+05/12/2001 - GNU nano 1.0.2 is the "just the bugfixes ma'am" release.
+		The most noticeable fixes are for display errors using
+		page up/down with the marker code, and view mode (-v)
+		not stopping the replace function.  Other fixes include
+		being able to use the arrow keys while holding down the
+		ctrl key in certain TERMs, and there are many
+		documentation updates and spelling tweaks.  We also have
+		a new Galician translation (provided by Jacobo Tarrío).
+		Have fun with it!
+
 04/06/2001 - GNU nano 1.0.1 is out there.  The only new feature is a
 		configure option for those who want to disable all word
 		wrapping from nano, --disable-wrapping.  Bug fixes this
@@ -439,7 +786,7 @@
 		resizing the editor in any mode other than normal edit
 		mode.  Other fixes include some more tab completion
 		segfaults, and an silly segfault that occurred when
-		successfully writing a file on the 2nd try (i.e, after
+		successfully writing a file on the 2nd try (i.e. after
 		an initial write error).  Slowly but surely, on toward
 		1.0 we travel.
 
@@ -627,7 +974,7 @@
 
 05/14/2000 - Nano 0.9.7 (the Mother's Day release) continues in the long
 		line of display fixes, and also fixes the broken symlink
-		behavior (i.e, symlinks weren't being followed by
+		behavior (i.e. symlinks weren't being followed by
 		default).  Hopefully all major bugs can be worked out
 		soon and we can have a 1.0 release before the end of the
 		year, but who knows.
@@ -680,7 +1027,7 @@
 04/14/2000 - 0.9.1 has some more Pico compatibility built-in.  The
 		option to switch to/from Search and Search/Replace (^T)
 		is now available, and nano now displays the more
-		Pico-like shortcut list when invoked as 'pico' (i.e, if
+		Pico-like shortcut list when invoked as 'pico' (i.e. if
 		'pico' is a symlink to nano).  There is an important
 		change to the handling of symbolic links as well.  Now,
 		nano does the "correct" thing and automatically writes

README

@@ -9,17 +9,17 @@ Overview
      First and foremost is its license: the Pine suite does not use the
      GPL or a GPL-friendly license, and has unclear restrictions on
      redistribution.  Because of this, Pine and Pico are not included
-     with many GNU/Linux distributions.  Also, other features (like goto
-     line number or search and replace) were unavailable until recently
-     or require a command line flag.  Yuck.
+     with many GNU/Linux distributions.  Also, other features (like go
+     to line number or search and replace) were unavailable until
+     recently or require a command line flag.  Yuck.
 
      nano aims to solve these problems by emulating the functionality of
      Pico as closely as possible while addressing the problems above and
      perhaps providing other extra functionality.
 
      The nano editor is now an official GNU package.  For more
-     information on GNU and the Free Software Foundation please see
-     http://www.gnu.org.
+     information on GNU and the Free Software Foundation, please see
+     http://www.gnu.org/.
 
 How to compile and install nano
 
@@ -32,6 +32,11 @@ How to compile and install nano
 
      It's that simple.  Use --prefix with configure to override the
      default installation directory of /usr/local.
+     
+     If you configured with the "--enable-nanorc" option, after
+     installation you might copy the doc/nanorc.sample to your home
+     directory, rename it to ".nanorc", and then edit it according to
+     your taste.
 
 Web Page
 
@@ -60,10 +65,8 @@ Mailing List and Bug Reports
 
 Current Status
 
-	GNU nano has reached its second stable milestone, 1.2.x.
-	Development of new features continues in the 1.3.x branch, while
-	1.2.x versions are dedicated to bug-fixing and polishing.
-
-   Chris Allegretta (chrisa@asty.org)
+	GNU nano has reached its third stable milestone, 2.0.x.
+	Development of new features continues in the 2.1.x branch, while
+	2.0.x versions are dedicated to bug-fixing and polishing.
 
 $Id$

README.CVS

@@ -1,46 +0,0 @@
-INSTRUCTIONS TO COMPILE AND INSTALL NANO CVS VERSIONS
------------------------------------------------------
-
-GNU nano is available from CVS, but building this needs a bit more care
-than the official stable and unstable tarballs.
-
-To successfully compile GNU nano from CVS, you'll need the following
-packages:
-
-- autoconf (version >= 2.54)
-- automake (version >= 1.7)
-- gettext (version >= 0.11.5)
-- groff
-- texinfo
-- cvs
-- ssh (with support for the SSH version 2 protocol)
-- glib 2.x (if your system doesn't have snprintf() and/or vsnprintf())
-- make, gcc and the normal development libraries (curses or slang, etc.)
-
-These should be available on your GNU mirror.  Note that you'll need a
-version of curses or slang with wide character support if you want nano
-to use UTF-8.
-
-First, you need to set up cvs to download the CVS tree using ssh.  If
-you're using a Bourne shell (e.g. bash or sh), do
-$ export CVS_RSH=ssh
-If you're using a C shell (e.g. tcsh or csh), do
-$ setenv CVS_RSH ssh
-
-After it's set up, use the following command to download the CVS tree:
-$ cvs -z3 -d:ext:anoncvs@savannah.gnu.org:/cvsroot/nano checkout nano
-
-If you want to download the stable CVS branch, add "-r nano_1_0_branch":
-$ cvs -z3 -d:ext:anoncvs@savannah.gnu.org:/cvsroot/nano checkout -r nano_1_0_branch nano
-
-Once you have the sources in the "nano" directory, cd into it, and
-execute the "autogen.sh" script in the top directory.  This will set up
-a configure script and Makefile.in, and you will be ready to compile
-with
-$ ./configure [--add-options-here] && make
-
-Once it's done compiling,
-$ make install
-(as root) should put the required files in their respective directories.
-
-Please submit any bugs in the CVS branch to nano-devel@gnu.org.

README.SVN

@@ -0,0 +1,87 @@
+INSTRUCTIONS TO COMPILE AND INSTALL NANO CVS VERSIONS
+=====================================================
+
+GNU nano is available from SVN, but building this needs a bit more care
+than the official stable and unstable tarballs.
+
+
+Prerequisites
+-------------
+
+To successfully compile GNU nano from CVS, you'll need the following
+packages:
+
+- autoconf (version >= 2.54)
+- automake (version >= 1.7)
+- gettext  (version >= 0.11.5)
+- groff    (version >= 1.12)
+- texinfo  (version >= 4.0)
+- subversion (aka svn)
+- ssh (with support for the SSH version 2 protocol)
+- glib 2.x (if your system doesn't have vsnprintf(), which the configure
+  script will check for)
+- make, gcc and the normal development libraries (curses or slang, etc.)
+
+These should be available on your GNU mirror.  Note that you'll need a
+version of curses or slang with wide character support if you want nano
+to use UTF-8.
+
+
+Download the source
+-------------------
+
+To obtain the current nano development code (called 'trunk'), use the 
+following command.  It will create a copy of the files in a subdirectory 
+of your current working directory called 'nano':
+
+    $ svn co svn://svn.savannah.gnu.org/nano/trunk/nano
+
+If you want to download the stable SVN branch instead, use:
+
+    $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano
+
+
+Generate the configure script
+-----------------------------
+
+Once you have the sources in the "nano" directory,
+
+    $ cd nano
+    $ ./autogen.sh
+
+This will set up a configure script and a Makefile.in file.
+
+
+Configure your build
+--------------------
+
+To configure your build, run the configure script from the nano source
+directory:
+
+    $ ./configure [--add-options-here]
+
+
+Build and install
+-----------------
+
+From the nano source directory, build the code with:
+
+    $ make
+
+Then, once it's done compiling, run
+
+    $ make install
+
+which should copy various files (i.e. the nano executable, the info and
+man pages, and syntax highlighting pattern files) to their appropriate
+directories.
+
+If you're installing into the default install directory (/usr/local),
+you'll need to run that "make install" command with root privileges.
+
+
+Problems?
+---------
+
+Please submit any bugs in the SVN branch using the Savannah project's 
+bug tracker (https://savannah.gnu.org/bugs/?group=nano)

THANKS

@@ -1,48 +1,54 @@
 The following people have helped GNU nano in some way or another.
 If we missed you here, let us know!
 
+
 Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>
 						Malay translator
 Laurentiu Buzdugan <buzdugan@voyager.net>	Romanian translator
 CHAO Wei-Lun <chaoweilun@pcmail.com.tw>		Traditional Chinese translator
-Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
+Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
 Marco Colombo <magicdice@inwind.it>		Italian translator
+Yavor Doganov <yavor@doganov.org>		Bulgarian translator
 Karl Eichwalder <keichwa@gmx.net>		German translator
 Doruk Fisek <dfisek@fisek.com.tr>		Turkish translator
-Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
+Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
 						French translator
-Geir Helland					Norwegian bokmål translator
+Geir Helland					Norwegian bokmål translator
 Tedi Heriyanto <tedi_h@gmx.net>			Indonesian translator
-Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
+Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 						Hungarian translator
 Kalle Kivimaa <kalle.kivimaa@iki.fi>		Finnish Translator
-Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
-Florian König <floki@bigfoot.com>		German translator
+Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
+Florian König <floki@bigfoot.com>		German translator
 Wojciech Kotwica <wkotwica@post.pl>		Polish translator
 Clement Laforet <clem_laf@wanadoo.fr>		French translator
 Gergely Nagy <algernon@debian.org>		Hungarian translator
 Kalle Olavi Niemitalo <kon@iki.fi>		Finnish Translator
 Claudio Neves <cneves@nextis.com>		Brazilian Portuguese translator
+Daniel Nylander <po@danielnylander.se>		Swedish Translator
 Michael Piefel <piefel@informatik.hu-berlin.de> German translator
 Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian translator
 Michel Robitaille <robitail@IRO.UMontreal.CA>	French translator
 Christian Rose <menthos@menthos.com>		Swedish translator
-Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
+Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
+Benno Schulenberg <benno@nietvergeten.nl>	Dutch translator
 Danilo Segan <dsegan@gmx.net>			Serbian translator
 Keld Simonsen <keld@dkuug.dk>			Danish translator
 Guus Sliepen <guus@nl.linux.org>		Dutch translator
 Cezary Sliwa <sliwa@cft.edu.pl>			Polish translator
 Pierre Tane <tanep@bigfoot.com>			French translator
-Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
+Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
 Kjetil Torgrim Homme <kjetilho@linpro.no>	Norwegian nynorsk translator
 Miquel Vidal <miquel@sindominio.net>		Catalan translator
+Phan Vinh Thinh <teppi82@gmail.com>		Vietnamese translator
 Pauli Virtanen <pauli.virtanen@saunalahti.fi>	Finnish translator
 Peio Ziarsolo <peio@sindominio.net>		Basque translator
 
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
 Sven Guckes <guckes@math.fu-berlin.de>		Advice and Advocacy
+Thijs Kinkhorst <thijs@kinkhorst.com>		rnano.1 manpage
 Jim Knoble <jmknoble@pobox.com>			Pico compat for browser
 Ryan Krebs <fluffy@highwire.stanford.edu>	Many bug fixes and testing
 Roy Lanek <lanek@ranahminang.net>		Advice and advocacy
@@ -53,5 +59,4 @@ Jeremy Robichaud <robicj@yahoo.com>		Beta tester
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ken Tyler <kent@werple.net.au>			Search fixes and more
 
-
 $Id$

TODO

@@ -1,14 +1,53 @@
 TODO file (? means the feature may be implemented, but not definitely)
------------------------------------------------------------------------------
+------------------------------------------------------------------------
 
-For version 1.4:
-- UTF-8 support. [DONE except for the NO_CONVERT flag, which should
-  allow editing UTF-8 as raw bytes.]
+For the next version:
+- Undo/Redo keys (M-U and M-E)?
+- Rebindable keys?
+- FriBidi support?
+- Port to DJGPP?
+- Make matching bracket searches sophisticated enough to skip over
+  brackets inside comments?
+- Allow indentation of marked text by spaces as well as tabs?
+- Allow indentation to add just enough columns to reach the nearest
+  multiple of tabsize, rather than always adding tabsize columns?
+- Allow piping marked text to an external command and replacing it with
+  the command's output (as the internal spell checker already does with
+  the "spell" command)?
+- Rewrite the nano FAQ in SGML.
+- Allow conversion between different character sets.  Maybe use glib's
+  iconv() if the system's iconv() is inadequate, since we already use
+  glib's vsnprintf() if the system lacks vsnprintf()?
+- Handle window resizes better.  After we resize, we should stay
+  wherever we were before we resized, as Pico does.
+- Fix problems with color syntaxes' highlighting lines too aggressively.
+- Allow color syntaxes to apply to more than just color, so that we can
+  e.g. specify a different alternate spell checker depending on which
+  file type we have open.
+- Allow color syntaxes to be selected based on more than just filename
+  extension, e.g. through libmagic?
+- Allow text searches in the help browser.
+- Allow setting marks (saved positions, not to be confused with the mark
+  set via Ctrl-^) at various lines and/or columns in the buffer, and
+  allow movement between them with a single keystroke.
+- Add the ability to move to different lines of the screen with a single
+  keystroke, e.g. M-` (M-~) to go to the top line, M-& (M-7) to go to
+  the center line, and M-' (M-") to go to the last line.
+- Allow searching for and replacing newlines.
+- Allow soft wrapping as well as hard wrapping?
+- Detect when we're pasting text, so that we can handle it differently
+  from normal typing?
+- Make pasting text work as fast as it does in Pico.
+- Fix handling of bad/incomplete UTF-8 sequences to display one Unicode
+  FFFD (Replacement Character) per sequence instead of one per byte.
+
+Old requests:
+
+For version 2.0:
+- UTF-8 support. [DONE]
 - Support for paragraph searches. [DONE]
 - Support for justifying the entire file at once. [DONE]
-- Support for filename searches in the file browser.
-- Undo/Redo key?
-- Rebindable keys?
+- Support for filename searches in the file browser. [DONE]
 - Keystroke to implement "Add next sequence as raw" like vi's ^V. [DONE]
 - Spell check selected text only. [DONE]
 - Make "To Line" (^W^T) and "Read from Command" (^R^X) reenter their
@@ -16,9 +55,6 @@ For version 1.4:
   (^R^X^X) (requires figuring out when to keep cursor position and when
   not to). [DONE]
 - Fix resetstatuspos global which we shouldn't have. [DONE]
-- Rewrite the nano FAQ in SGML.
-
-Old requests:
 
 For version 1.2:
 - Single line scroll up/down? [DONE]

UPGRADE

@@ -1,6 +1,73 @@
 GNU nano upgrading information
 ==============================
 
+Visible changes since 1.2
+-------------------------
+* Editor Features
+  - Support for UTF-8.
+  - Moving to a specified line and column of a file, instead of just a
+    line (+LINE,COLUMN).
+  - Smart home key (-A).
+  - Creation of unique backup files in a specified directory (-C <dir>).
+  - Insertion of spaces instead of a tab when Tab is pressed (-E).
+  - The long option for -K is now --rebindkeypad.
+  - Regular expression searching can now be toggled when nano is built
+    with --enable-tiny, so -R now means something else (see below).
+  - Restricted mode that provides more security than -o (-R).
+  - Blanking of the statusbar after 1 keystroke instead of 25 (-U).
+  - Word searches can optionally skip over punctuation (-W).
+  - Workaround for Delete's acting like Backspace (-d).
+  - Many more options are supported in the nanorc.
+  - Improvements to color syntax highlighting support: case insensitive
+    matching, the ability to include color syntaxes in separate files,
+    the ability to specify background colors without foreground colors,
+    etc.
+  - Insertion of single-byte characters via Esc Esc <000-255>.
+  - Insertion of all characters via "Verbatim Input" mode.
+  - Workaround for the "NumLock glitch".
+  - Meta-W now repeats the last search.  Wrapping is now toggled via
+    Meta-L.
+  - Replacing and spell checking only selected text.
+  - Indenting lines with one keystroke.
+  - Copying text into the cutbuffer without cutting it.
+  - Scrolling the text up and down single lines without moving the
+    cursor.
+  - PageUp and PageDown work more smoothly when using -S.
+  - Scrolling the help text up and down single lines.
+  - Cutting all text from the current position to the end of the file
+    with one keystroke.
+  - Justifying the entire file with one keystroke.
+  - Justifying without removing spaces from the ends of lines.
+  - Unjustifying after justifying and immediately resizing.
+  - Going to the first or last line of the current paragraph.
+  - Going to the first or last line of the file without having to go to
+    the "Search" prompt.
+  - Searching for filenames in the file browser.
+  - Displaying spaces and tabs differently to make it easier to tell
+    them apart.
+  - Many more functions available at the statusbar prompt: moving to the
+    next or previous word, searching for matching brackets, "Verbatim
+    Input" mode, etc.
+  - The glibc 2.2.3 crashes involving extended regular expressions are
+    no longer worked around, as they can break anything using extended
+    regular expressions, and glibc 2.2.3 is old.  You should upgrade to
+    at least glibc 2.2.4.
+
+* File Handling
+  - Automatic adding of newlines to the ends of files without them can
+    now be disabled (-L).
+  - Converting from and to DOS/Mac file format is now toggled only at
+    the "Write File" prompt, via Meta-D and Meta-M, and the default file
+    format to save in is now set depending on what format the file was
+    originally in.  -D now makes nano use bold text instead of reverse
+    video text, and Meta-D at the edit window now does a
+    word/line/character count.  -O now makes the unused second line of
+    the screen part of the edit window, and Meta-O at the edit window
+    now toggles this behavior.
+  - Converting files that contain a mix of DOS and Mac format lines.
+  - Automatic switching on of -N with binary files has been removed, as
+    it causes problems with UTF-8 support.
+
 Visible changes since 1.0
 -------------------------
 * Editor Features
@@ -8,10 +75,10 @@ Visible changes since 1.0
     something else, see below).
   - nanorc support (see nanorc.sample included in sources).
   - Smooth scrolling (-S).
-  - Searching of matching brace/bracket/etc.
+  - Support for searching for matching braces, brackets, etc.
   - Help for all editor features.
   - Color syntax highlighting support.
-  - Quote string support, useful for mail agents, etc (-Q).
+  - Quote string support, useful for mail agents, etc. (-Q).
   - Insertion of output of external commands.
   - Optional enabling of XON and XOFF control characters (-p).
   - Tons of bugfixes/enhancements for already existing features.

configure.ac

@@ -1,25 +1,26 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Free Software Foundation, Inc.
 #
-# GNU nano is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# GNU nano is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 3, or (at your option) any
+# later version.
 #
-# GNU nano is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU nano is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU nano; if not, write to the Free Software
-# Foundation, Inc.
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 #
 # $Id$
 
-AC_INIT([GNU nano], [1.3.6], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.8], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE
@@ -28,6 +29,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_PREREQ(2.54)
 
 dnl Checks for programs.
+
 AC_GNU_SOURCE
 AC_PROG_CC
 AC_PROG_LN_S
@@ -35,158 +37,202 @@ AC_ISC_POSIX
 AC_SYS_LARGEFILE
 
 dnl Internationalization macros.
+
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external], [need-ngettext])
+AM_CONDITIONAL(USE_NLS, test x$USE_NLS = xyes)
+
+dnl Data location.
+
+pkgdatadir=${datadir}/${PACKAGE}
+AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
+
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h getopt.h libintl.h limits.h regex.h termios.h wchar.h wctype.h)
-AC_CHECK_HEADER(regex.h,
-    AC_MSG_CHECKING([for broken regexec])
-    AC_TRY_RUN([
-#include <sys/types.h>
-#include <regex.h>
-int main(void)
-{
-    regex_t reg;
-    size_t n = 1;
-    regmatch_t r;
-    regcomp(&reg, "\\<", 0);
-    regexec(&reg, "", n, &r, 0);
-    regfree(&reg);
-    return 0;
-}],
-	AC_MSG_RESULT(no),
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(BROKEN_REGEXEC, 1, [Define this if your regexec() function segfaults when passed an empty string under certain conditions.]),
-	AC_MSG_RESULT([cross-compiling; assuming no])))
+AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h)
 
-dnl options
-AC_ARG_ENABLE(debug, 
+dnl Checks for options.
+
+AC_ARG_ENABLE(debug,
 [  --enable-debug          Enable debugging (disabled by default)],
- [if test x$enableval = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable nano debug messages and assert warnings.])
-    debug_support=yes
- fi])
-
-if test "$debug_support" != "yes"; then
-    AC_DEFINE(NDEBUG, 1, [Shut up the assert warnings :-)])
-fi
-
-AC_ARG_ENABLE(extra,
-[  --enable-extra          Enable extra (optional) functions, including easter eggs],
 [if test x$enableval = xyes; then
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
- fi])
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes
+fi])
+
+if test x$debug_support != xyes; then
+    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
+fi
 
 AC_ARG_ENABLE(tiny,
 [  --enable-tiny           Disable features for the sake of size],
 [if test x$enableval = xyes; then
-    AC_DEFINE(NANO_SMALL, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.]) 
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help menu.]) 
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.]) 
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).]) 
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.]) 
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
- fi])
+    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi])
+
+
+AC_ARG_ENABLE(extra,
+[  --disable-extra          Disable extra features, currently only easter eggs],
+[if test x$enableval != xno; then
+    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
+    fi])
 
 AC_ARG_ENABLE(browser,
-[  --disable-browser       Disable mini file browser],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in (crappy) file browser.])
- fi])
+[  --disable-browser       Disable built-in file browser],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+fi])
 
 AC_ARG_ENABLE(help,
-[  --disable-help          Disable help function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help menu.])
- fi])
+[  --disable-help          Disable help functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+fi])
 
 AC_ARG_ENABLE(justify,
-[  --disable-justify       Disable justify/unjustify function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.]) 
- fi])
+[  --disable-justify       Disable justify/unjustify functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+fi])
 
 AC_ARG_ENABLE(mouse,
 [  --disable-mouse         Disable mouse support (and -m flag)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+fi])
 
 AC_ARG_ENABLE(operatingdir,
 [  --disable-operatingdir  Disable setting of operating directory (chroot of sorts)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+fi])
 
 AC_ARG_ENABLE(speller,
-[  --disable-speller       Disable spell checker function],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the use(full|less) spelling functions.])
- fi])
+[  --disable-speller       Disable spell checker functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+fi])
 
 AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disable tab completion code for a smaller binary],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!]) 
- fi])
+[  --disable-tabcomp       Disable tab completion functions],
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
+fi])
 
 AC_ARG_ENABLE(wrapping,
 [  --disable-wrapping      Disable all wrapping of text (and -w flag)],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi])
 
 AC_ARG_ENABLE(wrapping-as-root,
 [  --disable-wrapping-as-root  Disable wrapping of text as root by default],
- [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
- fi])
+[if test x$enableval != xyes; then
+    AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
+fi])
 
 AC_ARG_ENABLE(color,
-[  --enable-color          Enable color and syntax highlighting],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
-    AC_MSG_WARN([
-***********************************************************************
-*** WARNING: Color support is far from perfect, but functional.     ***
-*** Be careful with syntax in your .nanorc or nano may malfunction. ***
-***********************************************************************
+[  --disable-color          Disable color and syntax highlighting],
+[if test x$enableval != xno; then
+    if test x$ac_cv_header_regex_h = xyes; then
+	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
+    else
+	AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
+    fi
+fi], [
+    if test x$enable_tiny != xyes; then
+	if test x$ac_cv_header_regex_h = xyes; then
+	    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+	    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes	
+	else
+	    AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to use color
+*** support this header file is required.  Please either install C
+*** libraries that include the regex.h file or call the configure
+*** script with --disable-color.])
+	fi
+    fi
 ])
-fi])
 
 AC_ARG_ENABLE(multibuffer,
-[  --enable-multibuffer    Enable multiple file buffers],
-[if test x$enableval = xyes; then
+[  --disable-multibuffer    Disable multiple file buffers],
+[if test x$enableval != xno; then
     AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
- fi])
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
+    fi])
 
 AC_ARG_ENABLE(nanorc,
-[  --enable-nanorc         Enable use of .nanorc file],
-[if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
- fi])
+[  --disable-nanorc         Disable use of .nanorc files],
+[if test x$enableval != xno; then
+    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+fi], 
+    [if test x$enable_tiny != xyes; then
+        AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
+    fi])
 
 AC_ARG_ENABLE(all,
-[  --enable-all            Enable ALL extra nano functionality (kitchen sink option)],
+[  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
 [if test x$enableval = xyes; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use the .nanorc file.]) nanorc_support=yes
-    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires ENABLE_NANORC too!]) color_support=yes
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes
-    AC_MSG_WARN([
-***********************************************************************
-*** WARNING: Color support is far from perfect, but functional.     ***
-*** Be careful with syntax in your .nanorc or nano may malfunction. ***
-***********************************************************************
-])
+    echo "--enable-all option no longer needed, ignoring for compatiblity"
 fi])
 
+if test x$color_support = xyes; then
+	# now check for the end of word boundary support (/< and />)
+	AC_MSG_CHECKING([for GNU-style word boundary regex support])
+	AC_TRY_RUN([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <regex.h>
+int main(void)
+{
+    regex_t r;
+    size_t nmatch;
+    regmatch_t pmatch;
+
+    if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB))
+        return 1;
+    if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
+        return 1;
+    return 0;
+}],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+	AC_MSG_RESULT(no),
+        AC_MSG_WARN([*** Can't check for gnu word boundary support when cross-compiling])
+)
+fi
+
+
+AC_MSG_CHECKING([whether to enable UTF-8 support])
+AC_ARG_ENABLE(utf8,
+[  --enable-utf8           Enable UTF-8 support],
+[if test x$enableval = xyes; then
+    enable_utf8=yes
+else
+    enable_utf8=no
+fi],
+[enable_utf8=auto])
+AC_MSG_RESULT($enable_utf8)
+
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
@@ -198,119 +244,146 @@ AC_ARG_WITH(slang,
     *)
 	AC_MSG_RESULT(yes)
 
-	if test "$with_slang" != "yes"; then
+	if test x$with_slang != xyes; then
 	    # Add additional search path
 	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
 	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 	fi
 
-	AC_CHECK_HEADER(slcurses.h,
-	    AC_MSG_CHECKING([for SLutf8_enable in -lslang])
-	    _libs=$LIBS
-	    LIBS="$LIBS -lslang"
-	    AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-    SLutf8_enable(TRUE);
-    return 0;
-}],
-		[AC_MSG_RESULT(yes)
-		AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		slang_support=yes
-		CURSES_LIB_WIDE=yes
-		if test "$with_slang" != "yes"; then
-		    CURSES_LIB="-L${with_slang}/lib -lslang"
-		else
-		    CURSES_LIB="-lslang"
-		fi
-		CURSES_LIB_NAME=slang],
-		[AC_MSG_RESULT(no)
-		AC_MSG_CHECKING([for SLtt_initialize in -lslang])
+	if test x$enable_utf8 != xno; then
+	    AC_CHECK_HEADER(slcurses.h,
+		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
+		_libs=$LIBS
+		LIBS="$LIBS -lslang"
 		AC_TRY_RUN([
 #include <slcurses.h>
 int main(void)
 {
-    SLtt_initialize(NULL);
-    return 0;
-}],
-		[AC_MSG_RESULT(yes)
-		AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		slang_support=yes
-		if test "$with_slang" != "yes"; then
-		    CURSES_LIB="-L${with_slang}/lib -lslang"
-		else
-		    CURSES_LIB="-lslang"
-		fi
-		CURSES_LIB_NAME=slang],
-		[AC_MSG_RESULT(no)
-
-		# We might need the term library
-		for termlib in ncurses curses termcap terminfo termlib; do
-		    AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
-		    test -n "$tcap" && break
-		done
-
-		AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap])
-		LIBS="$LIBS $tcap"
-		AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-    SLutf8_enable(TRUE);
+    SLutf8_enable(1);
     return 0;
 }],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		    slang_support=yes
+		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
 		    CURSES_LIB_WIDE=yes
-		    if test "$with_slang" != "yes"; then
-			CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
+		    if test x$with_slang != xyes; then
+			CURSES_LIB="-L${with_slang}/lib -lslang"
 		    else
-			CURSES_LIB="-lslang $tcap"
-		    fi
-		    CURSES_LIB_NAME=slang],
-		    [AC_MSG_RESULT(no)
-		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
-		    AC_TRY_RUN([
-#include <slcurses.h>
-int main(void)
-{
-    SLtt_initialize(NULL);
-    return 0;
-}],
-		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-		    slang_support=yes
-		    if test "$with_slang" != "yes"; then
-			CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
-		    else
-			CURSES_LIB="-lslang $tcap"
+			CURSES_LIB="-lslang"
 		    fi
 		    CURSES_LIB_NAME=slang],
 		    [AC_MSG_RESULT(no)
 
-		    # We might need the math library
-		    AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
-		    LIBS="$LIBS -lm"
+		    # We might need the term library
+		    for termlib in ncurses curses termcap terminfo termlib; do
+			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
+			test -n "$tcap" && break
+		    done
+
+		    AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap])
+		    LIBS="$LIBS $tcap"
 		    AC_TRY_RUN([
 #include <slcurses.h>
 int main(void)
 {
-    SLutf8_enable(TRUE);
+    SLutf8_enable(1);
     return 0;
 }],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-			slang_support=yes
+			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
 			CURSES_LIB_WIDE=yes
-			if test "$with_slang" != "yes"; then
-			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			if test x$with_slang != xyes; then
+			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
 			else
-			    CURSES_LIB="-lslang $tcap -lm"
+			    CURSES_LIB="-lslang $tcap"
 			fi
 			CURSES_LIB_NAME=slang],
+			[AC_MSG_RESULT(no)
+
+			# We might need the math library
+			AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
+			LIBS="$LIBS -lm"
+			AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLutf8_enable(1);
+    return 0;
+}],
+			    [AC_MSG_RESULT(yes)
+			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    CURSES_LIB_WIDE=yes
+			    if test x$with_slang != xyes; then
+				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			    else
+				CURSES_LIB="-lslang $tcap -lm"
+			    fi
+			    CURSES_LIB_NAME=slang],
+			    [AC_MSG_RESULT(no)],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling])),
+	    AC_MSG_ERROR([
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
+*** install a version of slang that includes the slcurses.h file or
+*** do not call the configure script with --with-slang.]))
+	fi
+
+	if eval "test x$CURSES_LIB_NAME = x"; then
+	    # Reset libs if the above slang tests failed
+	    if test x$enable_utf8 != xno; then
+		LIBS=$_libs
+	    fi
+
+	    AC_CHECK_HEADER(slcurses.h,
+		AC_MSG_CHECKING([for SLtt_initialize in -lslang])
+		_libs=$LIBS
+		LIBS="$LIBS -lslang"
+		AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
+		    [AC_MSG_RESULT(yes)
+		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    if test x$with_slang != xyes; then
+			CURSES_LIB="-L${with_slang}/lib -lslang"
+		    else
+			CURSES_LIB="-lslang"
+		    fi
+		    CURSES_LIB_NAME=slang],
+		    [AC_MSG_RESULT(no)
+
+		    # We might need the term library
+		    for termlib in ncurses curses termcap terminfo termlib; do
+			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
+			test -n "$tcap" && break
+		    done
+
+		    AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap])
+		    LIBS="$LIBS $tcap"
+		    AC_TRY_RUN([
+#include <slcurses.h>
+int main(void)
+{
+    SLtt_initialize(NULL);
+    return 0;
+}],
+			[AC_MSG_RESULT(yes)
+			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			if test x$with_slang != xyes; then
+			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
+			else
+			    CURSES_LIB="-lslang $tcap"
+			fi
+			CURSES_LIB_NAME=slang],
+			[AC_MSG_RESULT(no)
+
+			# We might need the math library
 			AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
+			LIBS="$LIBS -lm"
 			AC_TRY_RUN([
 #include <slcurses.h>
 int main(void)
@@ -318,47 +391,71 @@ int main(void)
     SLtt_initialize(NULL);
     return 0;
 }],
-			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.])
-			slang_support=yes
-			if test "$with_slang" != "yes"; then
-			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
-			else
-			    CURSES_LIB="-lslang $tcap -lm"
-			fi
-			CURSES_LIB_NAME=slang],
-			[AC_MSG_RESULT(no)],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
-AC_MSG_WARN([*** Can not use slang when cross-compiling])),
-AC_MSG_WARN([*** Can not use slang when cross-compiling])),
+			    [AC_MSG_RESULT(yes)
+			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    if test x$with_slang != xyes; then
+				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
+			    else
+				CURSES_LIB="-lslang $tcap -lm"
+			    fi
+			    CURSES_LIB_NAME=slang],
+			    [AC_MSG_RESULT(no)],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling]))],
+    AC_MSG_WARN([*** Can not use slang when cross-compiling])),
 	    AC_MSG_ERROR([
-*** The header file slcurses.h was not found. If you wish to use
-*** slang support this header file is required. Please either
+*** The header file slcurses.h was not found.  If you wish to use
+*** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang
-]))
+*** do not call the configure script with --with-slang.]))
+	fi
 
-	test "${_libs+set}" = "set" && LIBS=$_libs
+	if test "${_libs+set}" = "set"; then
+	    LIBS=$_libs
+	fi
 
-	if test "$with_slang" != "yes"; then
+	if test x$with_slang != xyes; then
 	    LDFLAGS=${_ldflags}
 	fi
 	;;
     esac], [AC_MSG_RESULT(no)])
 
-dnl Checks for functions
-AC_CHECK_FUNCS(snprintf vsnprintf isblank iswalnum iswblank iswspace strcasecmp strncasecmp strcasestr strnlen getline getdelim mblen mbtowc wctomb wcwidth)
-if test "x$ac_cv_func_snprintf" = "xno" -o "x$ac_cv_func_vsnprintf" = "xno"
-then
-	AM_PATH_GLIB_2_0(2.0.0,,
-	    AC_MSG_ERROR([
-*** snprintf() and/or vsnprintf() not found.  GLIB 2.x not found either.
-*** You need both snprintf() and vsnprintf().  Alternatively you can
-*** install the GLIB library which can be found at ftp://ftp.gtk.org/.]),
-	    glib)
+if test x$CURSES_LIB_NAME = xslang; then
+    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
+    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+fi
+
+AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
+AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
+
+AC_ARG_ENABLE(altrcname,
+[  --enable-altrcname          Specify alternate rcfile name (default: .nanorc)],
+[if test x$enableval != no; then
+    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify alternate rcfile name (default: .nanorc)]) rcfilename=$enableval
+fi])
+
+dnl Checks for functions.
+
+AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
+
+if test x$enable_utf8 != xno; then
+    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
+fi
+
+if test x$ac_cv_func_vsnprintf = xno; then
+    AM_PATH_GLIB_2_0(2.0.0,,
+	AC_MSG_ERROR([
+*** vsnprintf() not found.  GLIB 2.x not found either.  You should
+*** install the GLIB 2.x library which can be found at
+*** ftp://ftp.gtk.org/.]),
+	glib)
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -369,28 +466,32 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getopt_long)
 
 dnl Checks for libraries.
-if eval "test x$CURSES_LIB_NAME = x"
-then
+
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(ncurses.h)
-    AC_CHECK_LIB(ncursesw, wget_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE="yes"])
-    if eval "test x$CURSES_LIB_NAME = x"
-    then
-	 AC_CHECK_LIB(ncurses, initscr, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses])
+
+    if test x$enable_utf8 != xno; then
+	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+    fi
+
+    if eval "test x$CURSES_LIB_NAME = x"; then
+	AC_CHECK_LIB(ncurses, initscr, [CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses])
     fi
 fi
 
-if eval "test x$CURSES_LIB_NAME = x"
-then
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(curses.h)
-    AC_CHECK_LIB(curses, wget_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE="yes"])
-    if eval "test x$CURSES_LIB_NAME = x"
-    then
+
+    if test x$enable_utf8 != xno; then
+	AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
+    fi
+
+    if eval "test x$CURSES_LIB_NAME = x"; then
 	 AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
     fi
 fi
 
-if eval "test x$CURSES_LIB_NAME = x"
-then
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_MSG_WARN([
 *** No curses lib available.  Consider getting the official ncurses
 *** distribution from ftp://ftp.gnu.org/pub/gnu/ncurses if you get
@@ -399,7 +500,7 @@ else
     AC_MSG_RESULT([Using $CURSES_LIB_NAME as the curses library])
 fi
 
-AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors command.]))
+AC_CHECK_LIB([$CURSES_LIB_NAME], use_default_colors, AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.]))
 
 dnl Parse any configure options.
 
@@ -407,27 +508,50 @@ LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
-if test "x$GLIB_CFLAGS" != "x"
-then
-	CFLAGS="$CFLAGS $GLIB_CFLAGS"
+if test "x$GLIB_CFLAGS" != "x"; then
+    CFLAGS="$CFLAGS $GLIB_CFLAGS"
 fi
-if test "x$GLIB_LIBS" != "x"
-then
-	LDFLAGS="$LDFLAGS $GLIB_LIBS"
+if test "x$GLIB_LIBS" != "x"; then
+    LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
-if test "x$CURSES_LIB_WIDE" = "xyes" -a "x$ac_cv_func_iswalnum" = "xyes" -a "x$ac_cv_func_mblen" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes" -a "x$ac_cv_func_wctomb" = "xyes" -a "x$ac_cv_func_wcwidth" = "xyes" && test "x$ac_cv_func_iswspace" = "xyes" -o "x$ac_cv_func_iswblank" = "xyes"
-then
-	AC_DEFINE(NANO_WIDE, 1, [Define this if your system has sufficient wide character support (a wide curses library, iswalnum(), iswspace() or iswblank(), mblen(), mbtowc(), wctomb(), and wcwidth()).])
+if test x$enable_utf8 != xno && \
+    test x$CURSES_LIB_WIDE = xyes && \
+    test x$ac_cv_func_iswalnum = xyes && \
+    test x$ac_cv_func_iswpunct = xyes && \
+    (test x$ac_cv_func_iswblank = xyes || test x$ac_cv_func_iswspace = xyes) && \
+    test x$ac_cv_func_nl_langinfo = xyes && \
+    test x$ac_cv_func_mblen = xyes && \
+    test x$ac_cv_func_mbstowcs = xyes && \
+    test x$ac_cv_func_mbtowc = xyes && \
+    test x$ac_cv_func_wctomb = xyes && \
+    test x$ac_cv_func_wcwidth = xyes; then
+	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
 else
-	AC_MSG_WARN([Insufficient wide character support found.  nano will not be able to support UTF-8.])
+    if test x$enable_utf8 = xyes; then
+	AC_MSG_ERROR([
+*** UTF-8 support was requested, but insufficient UTF-8 support was
+*** detected in your curses and/or C libraries.  Please verify that your
+*** slang was built with UTF-8 support or your curses was built with
+*** wide character support, and that your C library was built with wide
+*** character support.])
+    elif test x$enable_utf8 != xno; then
+	AC_MSG_WARN([
+*** Insufficient UTF-8 support was detected in your curses and/or C
+*** libraries.  If you want UTF-8 support, please verify that your slang
+*** was built with UTF-8 support or your curses was built with wide
+*** character support, and that your C library was built with wide
+*** character support.])
+    fi
 fi
 
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
+doc/nanorc.sample
 doc/man/Makefile
 doc/man/fr/Makefile
+doc/syntax/Makefile
 doc/texinfo/Makefile
 m4/Makefile
 po/Makefile.in

doc/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

doc/.gitignore

@@ -0,0 +1 @@
+/nanorc.sample

doc/Makefile.am

@@ -1,3 +1,7 @@
+if USE_COLOR
+SUBDIRS = man syntax texinfo
+else
 SUBDIRS = man texinfo
+endif
 
-EXTRA_DIST = faq.html nanorc.sample
+EXTRA_DIST = faq.html

doc/faq.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>The GNU nano editor FAQ</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
 <h1>The GNU nano editor FAQ</h1>
@@ -19,50 +19,53 @@
 <blockquote><p><a href="#2.1">2.1. FTP and WWW sites that carry nano.</a><br>
   <a href="#2.2">2.2. RedHat and derivatives (.rpm) packages.</a><br>
   <a href="#2.3">2.3. Debian (.deb) packages.</a><br>
-  <a href="#2.4">2.4. By CVS (for the brave).</a></p></blockquote>
+  <a href="#2.4">2.4. By subversion (for the brave).</a></p></blockquote>
 <h2><a href="#3">3. Installation and Configuration</a></h2>
 <blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
   <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext', and/or 'gettextdomain'. What can I do about it?</a><br>
-  <a href="#3.5">3.5. Nano should automatically run strip on the binary when installing it!</a><br>
+  <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
   <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
   <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
   <a href="#3.8">3.8. Tell me more about this verbatim input stuff!</a><br>
   <a href="#3.9">3.9. How do I make a .nanorc file that nano will read when I start it?</a></p></blockquote>
 <h2><a href="#4">4. Running</a></h2>
 <blockquote><p><a href="#4.1">4.1. How do I open a file with a name beginning with '+' from the command line?</a><br>
-  <a href="#4.2">4.2. Ack! My backspace/delete/enter/double bucky/meta key doesn't seem to work! What can I do?</a><br>
-  <a href="#4.3">4.3. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
-  <a href="#4.4">4.4. Nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
-  <a href="#4.5">4.5. Nano crashes when I resize my window. How can I fix that?</a><br>
-  <a href="#4.6">4.6. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
-  <a href="#4.7a">4.7a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</a><br>
-  <a href="#4.7b">4.7b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
-  <a href="#4.8">4.8. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
-  <a href="#4.9">4.9. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
-  <a href="#4.10">4.10. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
+  <a href="#4.2">4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</a><br>
+  <a href="#4.3">4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</a><br>
+  <a href="#4.4">4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</a><br>
+  <a href="#4.5">4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</a><br>
+  <a href="#4.6">4.6. nano crashes when I type &lt;insert keystroke here&gt;!</a><br>
+  <a href="#4.7">4.7. nano crashes when I resize my window. How can I fix that?</a><br>
+  <a href="#4.8">4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</a><br>
+  <a href="#4.9">4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</a><br>
+  <a href="#4.10a">4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</a><br>
+  <a href="#4.10b">4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</a><br>
+  <a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
+  <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
+  <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
+  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
 <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
-  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a></p></blockquote>
+  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
+  <a href="#5.3">5.3. What is the status of Unicode support?</a></p></blockquote>
 <h2><a href="#6">6. Advocacy and Licensing</a></h2>
 <blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
   <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
-  <a href="#6.3">6.3. What is so bad about the Pine license?</a><br>
-  <a href="#6.4">6.4. Okay, well what mail program should I use then?</a><br>
-  <a href="#6.5">6.5. Why doesn't UW simply change their license?</a><br>
-  <a href="#6.6">6.6. What if tomorrow UW changes the license to be truly Free Software?</a></p></blockquote>
+  <a href="#6.3">6.3. What is so bad about the older Pine license?</a><br>
+  <a href="#6.4">6.4. Okay, well, what mail program should I use then?</a></p></blockquote>
 <h2><a href="#7">7. Miscellaneous</a></h2>
-<blockquote><p><a href="#7.1">7.1. Nano-related mailing lists.</a><br>
+<blockquote><p><a href="#7.1">7.1. nano-related mailing lists.</a><br>
   <a href="#7.2">7.2. I want to send the development team a big load of cash (or just a thank you).</a><br>
-  <a href="#7.3">7.3. How do I submit a patch?</a><br>
+  <a href="#7.3">7.3. How do I submit a bug report or patch?</a><br>
   <a href="#7.4">7.4. How do I join the development team?</a><br>
-  <a href="#7.5">7.5. Can I have CVS write access?</a></p></blockquote>
+  <a href="#7.5">7.5. Can I have write access to the subversion tree?</a></p></blockquote>
 <h2><a href="#8">8. ChangeLog</a></h2>
 <hr width="100%">
 <h1><a name="1"></a>1. General</h1>
 <h2><a name="1.1"></a>1.1 About this FAQ</h2>
-<blockquote><p>This FAQ was written and is maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
+<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta &lt;<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>&gt;, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey &lt;<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>&gt;. Maybe someone else will volunteer to maintain this FAQ someday, who knows...</p></blockquote>
 <h2><a name="1.2"></a>1.2. How do I contribute to it?</h2>
 <blockquote><p>Your best bet is to send it to the nano email address, <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a> and if it is useful enough it will be included in future versions.</p></blockquote>
 <h2><a name="1.3"></a>1.3. What is GNU nano?</h2>
@@ -72,17 +75,17 @@
   <p><b>In the beginning...</b></p>
   <p>For years Pine was THE program used to read email on a Unix system. The Pico text editor is the portion of the program one would use to compose his or her mail messages. Many beginners to Unix flocked to Pico and Pine because of their well organized, easy to use interfaces. With the proliferation of GNU/Linux in the mid to late 90's, many University students became intimately familiar with the strengths (and weaknesses) of Pine and Pico.</p>
   <p><b>Then came Debian...</b></p>
-  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but they were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
+  <p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly &quot;free&quot; software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but the versions available at the time were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
   <p><b>The event...</b></p>
   <p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
-  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help menu, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
-  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. Nano also reached its first production release on March 22, 2001.</p></blockquote>
+  <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
+  <p>In February 2001, nano was declared an official GNU program by Richard Stallman. nano also reached its first production release on March 22, 2001.</p></blockquote>
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 1.3.6. Of course you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current version of nano *should* be 2.0.7. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
-<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v1.3/nano.1.html">here</a>.</p></blockquote>
+<blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.0/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
 <h1><a name="2"></a>2. Where to get GNU nano.</h1>
 <h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
@@ -96,13 +99,8 @@
 <h2><a name="2.2"></a>2.2. RedHat and derivatives (.rpm) packages.</h2>
 <blockquote>
   <ul>
-    <li><a href="http://www.nano-editor.org/dist/v1.2/RPMS/">http://www.nano-editor.org/dist/v1.2/RPMS/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/</a></li>
-  </ul>
-  <p>Additionally, check out the RedHat contribs section at:</p>
-  <ul>
-    <li><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
-    <li><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
+    <li><a href="http://www.nano-editor.org/dist/v2.0/RPMS/">http://www.nano-editor.org/dist/v2.0/RPMS/</a></li>
+    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v2.0/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v2.0/RPMS/</a></li>
   </ul>
 </blockquote>
 <h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
@@ -114,8 +112,8 @@
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
   <p>Note that versions &lt; 0.9.10 are probably not for those wanting to get serious work done, so if you are using Debian 2.2, check that you have updated to 2.2r3, which comes with nano 0.9.23. If you're tracking unstable, you probably have the newest version already.</p></blockquote>
-<h2><a name="2.4"></a>2.4. By CVS (for the brave).</h2>
-<blockquote><p>For the 'bleeding edge' current version of nano, you can use CVS to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://savannah.gnu.org/cvs/?group_id=1025">the nano CVS page</a> for info on anonymous CVS access to the nano source.</p></blockquote>
+<h2><a name="2.4"></a>2.4. By subversion (for the brave).</h2>
+<blockquote><p>For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://svn.savannah.gnu.org/viewvc/trunk/nano/README.SVN?root=nano&view=markup">the nano SVN document</a> for info on anonymous SVN access to the nano source.</p></blockquote>
 <hr width="100%">
 <h1><a name="3"></a>3. Installation and Configuration</h1>
 <h2><a name="3.1"></a>3.1. How do install the RPM or DEB package?</h2>
@@ -137,126 +135,164 @@
   <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
 <h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext', and/or 'gettextdomain'. What can I do about it?</h2>
 <blockquote><p>Try doing a <b>./configure --with-included-gettext</b> and see if that solves your problem. You may need to do a <b>make clean; make</b> to get it to work fully.</p></blockquote>
-<h2><a name="3.5"></a>3.5. Nano should automatically run strip on the binary when installing it!</h2>
+<h2><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h2>
 <blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
 <h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
 <blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
   <pre>
-  <b>--disable-tabcomp</b>       Disable tab completion code for a smaller
-                          binary
-  <b>--disable-justify</b>       Disable justify/unjustify function
-  <b>--disable-speller</b>       Disable spell checker function
-  <b>--disable-help</b>          Disable help function
-  <b>--disable-browser</b>       Disable mini file browser
+  <b>--disable-tabcomp</b>       Disable tab completion functions
+  <b>--disable-justify</b>       Disable justify/unjustify functions
+  <b>--disable-speller</b>       Disable spell checker functions
+  <b>--disable-help</b>          Disable help functions
+  <b>--disable-browser</b>       Disable built-in file browser
   <b>--disable-wrapping</b>      Disable all wrapping of text (and -w flag)
   <b>--disable-mouse</b>         Disable mouse support (and -m flag)
   <b>--disable-operatingdir</b>  Disable setting of operating directory</pre>
   <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
   <p>If, on the other hand, you can't live without bells and whistles, you could try:</p>
   <pre>
-  <b>--enable-extra</b>          Enable extra functions, including easter eggs
-  <b>--enable-nanorc</b>         Enable use of .nanorc file
+  <b>--enable-extra</b>          Enable extra features, currently only easter eggs
+  <b>--enable-nanorc</b>         Enable use of .nanorc files
   <b>--enable-color</b>          Enable color and syntax highlighting
   <b>--enable-multibuffer</b>    Enable having multiple file buffers open
   <b>--enable-all</b>            Enable all of the above features
   <b>--disable-wrapping-as-root</b>
-                          Turn off wrapping of text by default when the
-                          user is root</pre></blockquote>
+                          Disable text wrapping by default when the user is
+                          root</pre></blockquote>
 <h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with <b>--enable-multibuffer</b> or <b>--enable-extra</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>.  If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
+<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with <b>--enable-multibuffer</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
   <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
 <h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim input&quot;.) Then press the key(s) that generate the character you want.</p>
-  <p>Alternatively, you can press <b>Meta-V</b> and then type a four-digit hexadecimal code from 0000 to ffff (case-insensitive), and the character with the corresponding value will be inserted instead.</p></blockquote>
+<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;.) Then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code from 000000 to 10FFFF (case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
 <h2><a name="3.9"></a>3.9. How do I make a .nanorc file that nano will read when I start it?</h2>
 <blockquote><p>It's not hard at all! But, your version of nano must have been compiled with <b>--enable-nanorc</b>, and again must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word <b>set</b> and the getopt_long flag for the feature, for example &quot;set nowrap&quot; or &quot;set suspend&quot;.</p></blockquote>
 <hr width="100%">
 <h1><a name="4"></a>4. Running</h1>
 <h2><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h2>
-<blockquote><p>If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line number and the latter is always treated as a filename.  If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename.  Examples:</p>
+<blockquote><p>If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number and the latter is always treated as a filename. If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
   <p>To open '+filename.txt' starting on line 1: <b>nano +filename.txt</b><br>
   To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
+  To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
   To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 10 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +20 filename.txt</b></p></blockquote>
-<h2><a name="4.2"></a>4.2. Ack! My backspace/delete/enter/double bucky/meta key doesn't seem to work! What can I do?</h2>
-<blockquote><p>Try setting your $TERM variable to 'vt100'. Nano doesn't yet support every term entry under the sun.</p>
+<h2><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h2>
+<blockquote><p>Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.</p>
   <p>Bourne shell users (bash and sh): <b>export TERM=vt100</b><br>
   C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
-<h2><a name="4.3"></a>4.3. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
-<blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, or Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
-<h2><a name="4.4"></a>4.4. Nano crashes when I type &lt;insert keystroke here&gt;!</h2>
+<h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
+<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> options on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
+<h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
+<blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
+<h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
+<blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
+<h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
 <blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
-<h2><a name="4.5"></a>4.5. Nano crashes when I resize my window. How can I fix that?</h2>
+<h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
 <blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12 is recommended).</p></blockquote>
-<h2><a name="4.6"></a>4.6. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
+<h2><a name="4.8"></a>4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</h2>
+<blockquote><p>It's a bug in glibc 2.2.3. You should upgrade to at least glibc 2.2.4.</p></blockquote>
+<h2><a name="4.9"></a>4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
 <blockquote><p>The help (^G) and justify (^J) function were among the last to be written. To show the improvements that nano had over Pico (go to line # and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users. If you use the <b>-p</b> option to nano (or hit Meta-P) you will get the same shortcuts at the bottom as Pico.</p></blockquote>
-<h2><a name="4.7a"></a>4.7a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
+<h2><a name="4.10a"></a>4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
 <blockquote><p>In nano version 0.9.20, the default is to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor. If you prefer the old behavior, use the Pico emulation mode (-p or --pico) or just hit Meta-P while in nano (see the ^G help text for more details).</p></blockquote>
-<h2><a name="4.7b"></a>4.7b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</h2>
-<blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior.  Also, in version 1.1.99pre1, search and replace history was introduced.  If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history.  This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
-<h2><a name="4.8"></a>4.8. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
+<h2><a name="4.10b"></a>4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</h2>
+<blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior. Also, in version 1.1.99pre1, search and replace history was introduced. If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history. This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
+<h2><a name="4.11"></a>4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
 <blockquote><p>You need to make nano your $EDITOR. If you want this to be saved, you should put a line like this in your <b>.bashrc</b> if you use bash (or <b>.zshrc</b> if you believe in zsh):</p>
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>
-  <p>or if you use tcsh put this in your <b>.cshrc</b> file:</p>
+  <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
   <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
   <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you login. So log out and back in again.</p>
-  <p>Then on top that if you use Pine you must go into setup (type <b>S</b> at the main menu), then configure (type <b>C</b>). Hit enter on the lines that say:</p>
+  <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
   <p><b>[ ] enable-alternate-editor-cmd</b><br>
   <b>[ ] enable-alternate-editor-implicitly</b></p>
   <p>Then exit (<b>E</b>) and select Yes (<b>Y</b>).</p>
-  <p>Mutt users should see an effect immediately the next time you log in, no further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
+  <p>If you're a mutt user, you should see an effect immediately the next time you log in. No further configuration is needed. However, if you want to let people know you use nano to compose your email messages, you can put a line like this in your <b>.muttrc</b>:</p>
   <p><b>my_hdr X-Composer: nano x.y.z</b></p>
   <p>Again, replace x.y.z with the version of nano you use.</p></blockquote>
-<h2><a name="4.9"></a>4.9. I've compiled nano with color support, but I don't see any color when I run it!</h2>
+<h2><a name="4.12"></a>4.12. I've compiled nano with color support, but I don't see any color when I run it!</h2>
 <blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Some example configurations are in the <b>nanorc.sample</b> that comes with the nano source or your nano package. See Section <a href="#3.9">3.9</a>.</p></blockquote>
-<h2><a name="4.10"></a>4.10. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
-<blockquote><p>Try holding down the Shift key and selecting the text as you normally would.</p></blockquote>
+<h2><a name="4.13"></a>4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
+<blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
+<h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
+<blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
 <hr width="100%">
 <h1><a name="5"></a>5. Internationalization</h1>
 <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>On June of 2001, GNU nano entered the <a href="http://www.iro.umontreal.ca/contrib/po/HTML/">Free Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://www.iro.umontreal.ca/contrib/po/HTML/teams.html">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:translation@iro.umontreal.ca">TP coordinator</a> to add you to your team, and send a <a href="http://www.iro.umontreal.ca/contrib/po/HTML/disclaim.html">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+<blockquote><p>On June of 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Free Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:coordinator@translationproject.org">TP coordinator</a> to add you to your team, and send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
   <p>In any case, translating nano is very easy. Just grab the <b>nano.pot</b> file from the latest and greatest nano distribution (it's in the <b>po/</b> directory) and translate each line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
 <blockquote><p>The best way would probably be to e-mail the person listed in the <code>Last-Translator:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections and they can make the changes reach the nano-devel list.</p></blockquote>
+<h2><a name="5.3"></a>5.3. What is the status of Unicode support?</h2>
+<blockquote><p>In version 1.3.12 or later, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.</p></blockquote>
 <hr width="100%">
 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
 <h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
-<blockquote><p>There are many reasons to use nano instead of Pico, a more complete list can be found at the <a href="http://www.nano-editor.org/">nano homepage</a>.</p></blockquote>
+<blockquote><p>There are many reasons to use nano instead of Pico. A more complete list can be found at the <a href="http://www.nano-editor.org/">nano homepage</a>.</p></blockquote>
 <h2><a name="6.2"></a>6.2. Why should I use Pico instead of nano?</h2>
-<blockquote><p>Again, check out the <a href="http://www.nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you're looking for a few more features and a 'better' license as far as adding your own changes (sacrificing mailer integration with Pine), nano is the way to go.</p></blockquote>
-<h2><a name="6.3"></a>6.3. What is so bad about the Pine license?</h2>
-<blockquote><p>The U of W license for Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
-<h2><a name="6.4"></a>6.4. Okay, well what mail program should I use then?</h2>
-<blockquote><p>If you are looking to use a Free Software program similar to Pine and emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also licensed under the GPL.</p></blockquote>
-<h2><a name="6.5"></a>6.5. Why doesn't UW simply change their license?</h2>
-<blockquote><p>You're really not asking the right person here. I (Chris) waited a long time to see if UW would change their license because of the amount of high quality software being released and developed under the GPL without being taken advantage of by malicious corporate entities or other baddies, but no such luck so far.</p></blockquote>
-<h2><a name="6.6"></a>6.6. What if tomorrow UW changes the license to be truly Free Software?</h2>
-<blockquote><p>Honestly nothing would make me happier than to see that happen. Nano would continue to be developed independently until such time as Pico had all the features nano did or the projects merged. That just does not seem very likely given that there has been no sign of any changes in the past few years in a positive direction.</p></blockquote>
+<blockquote><p>Again, check out the <a href="http://www.nano-editor.org/">nano homepage</a> for a good summary of reasons. It really is a matter of personal preference as to which editor you should use. If you're the type of person who likes using the original version of a program, then Pico is the editor for you. If you don't mind sacrificing mailer integration with Pine, and are looking for a few more features, as well as a 'better' license in terms of adding your own changes, nano is the way to go.</p><p>Note that the last of these no longer applies to the new version of Pine, <a href="http://www.washington.edu/alpine/">Alpine</a>, which is under the Apache License, version 2.0.</p></blockquote>
+<h2><a name="6.3"></a>6.3. What is so bad about the older Pine license?</h2>
+<blockquote><p>The U of W license for older versions of Pine and Pico is not considered truly Free Software according to both the Free Software Foundation and the <a href="http://www.debian.org/social_contract#guidelines">Debian Free Software Guidelines</a>. The main problem regards the limitations on distributing derived works: according to UW, you can distribute their software, and you can modify it, but you can not do both, i.e. distribute modified binaries.</p></blockquote>
+<h2><a name="6.4"></a>6.4. Okay, well, what mail program should I use then?</h2>
+<blockquote><p>If you are looking to use a Free Software program similar to Pine, and Emacs is not your thing, you should definitely take a look at <a href="http://www.mutt.org/">mutt</a>. It is a full-screen, console based mail program that actually has a lot more flexibility than Pine, but has a keymap included in the distribution that allows you to use the same keystrokes as Pine would to send and receive mail. It's also under the GNU General Public License, version 2.0.<P>
+Of course, due to the license change you can now use the <A HREF="http://www.washington.edu/alpine/">Alpine distribution</A> of PINE as it is now considered Free Software, but you would be sacrificing many of nano's features to do so.</p></blockquote>
 <hr width="100%">
 <h1><a name="7"></a>7. Miscellaneous</h1>
-<h2><a name="7.1"></a>7.1. Nano-related mailing lists.</h2>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. Info-nano is a very low traffic list where new versions of nano are announced (surprise!) Help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. Nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+<h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
   <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
   help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
   nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v1.3/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v1.3/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
-<h2><a name="7.3"></a>7.3. How do I submit a patch?</h2>
-<blockquote><p>See Section <a href="#7.2">7.2</a>.</p></blockquote>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.0/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.0/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<h2><a name="7.3"></a>7.3. How do I submit a bug report or patch?</h2>
+<blockquote>
+<p>The best place to submit bugs is to the <A HREF="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</A> as you can check whether the bug you are submitting has already been submitted.
+<p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
-<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given CVS write access after awhile. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
-<h2><a name="7.5"></a>7.5. Can I have CVS write access?</h2>
+<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after awhile. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
+<h2><a name="7.5"></a>7.5. Can I have write access to the subversion tree?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote>
-<p>
+<blockquote><p>2007/12/21 - Update maintainer information. (DLR)<br>
+2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Apline, and refer to Savannah for bugs and patches.  (chrisa)
+2007/12/09 - Add minor punctuation and wording fixes, and update various sections to account for Alpine. (DLR)<br>
+2007/08/26 - Update links to the Free Translation Project. (DLR)<br>
+2007/07/29 - Update RPM links for nano 2.0.x. (DLR)<br>
+2007/04/18 - Add a new section 4.14 to explain how autoindent affects pasted text. (John M. Gabriele, minor tweaks by DLR)<br>
+2007/04/04 - Update email address. (DLR)<br>
+2007/01/01 - Update section 4.1 to describe how to open files with names beginning with '+' at specified columns as well as lines. (DLR)<br>
+2006/11/25 - Add miscellaneous wording and capitalization fixes. (DLR)<br>
+2006/10/28 - Update various links for the 2.0 branch of nano. (DLR)<br>
+2006/10/06 - Update the question in section 4.13 to match the version of it in the answer section. (DLR)<br>
+2006/07/25 - Update section 5.3 again to not state &quot;the latest development version&quot; before 1.3.12, as it's no longer accurate. Also add some minor spacing fixes. (DLR)<br>
+2006/06/12 - Update section 5.3, due to the display fix for two-column Unicode characters. (DLR)<br>
+2006/06/05 - Add a new section 4.8, and move all section 4 entries after it down one number, to explain how to deal with glibc 2.2.3's crashes involving extended regular expressions. (DLR)<br>
+2006/06/04 - Add minor punctuation, wording, and typo fixes. (DLR)<br>
+2006/05/27 - Update section 3.8 to mention the new "Unicode Input" prompt, and how Unicode input only works when Unicode support is enabled. (DLR)<br>
+2006/05/12 - Remove section 4.4, and move all section 4 entries after it up one number, since it no longer applies. Meta-] and Meta-[ are no longer used to indent and unindent marked text, since they require that the bracket matching key change to Ctrl-], which is used as the telnet escape key (found by Chris). Also, make the link to the nano CVS page a bit more readable. (DLR)<br>
+2006/05/08 - Add a new section 4.5, and move all section 4 entries after it down one number, to explain a problem that can occur when holding down keys to generate Meta sequences. Also add a few more capitalization and wording fixes. (Benno Schulenberg, minor tweaks by DLR)<br>
+2006/05/01 - Add a new section 4.4, and move all section 4 entries after it down one number, to explain how to deal with problems typing Meta-[. Also add a few capitalization and wording fixes. (DLR)<br>
+2006/04/14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
+2006/03/16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
+2005/11/21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
+2005/11/19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
+2005/08/27 - Update email address. (DLR)<br>
+2005/08/10 - Add a new section 4.3, and move all section 4 entries after it down one number, to explain how to deal with numeric keypad problems. (DLR)<br>
+2005/08/08 - Update section 3.8 to mention that verbatim input mode now takes a six-digit hexadecimal number. (DLR)<br>
+2005/07/04 - Update section 4.10 to mention that pasting from the X clipboard via the middle mouse button also works when the Shift key is used. (DLR)<br>
+2005/06/15 - Update description of --enable-extra, and add missing line breaks. (DLR)<br>
+2005/06/13 - Minor capitalization and wording fixes. (DLR)<br>
+2005/06/08 - Updated section 1.1 to mention the current maintainer. (DLR)<br>
 2005/03/09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)<br>
 2005/01/03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)<br>
 2004/11/21 - Listed sh as an example of a Bourne shell. (DLR)<br>
 2004/11/05 - Fixed inaccuracy: Pico compatibility mode was made the default in nano 1.1.99pre1, not 1.2.2. Also added question about how to type F13-F16 on terminals lacking keys past F12 (suggested by Chris), question about how to select text for the clipboard in X terminals with nano's mouse support turned on (answer found by Joseph Birthisel), and misc. fixes and link updates. (DLR)<br>
 2004/04/07 - Removed NumLock glitch question, as it's no longer needed. (DLR)<br>
 2004/01/30 - Fixed inaccuracy: multibuffer mode was first in nano 1.1.0, not 1.1.12. (DLR)<br>
-2003/12/31 - Added question about the new verbatim input function, and a few minor fixes.  Removed reference to &quot;set pico&quot; (DLR).<br>
+2003/12/31 - Added question about the new verbatim input function, and a few minor fixes. Removed reference to &quot;set pico&quot; (DLR).<br>
 2003/07/02 - Added question about nano's not showing color when it's compiled with color support (DLR; suggested by Jordi).<br>
 2003/02/23 - Updated RPM links for nano 1.2.x (DLR).<br>
 2003/01/16 - Split section 4.5 into 4.5a and 4.5b for search string behavior. Added --enable-all docs.<br>

doc/man/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-nanorc.5.html
-nano.1.html

doc/man/.gitignore

@@ -1,4 +1,3 @@
-Makefile
-Makefile.in
-nanorc.5.html
 nano.1.html
+nanorc.5.html
+rnano.1.html

doc/man/Makefile.am

@@ -1,12 +1,25 @@
+if USE_NLS
 SUBDIRS = fr
+else
+SUBDIRS =
+endif
 
-man_MANS = nano.1 nanorc.5
+if USE_NANORC
+man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+else
+man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
+endif
 
-BUILT_SOURCES = nano.1.html nanorc.5.html
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $< > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)

doc/man/fr/Makefile.am

@@ -1,10 +1,21 @@
-man_MANS = nano.1 nanorc.5
+mandir = @mandir@/fr
 
-BUILT_SOURCES = nano.1.html nanorc.5.html
+if USE_NANORC
+man_MANS = nano.1 nanorc.5 rnano.1
+BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
+else
+man_MANS = nano.1 rnano.1
+BUILT_SOURCES = nano.1.html rnano.1.html
+endif
+
+nano_man_mans = nano.1 nanorc.5 rnano.1
+nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
 
 nano.1.html: nano.1
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
 nanorc.5.html: nanorc.5
-	cat $< | groff -t -mandoc -Thtml > $@
+	groff -t -mandoc -Thtml < $< > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $< > $@
 
-EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES)
+EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)

doc/man/fr/nano.1

@@ -1,30 +1,64 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003 by
-.\" Chris Allegretta <chrisa@asty.org>
+.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" (c) 2003-2004 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Ce travail d'adaptation est dans le domaine public. Attention, la
+.\" page traduite reste soumise au droit d'auteur de ses auteurs
+.\" originaux.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" 2005, 2006 and 2007. The translated man page in itself is still
+.\" subject to the copyright of its original authors.
 .\"
-.\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. AUCUNE garantie n'est offerte.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free 
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la 
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas 
+.\"   le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
+.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu 
+.\"   une copie de la Licence de documentation libre GNU avec ce 
+.\"   programme. Si ce n'est pas le cas, consultez 
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.4" "17 août 2004"  
+.TH NANO 1 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
 
-
 .SH NOM
 nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
 
 .SH SYNOPSIS
 .B nano
-.I [\+LIGNE]\ [options]\ [fichier]
+.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
@@ -34,40 +68,48 @@ Cette page de manuel d
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
 .\" respectively.
 \fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
-Pico, l'éditeur par défaut du paquet non libre Pine. \fBnano\fR ne se
+Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
 contentant pas de copier l'interface et l'ergonomie de Pico, il offre
 également certaines fonctions manquantes (ou désactivées par défaut)
 dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
-recherche et de remplacement, et la possibilité de sauter directement à un
-numéro de ligne.
+recherche et de remplacement, et la possibilité de sauter directement à 
+une ligne et à une colonne précise.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fR
-Démarre avec le curseur positionné à la ligne numéro \fILIGNE\fR.
+.B \+\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
+lieu de démarrer à la colonne\ 1, ligne\ 1.
+.TP
+.B \-?
+Identique à \fB-h (\-\-help)\fP.
 .TP
 .B \-A (\-\-smarthome)
-Active le fonctionnement évolué de la touche «\ Début\ ». Lorsque cette
-touche est pressée à n'importe quel endroit excepté au tout début du
-texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur se
-positionnera à ce début de ligne (qu'il soit en avant ou en arrière). Si
-le curseur est déjà au tout début de la ligne, il se placera au vrai
-début de la ligne.
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
+appuie sur cette touche à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en
+arrière). Si le curseur est déjà là, il se placera au vrai début de la
+ligne.
 .TP
 .B \-B (\-\-backup)
 Lors de l'écriture d'un fichier, crée une copie de sécurité de la
 version précédente, en ajoutant un tilde (~) au nom du fichier.
 .TP
-.B \-D (\-\-dos)
-Écrit le fichier au format DOS.
+.B \-D (\-\-boldtext)
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-.B \-E \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
+.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
 Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité si celles-ci sont activées.
+de sécurité uniques si celles-ci sont activées.
+.TP
+.B \-E (\-\-tabstospaces)
+Convertit les tabulations clavier en espaces.
 .TP
 .B \-F (\-\-multibuffer)
-Active le mode multifichier, autorisant l'édition simultanée de plusieurs
-fichiers, si ce mode est disponible.
+Active le mode multi-espace, autorisant l'édition simultanée de 
+plusieurs fichiers, si ce mode est disponible.
 .TP
 .B \-H (\-\-historylog)
 Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
@@ -76,83 +118,106 @@ r
 utiliser les fichiers nanorc.
 .TP
 .B \-I (\-\-ignorercfiles)
-N'utilise pas les fichiers \fISYSCONFDIR/nanorc\fR et \fI~/.nanorc\fR, même si
-\fBnano\fR est capable de les utiliser.
+Ne pas utiliser pas les fichiers \fISYSCONFDIR/nanorc\fR et 
+\fI~/.nanorc\fR (si \fBnano\fR est capable de les utiliser).
 .TP
-.B \-M (\-\-mac)
-Écrit le fichier au format Mac.
+.B \-K (\-\-rebindkeypad)
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+toutes correctement. Vous ne devriez utiliser cette option que si ce 
+n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
+correctement lorsque cette option sera activée.
+.TP
+.B \-L (\-\-nonewlines)
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B \-N (\-\-noconvert)
 Désactive la conversion automatique des fichiers depuis les formats Mac et
 DOS.
 .TP
+.B \-O (\-\-morespace)
+Utiliser la ligne blanche située sous la ligne de titre comme
+espace supplémentaire d'édition.
+.TP
 .B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
 Définit le préfixe par défaut des citations. Nano utilise ce préfixe
 pour réaliser une justification correcte des citations. Si nano est
 capable d'utiliser des expressions rationnelles, le préfixe par défaut
-sera "^([\ \\t]*[|>:}#])+", sinon, ce sera ">\ ".
+sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera "\fI>\ \fP". Dans 
+l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
+tabulation.
 .TP
-.B \-R (\-\-regexp)
-Active l'utilisation d'expressions rationnelles lors des recherches, ainsi
-que la possibilité d'utiliser \\n dans les chaînes de remplacement pour
-faire référence à la n-ième sous-expression du motif de recherche, si
-cette fonction est disponible.
+.B \-R (\-\-restricted)
+Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
+sur la ligne de commande, pas de lecture des fichiers nanorc, 
+interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
+de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
+d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
+option peut aussi être activée en appelant \fBnano\fP sous un nom 
+commençant par «\ r\ » (par exemple «\ rnano\ »).
 .TP
 .B \-S (\-\-smooth)
 Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
 de défiler morceau-par-morceau.
 .TP
 .B \-T \fInombre\fP (\-\-tabsize=\fInombre\fP)
-Définit la taille (largeur) des tabulations.
+Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
+nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
+est de 8.
+.TP
+.B \-U (\-\-quickblank)
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
+d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
+l'option \fB-c\fP prend le pas sur cette option.
 .TP
 .B \-V (\-\-version)
-Affiche le numéro de version et l'auteur.
+Affiche la version, puis s'arrête.
+.TP
+.B \-W (\-\-wordbounds)
+Détection plus précise des limites de mots, obtenue en considérant les 
+caractères de ponctuation comme faisant partie des mots.
 .TP
 .B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
 Indique quel mode de colorisation syntaxique adopter, parmi les modes
 définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
 disponible.
 .TP
-.B \-Z (\-\-restricted)
-Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
-sur la ligne de commande, pas de lecture des fichiers nanorc, 
-interdiction de suspendre et interdiction de sauvegarder (ou d'ajouter 
-en tête ou en fin) un fichier ayant déjà un nom sous un nom différent. 
-Cette option peut aussi être activée en appelant \fBnano\fP sous un nom 
-commençant par «\ r\ » (par exemple «\ rnano\ »).
-.TP
 .B \-c (\-\-const)
-Affiche en permanence la position du curseur.
+Affiche en permanence la position du curseur. Notez que cette option 
+prend le pas sur l'option \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
-Interprète différemment la touche «\ Supprimer\ », afin que les touches
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
 «\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous devriez n'avoir besoin de cette option que si la touche 
-«\ Effacement arrière\ » produit l'effet de la touche «\ Supprimer\ » 
-sur votre système.
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche
+«\ Supprimer\ ».
 .TP
 .B \-h (\-\-help)
-Affiche un résumé des options disponibles en ligne de commande.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-i (\-\-autoindent)
 Indentation automatique. Commence chaque nouvelle ligne au même niveau que
 la ligne précédente. Utile pour l'édition de code source.
 .TP
 .B \-k (\-\-cut)
-^K coupe le texte du curseur à la fin de la ligne, au lieu de couper la
+Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
 ligne entière.
 .TP
 .B \-l (\-\-nofollow)
-Si le fichier édité est un lien symbolique, remplace le lien par le
-nouveau fichier, sans le suivre. Ce mode ne serait-il pas utile pour éditer
-les fichiers de \fI/tmp\fR ?
+Si le fichier édité est un lien symbolique, au lieu de le suivre, 
+remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
+les fichiers de \fI/tmp\fR, non\ ?
 .TP
 .B \-m (\-\-mouse)
-Active l'utilisation de la souris (si elle est disponible sur votre
-système).
+Active l'utilisation de la souris, si elle est disponible pour votre
+système. Lorsque celle-ci est activée, il est possible d'utiliser la 
+souris pour positionner le curseur, pour marquer le texte (avec un 
+double-clic) et pour lancer les fonctions correspondant aux raccourcis. 
+Il est possible d'utiliser la souris sous X\ Window ou en mode console 
+avec gpm.
 .TP
 .B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
-Définit le répertoire de travail. Demande à nano de mettre en place
+Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
 quelque chose de similaire à un environnement d'exécution restreint
 (\fIchroot\fR).
 .TP
@@ -161,18 +226,18 @@ Pr
 par le terminal.
 .TP
 .B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP)
-Passe automatiquement à la ligne à la colonne \fIcolonne\fR. Par défaut, le
-passage à la ligne se fait à la taille de l'écran moins huit. Si la
-valeur indiquée est négative, le point de passage à la ligne sera
-calculé relativement au bord droit de l'écran. Cela permet de faire varier
-le point de passage à la ligne lorsque l'on change la taille de l'écran.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
+passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
+Cela permet de faire varier le point de passage à la ligne lorsque l'on 
+change la taille de l'écran. La valeur par défaut est de -8.
 .TP
 .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP)
 Choix d'un correcteur orthographique de remplacement.
 .TP
 .B \-t (\-\-tempfile)
 S'il a été modifié, le fichier sera sauvegardé automatiquement sans
-demande de confirmation. Identique à l'option -t de Pico.
+demande de confirmation. Identique à l'option \fB-t\fP de Pico.
 .TP
 .B \-v (\-\-view)
 Mode visualisation (lecture seule).
@@ -190,14 +255,14 @@ Autorise
 Ignoré, pour être compatible avec Pico.
 
 .SH "FICHIERS D'INITIALISATION"
-\fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ :
-\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de manuel
-de \fBnanorc\fR(5) et au fichier-exemple \fInanorc.sample\fR qui devrait être
-livré avec \fBnano\fR.
+\fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ : 
+\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
+manuel de \fBnanorc(5)\fR et au fichier d'exemple \fInanorc.sample\fR, 
+qui devraient tous les deux être livrés avec \fBnano\fR.
 
 .SH NOTES
 Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
-ligne de commande ou dans le fichier nanorc, \fBnano\fR prendra 
+ligne de commande ou dans l'un des fichiers nanorc, \fBnano\fR prendra 
 la commande indiquée par la variable d'environnement \fBSPELL\fR si 
 elle est définie.
 
@@ -209,7 +274,7 @@ cours n'avait pas encore de nom, ou sera compos
 suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
 le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
 nom du fichier en cours afin de le rendre unique (par exemple,
-«\ .save.1\ »). En mode multifichier, \fBnano\fR réalisera une
+«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
 sauvegarde de tous les fichiers en cours dans leurs fichiers de secours
 respectifs.
 
@@ -217,12 +282,16 @@ respectifs.
 Merci de nous faire parvenir vos commentaires et de nous signaler les
 bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-La liste de discussion anglophone \fBnano\fR est disponible via
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
 \fBnano-devel@gnu.org\fR.
 
 Pour vous abonner, envoyez un courrier électronique à
 \fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
+N'hésitez pas également à envoyez vos commentaires, suggestions et 
+corrections relatives à l'adaptation française de cette page de manuel 
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+
 .SH "SITE INTERNET"
 http://www.nano-editor.org/
 
@@ -234,13 +303,24 @@ http://www.nano-editor.org/
 \fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
 
 .SH AUTEUR
-Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers
-\fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de manuel a
-été initialement rédigée par Jordi Mallach
-<jordi@sindominio.net> pour le système GNU Debian (mais elle peut
-être utilisée par d'autres).
+Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers 
+\fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de 
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir 
+de la version 1.54 du 11\ octobre\ 2007 de la page de manuel de nano 
+2.0.0. Cette page a été relue par Gérard Delafond.
 
-Adaptation française du 4\ septembre\ 2004 par
-Jean-Philippe\ Guérard\ <jean-philippe.guerard@corbeaunoir.org>.
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours 
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/fr/nanorc.5

@@ -1,18 +1,54 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003 Free Software Foundation, Inc.
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" (c) 2003-2004 Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>
-.\" pour l'adaptation française
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Ce travail d'adaptation est dans le domaine public. Attention, la
+.\" page traduite reste soumise au droit d'auteur de ses auteurs
+.\" originaux.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions. There is NO warranty.
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" 2005, 2006 and 2007. The translated man page in itself is still
+.\" subject to the copyright of its original authors.
 .\"
-.\" Ce document est libre. Reportez-vous à la dernière version de la
-.\" licence publique générale GNU (GNU GPL) pour connaître ses
-.\" conditions d'utilisation. AUCUNE garantie n'est offerte.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est 
+.\"   pas le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 
+.\"   ou, à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   une copie de la Licence de documentation libre GNU avec ce
+.\"   programme. Si ce n'est pas le cas, consultez
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.4" "17 août 2004"
+.TH NANORC 5 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\" Merci de modifier ces dates à chaque mise à jour de cette page.
 
@@ -21,187 +57,283 @@ nanorc \- fichier de configuration de l'
 
 .SH DESCRIPTION
 Cette page de manuel décrit brièvement le fichier de configuration de 
-l'éditeur \fBnano\fP du projet GNU.
+l'éditeur \fBnano\fP GNU.
 .PP
 \fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du paquet non-libre Pine. 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fP ne se contentant pas de copier l'interface et l'ergonomie de 
 Pico, il offre également certaines fonctionnalités manquantes (ou 
 désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, 
-les fonctions de recherche et de remplacement, et la possibilité de 
-sauter directement à un numéro de ligne.
+les fonctions de recherche et de remplacement et la possibilité de 
+sauter directement à une ligne et à une colonne précise.
 .PP
 Le fichier \fInanorc\fP contient les paramètres par défaut de 
-\fBnano\fP. Lors de son démarrage, nano commence par lire le fichier de 
-configuration général \fISYSCONFDIR/nanorc\fP, puis lit le fichier de 
-configuration personnel de l'utilisateur \fI~/.nanorc\fP.
+\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son 
+démarrage, nano commencera par lire le fichier de configuration général 
+\fISYSCONFDIR/nanorc\fP, puis lira le fichier de configuration personnel 
+de l'utilisateur \fI~/.nanorc\fP.
 
 .SH OPTIONS
-Le fichier de configuration accepte une série de commandes «\ set\ » 
-(activer) et «\ unset\ » (désactiver), qui permettent de définir la 
-configuration de nano au démarrage sans avoir à utiliser d'options sur 
-la ligne de commande.
-De plus, les mots clefs «\ syntax\ » (syntaxe) et «\ color\ » (couleur) 
+Le fichier de configuration accepte une série de commandes \fBset\fP 
+(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
+paramétrage de nano au démarrage sans avoir à utiliser d'options de
+ligne de commande. De plus, les mots clefs \fBsyntax\fP (syntaxe),
+\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
 sont utilisés pour définir les règles de colorisation pour différents 
-motifs de texte. Nano lira une commande par ligne.
+motifs de texte. \fBnano\fP lit une commande par ligne.
 
-Les options du fichier de configuration ont priorité sur les valeurs par
-défaut utilisées par nano. Les options de la ligne de commande sont
-prioritaires par rapport aux options du fichier de configuration.
+Les options du fichier de configuration ont priorité sur les valeurs par 
+défaut utilisées par nano. Les options de la ligne de commande sont 
+prioritaires par rapport aux options du fichier de configuration. Les 
+options sont désactivées (unset) par défaut, sauf les options prenant un 
+argument.
 
-Les options sont désactivées (unset) par défaut, sauf les options 
-prenant un argument.
+Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
+présents dans des chaînes de caractères utilisées comme paramètres n'ont 
+pas besoin d'être précédées d'une barre oblique inversée
+(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
+droit. Par exemple, pour l'option \fBbrackets\fP, "\fI"')>]}\fP" 
+correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
 
 Les commandes et arguments reconnus sont\ :
 
 .TP 3
-\fBset/unset autoindent\fP
+.B set/unset autoindent
 Active l'indentation automatique.
 .TP
-\fBset/unset backup\fP
-Crée des copie de sécurité nommées
+.B set/unset backup
+Crée des copies de sécurité nommées
 .IR nom_du_fichier~ .
 .TP
-\fBset/unset const\fP
+.B set backupdir "\fIrépertoire\fP"
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques, si l'enregistrement de copies de sécurité est 
+activé.
+.TP
+.B set/unset backwards
+Par défaut, les recherches se font vers l'arrière.
+.TP
+.B set/unset boldtext
+Utilise des caractères gras à la place de la vidéo inverse.
+.TP
+.B set brackets "\fIchaîne\fP"
+Définit les caractères considérés comme des crochets fermants lors de la 
+justification des paragraphes. Ces caractères ne doivent pas contenir 
+d'espaces. Seules les ponctuations terminales, éventuellement suivies 
+de crochets fermants, peuvent terminer une phrase.
+
+La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
+
+N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour 
+plus d'informations.
+
+.TP
+.B set/unset casesensitive
+Par défaut, les recherches ne tiennent pas compte de la casse.
+.TP
+.B set/unset const
 Affiche en permanence la position du curseur dans la ligne d'état.
 .TP
-\fBset/unset cut\fP
-Par défaut, ^K  coupe le texte du curseur jusqu'à la fin de la ligne, au 
-lieu de couper la ligne entière.
+.B set/unset cut
+Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
+couper la ligne entière.
 .TP
-\fBset fill \fIn\fP\fP
-Passe automatiquement à la ligne à la colonne \fIn\fP. Si la valeur 
-indiquée est 0 ou moins, la longueur de la ligne sera égale à la largeur 
-de l'écran moins \fIn\fP. La valeur par défaut est -8.
+.B set fill \fIn\fP
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
+la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
+faire varier le point de passage à la ligne lorsque l'on change la 
+taille de l'écran. La valeur par défaut est de -8.
 .TP
-\fBset/unset historylog\fP
+.B set/unset historylog
 Active l'utilisation de
 .I ~/.nano_history
 pour enregistrer et relire les chaînes ayant fait l'objet d'une 
 recherche ou d'un remplacement.
 .TP
-\fBset/unset multibuffer\fP
-Mode multifichier\ : permet de charger les fichiers dans leur propre 
+.B set matchbrackets "\fIchaîne\fP"
+Définit les crochets ouvrants et fermant pour la recherche de crochets 
+correspondants. Cette liste ne doit pas contenir de blancs. L'ensemble 
+des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
+des crochets fermant, qui doit être dans le même ordre. La valeur par 
+défaut de cette option est "\fI(<[{)>]}\fP".
+.TP
+.B set/unset morespace
+Utiliser la ligne blanche située sous la ligne de titre comme espace 
+supplémentaire d'édition.
+.TP
+.B set/unset mouse
+Active l'utilisation de la souris, si elle est disponible pour votre
+système. Lorsque celle-ci est activée, il est possible d'utiliser la
+souris pour positionner le curseur, pour marquer le texte (avec un
+double-clic) et pour lancer les fonctions correspondant aux raccourcis.
+Il est possible d'utiliser la souris sous X\ Window ou en mode console
+avec gpm.
+.TP
+.B set/unset multibuffer
+Mode multi-espace\ : permet de charger les fichiers dans leur propre 
 espace.
 .TP
-\fBset/unset noconvert\fP
+.B set/unset noconvert
 Pas de conversion depuis les formats DOS et Mac.
 .TP
-\fBset/unset nofollow\fP
+.B set/unset nofollow
 Ne suit pas les liens symboliques lors de l'écriture des fichiers.
 .TP
-\fBset/unset nohelp\fP
+.B set/unset nohelp
 Désactive les lignes d'aide affichée en bas de l'écran.
 .TP
-\fBset/unset nowrap\fP
+.B set/unset nonewlines
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
+.TP
+.B set/unset nowrap
 Désactive le passage automatique à la ligne.
 .TP
-\fBset operatingdir "\fIrépertoire\fP"\fP
+.B set operatingdir "\fIrépertoire\fP"
 \fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
 \fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
 le répertoire courant, afin que les fichiers soient lus depuis ce 
 répertoire. Par défaut, cette fonction est désactivée.
 .TP
-\fBset/unset preserve\fP
+.B set/unset preserve
 Préserve les séquences XON et XOFF (^Q et ^S).
 .TP
-\fBset punct "\fIchaîne\fP"\fP
-Définit les caractères interprétés comme des ponctuations terminales. 
-Ces caractères ne peuvent inclure d'espaces ou de tabulations. Seules les 
-ponctuations terminales, éventuellement suivies de crochets fermants, 
-peuvent terminer une phrase.
+.B set punct "\fIchaîne\fP"
+Définit les caractères interprétés comme des ponctuations terminales 
+lors de la justification des paragraphes. Ces caractères ne peuvent 
+inclure de blancs. Seules les ponctuations terminales, éventuellement 
+suivies de crochets fermants, peuvent terminer une phrase. La valeur par 
+défaut de cette option est "\fI!.?\fP".
 
-(N.D.T.\ : ce réglage permet de conserver 2\ espaces au lieu d'une 
-derrière les ponctuations terminales lors de la justification, ce qui 
+N.D.T.\ : ce réglage permet, lors de la justification, de conserver
+2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
 correspond aux normes typographiques anglo-saxonnes, mais n'a pas lieu 
-d'être en français. Pour le français, le plus simple est d'indiquer dans 
-le fichier nanorc une chaîne vide pour ce paramètre.)
+d'être en français. Pour le français, le plus simple est d'indiquer, 
+dans le fichier nanorc, une chaîne vide pour ce paramètre.
 .TP
-\fBset quotestr "\fIchaîne\fP"\fP
+.B set/unset quickblank
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne
+d'état disparaîtront après une frappe clavier au lieu de 25.
+.TP
+.B set quotestr "\fIchaîne\fP"
 Définit le préfixe par défaut utilisé pour les citations dans les 
 courriers électroniques. Ce préfixe est utilisé pour réaliser une 
 justification correcte de ces citations. Il s'agira, si votre système le 
-permet, d'une «\ expression rationnelle étendue\ ». Dans le cas 
+permet, d'une expression rationnelle étendue. Dans le cas 
 contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
-expressions rationnelles, la valeur par défaut sera\ :
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-Sinon, ce sera ">\ ". Notez que le «\ \\t\ » ci-dessus correspond à un 
-caractère de tabulation.
+expressions rationnelles, la valeur par défaut de cette option sera 
+"\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera ">\ ". Notez que le
+«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
 .TP
-\fBset/unset rebinddelete\fP
-Interprète différemment la touche «\ Supprimer\ », afin que les touches
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement.
-Vous devriez uniquement avoir besoin de cette option si la touche
-«\ Effacement arrière\ » produit l'effet de la touche «\ Supprimer\ »
-sur votre système.
+.B set/unset rebinddelete
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
+Supprimer\ ».
 .TP
-\fBset/unset regexp\fP
-Utilise par défaut des expressions rationnelles pour les recherches.
+.B set/unset rebindkeypad
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+toutes correctement. Vous ne devriez utiliser cette option que si ce 
+n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
+correctement lorsque cette option sera activée.
 .TP
-\fBset/unset smarthome\fP
-Active le fonctionnement évolué de la touche «\ Début\ ». Lorsque cette
-touche est pressée à n'importe quel endroit excepté au tout début du
-texte d'une ligne (i.\ e. au premier caractère non-blanc), le curseur se
-positionnera à ce début de ligne (qu'il soit en avant ou en arrière). Si
-le curseur est déjà au tout début de la ligne, il se placera au vrai
-début de la ligne.
+.B set/unset regexp
+Utilise par défaut des expressions rationnelles étendues pour les 
+recherches.
 .TP
-\fBset/unset smooth\fP
+.B set/unset smarthome
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
+cette touche est pressée à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
+arrière). Si le curseur est déjà là, il se placera au vrai début de la 
+ligne.
+.TP
+.B set/unset smooth
 Active le défilement ligne-par-ligne du texte.
 .TP
-\fBset speller \fIprogramme\fP\fP
+.B set speller "\fIprogramme\fP"
 Utilise le correcteur orthographique \fIprogramme\fP au lieu du 
 correcteur intégré, qui s'appuie sur \fIspell\fP.
 .TP
-\fBset/unset suspend\fP
-Autorise à suspendre nano avec ^Z.
+.B set/unset suspend
+Autorise à suspendre \fBnano\fP.
 .TP
-\fBset tabsize \fIn\fP\fP
-Utilise une largeur de tabulation de \fIn\fP au lieu de la valeur par 
-défaut (8). Cette valeur doit être supérieur à 0.
+.B set tabsize \fIn\fP
+Utilise une taille de tabulation de \fIn\fP colonnes. Cette valeur doit 
+être strictement supérieure à 0. La valeur par défaut est de\ 8.
 .TP
-\fBset/unset tempfile\fP
+.B set/unset tabstospaces
+Convertit les tabulations clavier en espaces.
+.TP
+.B set/unset tempfile
 S'il a été modifié, le fichier sera sauvegardé automatiquement en 
 quittant, sans demande de confirmation.
 .TP
-\fBset/unset view\fP
-Interdit la modification du fichier.
+.B set/unset view
+Interdit de modifier les fichiers.
 .TP
-\fBset whitespace "\fIchaîne\fP"\fP
+.B set whitespace "\fIchaîne\fP"
 Définit les deux caractères utilisés pour afficher les premiers 
-caractères de tabulations et d'espaces. Cela ne doit pas être 
-des caractère de contrôle.
+caractères des tabulations et des espaces. Ces deux caractères doivent 
+être mono-colonne.
+.TP
+.B set/unset wordbounds
+Détection plus précise des limites de mots, obtenue en considérant les
+caractères de ponctuation comme faisant partie des mots.
 .TP
 .B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
 Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
-l'option \fB-Y\fP, ou qui sera automatiquement activé si le nom du 
-fichier en cours correspond au \fImotif_de_fichier\fP. Toutes les 
-instructions suivantes de colorisation \fBcolor\fP s'appliqueront à 
+l'option \fB-Y\fP (ou \fB--syntax\fP) ou qui sera automatiquement 
+activée si le nom du fichier en cours correspond à l'expression 
+rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
+suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
 cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
+
+La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
+indiquée dans la ligne de commande, cela revient à ne définir aucune 
+syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
+ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
+fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
+syntaxes.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
 Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
-l'expression rationnelle \fImotif\fP en utilisant la couleur de texte 
-\fIcouleur_texte\fP et éventuellement la couleur de fond 
-\fIcouleur_fond\fP. Les couleurs acceptées par \fBnano\fP pour le 
-texte et le fond sont\ : \fIwhite\fP (blanc), \fIblack\fP (noir), 
-\fIred\fP (rouge), \fIblue\fP (bleu), \fIgreen\fP (vert), \fIyellow\fP 
-(jaune), \fImagenta\fP, et \fIcyan\fP. Vous pouvez ajouter à 
-ces couleurs le préfixe \fIbright\fP pour obtenir une couleur plus 
-lumineuse. Si votre terminal est capable de gérer la transparence, ne 
-pas spécifier de \fIcouleur_fond\fP indique à \fBnano\fP d'essayer 
-d'utiliser un fond transparent.
+l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
+texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, 
+l'une de ces deux couleurs au moins devant être définie. Les couleurs 
+acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
+(blanc), \fIblack\fP (noir), \fIred\fP (rouge), \fIblue\fP (bleu), 
+\fIgreen\fP (vert), \fIyellow\fP (jaune), \fImagenta\fP, et \fIcyan\fP. 
+Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
+\fIbright\fP (lumineux) pour obtenir une couleur plus lumineuse. Si 
+votre terminal est capable de gérer la transparence, ne pas spécifier de 
+\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
+transparent.
+.TP
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+compte de la casse.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Affiche les expressions commençant par \fImotif_début\fP et se terminant 
-par \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
-et éventuellement la couleur de fond \fIcouleur_fond\fP. Cela permet à 
-la colorisation syntaxique de s'étendre sur plusieurs lignes. Notez que 
-toutes les occurrences successives de \fImotif_début\fP après le 
-\fImotif_début\fP initial seront surlignées jusqu'à la prochaine instance 
-de \fImotif_fin\fP.
+Affiche les expressions commençant par l'expression rationnelle étendue 
+\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
+\fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
+et la couleur de fond \fIcouleur_fond\fP, l'une de ces deux couleurs au 
+moins devant être définie. Cela permet à la colorisation syntaxique de 
+s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
+successives de \fImotif_début\fP après le \fImotif_début\fP initial 
+seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
+.TP
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+compte de la casse.
+.TP
+.B include "\fIfichier_de_syntaxes\fP"
+Lit le fichier \fIfichier_de_syntaxes\fP contenant une liste 
+autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
+que des commandes \fBsyntax\fP, \fBcolor\fP et \fBicolor\fP.
 
 .SH FICHIERS
 .TP
@@ -222,9 +354,23 @@ votre syst
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers
 \fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de
-manuel a été rédigée par Jordi Mallach <jordi@gnu.org>.
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir de
+la version 1.56 du 11\ octobre\ 2007 de la page de manuel de nanorc 
+(pour la version 2.0.0 de nano). Cette page a été relue par Gérard 
+Delafond.
 
-Adaptation française du 4\ septembre\ 2004 par
-Jean-Philippe\ Guérard\ <jean-philippe.guerard@corbeaunoir.org>.
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours 
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/fr/rnano.1

@@ -0,0 +1,154 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+.\" Skeleton based on nano-tiny.1:
+.\" Copyright (C) 2002 Free Software Foundation, Inc.
+.\"
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2006 et 2007. Ce travail
+.\" d'adaptation est dans le domaine public. Attention, la page traduite
+.\" reste soumise au droit d'auteur de ses auteurs originaux.
+.\"
+.\" The French translation of this document is a public domain work of
+.\" Jean-Philippe Guérard. This translation work was made in 2006 and
+.\" 2007. The translated man page in itself is still subject to the
+.\" copyright of its original authors.
+.\"
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" Ce document est publié sous une double licence. Vous pouvez
+.\" le distribuer et le modifier selon les termes de l'une des deux
+.\" licences ci-dessous :
+.\"
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas
+.\"   le cas, consultez <http://www.gnu.org/licenses/>.
+.\"
+.\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
+.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation, sans section invariante, ni texte de
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   une copie de la Licence de documentation libre GNU avec ce
+.\"   programme. Si ce n'est pas le cas, consultez
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" $Id$
+.TH RNANO 1 "version 2.0.0" "29\ novembre\ 20O7"
+.\" Please adjust this date whenever revising the manpage.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\"
+.SH NOM
+rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
+amélioré de Pico
+
+.SH SYNOPSIS
+.B rnano
+.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.br
+
+.SH DESCRIPTION
+Cette page de manuel décrit brièvement la commande \fBrnano\fR.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fR ne se contentant pas de copier l'interface et l'ergonomie de 
+Pico, il offre également certaines fonctions manquantes (ou désactivées 
+par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les 
+fonctions de recherche et de remplacement, et la possibilité de sauter 
+directement à une ligne et à une colonne précise..
+.PP
+\fBrnano\fP est une version de \fBnano\fP fonctionnant en mode 
+restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
+n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
+interpréteur de commandes.
+.PP
+En mode restreint, \fBnano\fP refusera\ :
+.IP \[bu] 2
+de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
+ligne de commande\ ;
+.IP \[bu]
+de lire un fichier nanorc\ ;
+.IP \[bu]
+de permettre de suspendre l'édition\ ;
+.IP \[bu]
+de permettre d'ajouter en début ou en fin d'un fichier, ou de 
+l'enregistrer sous un nom différent\ ;
+.IP \[bu]
+l'utilisation de copies de sécurité ou de la correction orthographique.
+
+.SH OPTIONS
+.TP
+.B \+\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
+lieu de démarrer à la colonne\ 1, ligne\ 1.
+.TP
+.B \-?
+Identique à \fB-h (\-\-help)\fP.
+.TP
+.B \-h (\-\-help)
+Affiche un résumé des options de lancement de nano, puis s'arrête.
+.TP
+.B \-V (\-\-version)
+Affiche la version, puis s'arrête.
+.PP
+Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
+consulter la documentation complète de \fBnano\fP.
+
+.SH BOGUES
+Merci de nous faire parvenir vos commentaires et de nous signaler les
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+\fBnano-devel@gnu.org\fR.
+
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+
+N'hésitez pas également à envoyez vos commentaires, suggestions et
+corrections relatives à l'adaptation française de cette page de manuel
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+
+.SH "SITE INTERNET"
+http://www.nano-editor.org/
+
+.SH AUTEUR
+Chris Allegretta <chrisa@asty.org> et d'autres (voir le fichier
+\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
+Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
+elle peut être utilisée par d'autres).
+
+.SH TRADUCTION
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir
+de la version 1.19 du 6\ novembre\ 2007 de la page de manuel de rnano 
+(pour la version 2.0.0 de nano).
+
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
+traducteur.
+
+La version originale la plus à jour de ce document est toujours
+consultable via la commande\ :
+
+LANGUAGE=en man nano

doc/man/nano.1

@@ -1,12 +1,25 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nano.1 is copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 by
-.\" Chris Allegretta <chrisa@asty.org>
+.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.6" "March 11, 2005"
+.TH NANO 1 "version 2.0.0" "August 23, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -15,11 +28,11 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 
 .SH SYNOPSIS
 .B nano
-.I [\+LINE]\ [options]\ [file]
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
 .br
 
 .SH DESCRIPTION
-This manual page documents briefly the \fBnano\fP command.
+This manual page briefly documents the \fBnano\fP command.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
@@ -28,12 +41,17 @@ This manual page documents briefly the \fBnano\fP command.
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP
-Places cursor at \fILINE\fP on startup.
+.B \+\fILINE\fP,\fICOLUMN\fP
+Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
+.TP
+.B \-?
+Same as \fB-h (\-\-help)\fP.
 .TP
 .B \-A (\-\-smarthome)
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -46,25 +64,34 @@ line.
 When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 .TP
-.B \-E \fIdir\fP (\-\-backupdir=\fIdir\fP)
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
+.B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP)
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
+.TP
+.B \-D (\-\-boldtext)
+Use bold text instead of reverse video text.
+.TP
+.B \-E (\-\-tabstospaces)
+Convert typed tabs to spaces.
 .TP
 .B \-F (\-\-multibuffer)
 Enable multiple file buffers, if available.
 .TP
 .B \-H (\-\-historylog)
-Log search and replace strings to
-.I ~/.nano_history
-so they may be stored for later editing, if nanorc support is
-configured.
+Log search and replace strings to \fI~/.nano_history\fP, so they can be
+retrieved in later sessions, if nanorc support is available.
 .TP
 .B \-I (\-\-ignorercfiles)
-Don't look at
-.I SYSCONFDIR/nanorc
-or
-.IR ~/.nanorc ,
-if nanorc support is available.
+Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc
+support is available.
+.TP
+.B \-K (\-\-rebindkeypad)
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
+.TP
+.B \-L (\-\-nonewlines)
+Don't add newlines to the ends of files.
 .TP
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
@@ -74,37 +101,42 @@ Use the blank line below the titlebar as extra editing space.
 .TP
 .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
 Set the quoting string for justifying.  The default is
-"^([\ \\t]*[|>:}#])+" if regular expression support is available, or
-">\ " otherwise.
+"\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is
+available, or "\fI>\ \fP" otherwise.  Note that \fI\\t\fP stands for a
+Tab.
 .TP
-.B \-R (\-\-regexp)
-Enable regular expression matching for search strings, as well as
-\\n subexpression replacement for replace strings, if available.
+.B \-R (\-\-restricted)
+Restricted mode: don't read or write to any file not specified on the
+command line; read any nanorc files; allow suspending; allow a file
+to be appended to, prepended to, or saved under a different name if it
+already has one; or use backup files or spell checking.  Also accessible
+by invoking \fBnano\fP with any name beginning with 'r' (e.g. "rnano").
 .TP
 .B \-S (\-\-smooth)
 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
+keystroke instead of 25.  Note that \fB-c\fP overrides this.
 .TP
 .B \-V (\-\-version)
-Show the current version number and author.
+Show the current version number and exit.
+.TP
+.B \-W (\-\-wordbounds)
+Detect word boundaries more accurately by treating punctuation
+characters as part of a word.
 .TP
 .B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
-Specify a specific syntax highlighting from the
-.I nanorc
-to use, if available.
-.TP
-.B \-Z (\-\-restricted)
-Restricted mode: Don't read or write to any file not specified on the
-command line, read any nanorc files, allow suspending, or allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one.  Also accessible by invoking \fBnano\fP with any name
-beginning with 'r' (e.g. "rnano").
+Specify a specific syntax highlighting from the \fInanorc\fP to use, if
+available.
 .TP
 .B \-c (\-\-const)
-Constantly show the cursor position.
+Constantly show the cursor position.  Note that this overrides \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
 Interpret the Delete key differently so that both Backspace and Delete
@@ -112,7 +144,7 @@ work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
 .B \-h (\-\-help)
-Display a summary of command line options.
+Show a summary of command line options and exit.
 .TP
 .B \-i (\-\-autoindent)
 Indent new lines to the previous line's indentation.  Useful when
@@ -124,14 +156,16 @@ Enable cut from cursor to end of line.
 .B \-l (\-\-nofollow)
 If the file being edited is a symbolic link, replace the link with
 a new file instead of following it.  Good for editing files in
-.IR /tmp ,
-perhaps?
+\fI/tmp\fP, perhaps?
 .TP
 .B \-m (\-\-mouse)
-Enable mouse support (if available for your system).
+Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.
 .TP
 .B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
-Set operating directory.  Makes nano set up something similar to a
+Set operating directory.  Makes \fBnano\fP set up something similar to a
 chroot.
 .TP
 .B \-p (\-\-preserve)
@@ -139,16 +173,17 @@ 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.
 .TP
 .B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico's -t option.
+Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
+option.
 .TP
 .B \-v (\-\-view)
 View file (read only) mode.
@@ -167,41 +202,32 @@ Ignored, for compatibility with Pico.
 
 .SH INITIALIZATION FILE
 \fBnano\fP will read initialization files in the following order:
-.IR SYSCONFDIR/nanorc ,
-then
-.IR ~/.nanorc .
-Please see
-.BR nanorc (5)
-and the example file \fBnanorc.sample\fP which should be provided with
-\fBnano\fP.
+\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP.  Please see
+\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which
+should be provided with \fBnano\fP.
 
 .SH NOTES
 If no alternative spell checker command is specified on the command
 line or in one of the nanorc files, \fBnano\fP will check the
 \fBSPELL\fP environment variable for one.
 
-\fBnano\fP will try to dump the buffer into an emergency file in some
-cases.  Mainly, this will happen if \fBnano\fP receives a SIGHUP or
-SIGTERM or runs out of memory, when it will write the buffer into a file
-named
-.I nano.save
-if the buffer didn't have a name already, or will add a ".save" suffix
-to the current filename.  If an emergency file with that name already
-exists in the current directory, ".save" and a number (e.g. ".save.1")
-will be suffixed to the current filename in order to make it unique.  In
-multibuffer mode, \fBnano\fP will write all the open buffers to the
-respective emergency files.
+In some cases \fBnano\fP will try to dump the buffer into an emergency
+file.  This will happen mainly if \fBnano\fP receives a SIGHUP or
+SIGTERM or runs out of memory.  It will write the buffer into a file
+named \fInano.save\fP if the buffer didn't have a name already, or will
+add a ".save" suffix to the current filename.  If an emergency file with
+that name already exists in the current directory, it will add ".save"
+plus a number (e.g. ".save.1") to the current filename in order to make
+it unique.  In multibuffer mode, \fBnano\fP will write all the open
+buffers to their respective emergency files.
 
 .SH BUGS
-Please send any comments or bug reports to
-.BR nano@nano-editor.org .
+Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
 
-The \fBnano\fP mailing list is available from
-.BR nano-devel@gnu.org .
+The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
 
-To subscribe, email to
-.B nano-devel-request@gnu.org
-with a subject of "subscribe".
+To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
+of "subscribe".
 
 .SH HOMEPAGE
 http://www.nano-editor.org/
@@ -214,10 +240,7 @@ http://www.nano-editor.org/
 \fI/usr/share/doc/nano/\fP (or equivalent on your system)
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details). This manual page was originally written by Jordi Mallach
-<jordi@sindominio.net>, for the Debian GNU system (but may be used by
+Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
 others).

doc/man/nanorc.5

@@ -1,184 +1,525 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" nanorc.5 is Copyright (C) 2003, 2004, 2005 Free Software
-.\" Foundation, Inc.
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007
+.\" Free Software Foundation, Inc.
 .\"
-.\" This is free documentation, see the latest version of the GNU General
-.\" Public License for copying conditions.  There is NO warranty.
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.6" "March 11, 2005"
+.TH NANORC 5 "version 2.0.0" "August 23, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
 nanorc \- GNU nano's rcfile
 .SH DESCRIPTION
-This manual page documents GNU \fBnano\fP's rcfile.
+This manual page briefly documents GNU \fBnano\fP's rcfile.
 .PP
 \fBnano\fP is a small, free and friendly editor which aims to replace
 Pico, the default editor included in the non-free Pine package.  Rather
 than just copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line number".
+replace" and "go to line and column number".
 .PP
-The \fInanorc\fP file contains the default settings for \fBnano\fP.
-During startup, \fBnano\fP will first read its system-wide settings from
-.IR SYSCONFDIR/nanorc ,
-and then user-specific settings from
-.IR ~/.nanorc .
+The \fInanorc\fP file contains the default settings for \fBnano\fP.  It
+should not be in DOS or Mac format.  During startup, \fBnano\fP will
+first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and
+then user-specific settings from \fI~/.nanorc\fP.
 
 .SH OPTIONS
-The configuration file accepts a series of "set" and "unset" commands,
-which can be used to configure nano on startup without using the
-command-line options.  Additionally, the "syntax" and "color" keywords
-are used to define syntax highlighting rules for different text
-patterns.  GNU nano will read one command per line.
+The configuration file accepts a series of \fBset\fP and \fBunset\fP
+commands, which can be used to configure nano on startup without using
+the command line options.  Additionally, the \fBsyntax\fP, \fBcolor\fP,
+and \fBicolor\fP keywords are used to define syntax highlighting rules
+for different text patterns.  \fBnano\fP will read one command per line.
 
-Options in rcfiles take precedence over nano's defaults, and command
-line options override rcfile settings.
+Options in nanorc files take precedence over nano's defaults, and
+command line options override nanorc settings.  Also, options are unset
+by default, except for those that take arguments.
 
-Options are unset by default, except for options that take an argument.
+Quotes inside string parameters don't have to be escaped with
+backslashes.  The last double quote in the string will be treated as its
+end.  For example, for the \fBbrackets\fP option, "\fI"')>]}\fP" will
+match \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP, and \fI}\fP.
 
 The supported commands and arguments are:
 
 .TP 3
-\fBset/unset autoindent\fP
+.B set/unset autoindent
 Use auto-indentation.
 .TP
-\fBset/unset backup\fP
-Create backup files in
-.IR filename~ .
+.B set/unset backup
+Create backup files in \fIfilename~\fP.
 .TP
-\fBset backupdir "\fIdirectory\fP"\fP
-Set the directory where \fBnano\fP puts the backup files if file backups
-are enabled.
-\fBset brackets "\fIstring\fP"\fP
-Set the characters treated as closing brackets.  They cannot contain
-tabs or spaces.  Only closing punctuation, optionally followed by
-closing brackets, can end sentences.
+.B set backupdir "\fIdirectory\fP"
+Set the directory where \fBnano\fP puts unique backup files if file
+backups are enabled.
 .TP
-\fBset/unset const\fP
+.B set/unset backwards
+Do backwards searches by default.
+.TP
+.B set/unset boldtext
+Use bold text instead of reverse video text.
+.TP
+.B set brackets "\fIstring\fP"
+Set the characters treated as closing brackets when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is "\fI"')>]}\fP".
+.TP
+.B set/unset casesensitive
+Do case sensitive searches by default.
+.TP
+.B set/unset const
 Constantly display the cursor position in the status bar.
 .TP
-\fBset/unset cut\fP
+.B set/unset cut
 Use cut to end of line by default.
 .TP
-\fBset fill \fIn\fP\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.
+.B set fill \fIn\fP
+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
-\fBset/unset historylog\fP
-Enable
-.I ~/.nano_history
-for saving and reading search/replace strings.
+.B set/unset historylog
+Enable \fI~/.nano_history\fP for saving and reading search/replace
+strings.
 .TP
-\fBset/unset morespace\fP
-Allow use of the blank line below the titlebar as extra editing space.
+.B set matchbrackets "\fIstring\fP"
+Set the opening and closing brackets that can be found by bracket
+searches.  They cannot contain blank characters.  The former set must
+come before the latter set, and both must be in the same order.  The
+default value is "\fI(<[{)>]}\fP".
 .TP
-\fBset/unset mouse\fP
-Enable mouse support, so that mouse clicks can be used to set the mark
-and run shortcuts.
+.B set/unset morespace
+Use the blank line below the titlebar as extra editing space.
 .TP
-\fBset/unset multibuffer\fP
+.B set/unset mouse
+Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.
+.TP
+.B set/unset multibuffer
 Allow inserting files into their own buffers.
 .TP
-\fBset/unset noconvert\fP
+.B set/unset noconvert
 Don't convert files from DOS/Mac format.
 .TP
-\fBset/unset nofollow\fP
+.B set/unset nofollow
 Don't follow symlinks when writing files.
 .TP
-\fBset/unset nohelp\fP
+.B set/unset nohelp
 Don't display the help lists at the bottom of the screen.
 .TP
-\fBset/unset nowrap\fP
+.B set/unset nonewlines
+Don't add newlines to the ends of files.
+.TP
+.B set/unset nowrap
 Don't wrap text at all.
 .TP
-\fBset operatingdir "\fIdirectory\fP"\fP
+.B set operatingdir "\fIdirectory\fP"
 \fBnano\fP will only read and write files inside \fIdirectory\fP and its
 subdirectories.  Also, the current directory is changed to here, so
-files are inserted from this dir.  By default the operating directory
-feature is turned off.
+files are inserted from this diractory.  By default, the operating
+directory feature is turned off.
 .TP
-\fBset/unset preserve\fP
+.B set/unset preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 .TP
-\fBset punct "\fIstring\fP"\fP
-Set the characters treated as closing punctuation.  They cannot contain
-tabs or spaces.  Only closing punctuation, optionally followed by
-closing brackets, can end sentences.
+.B set punct "\fIstring\fP"
+Set the characters treated as closing punctuation when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is "\fI!.?\fP".
 .TP
-\fBset quotestr "\fIstring\fP"\fP
+.B set/unset quickblank
+Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.
+.TP
+.B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
-is an "extended regular expression" if your system supports them,
+is an extended regular expression if your system supports them,
 otherwise a literal string.  The default value is
-
-	set quotestr "^([\ \\t]*[|>:}#])+"
-
-if you have regexps, otherwise set quotestr ">\ ".  Note that '\\t'
-above stands for a literal Tab character.
+"\fI^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
+support, or "\fI>\ \fP" otherwise.  Note that '\\t' stands for a literal
+Tab character.
 .TP
-\fBset/unset rebinddelete\fP
+.B set/unset rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-\fBset/unset regexp\fP
-Do regular expression searches by default.
+.B set/unset rebindkeypad
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
 .TP
-\fBset/unset smarthome\fP
+.B set/unset regexp
+Do extended regular expression searches by default.
+.TP
+.B set/unset smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-\fBset/unset smooth\fP
+.B set/unset smooth
 Use smooth scrolling by default.
 .TP
-\fBset speller \fIspellprog\fP\fP
+.B set speller "\fIspellprog\fP"
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
-\fBset/unset suspend\fP
-Allow nano to be suspended.
+.B set/unset suspend
+Allow \fBnano\fP to be suspended.
 .TP
-\fBset tabsize \fIn\fP\fP
-Use a tab size of \fIn\fP columns instead of the default (8); must be
-greater than 0.
+.B set tabsize \fIn\fP
+Use a tab size of \fIn\fP columns.  The value of \fIn\fP must be greater
+than 0.  The default value is 8.  
 .TP
-\fBset/unset tempfile\fP
+.B set/unset tabstospaces
+Convert typed tabs to spaces.
+.TP
+.B set/unset tempfile
 Save automatically on exit, don't prompt.
 .TP
-\fBset/unset view\fP
+.B set/unset view
 Disallow file modification.
 .TP
-\fBset whitespace "\fIstring\fP"\fP
+.B set whitespace "\fIstring\fP"
 Set the two characters used to display the first characters of tabs and
-spaces.  They cannot be control characters.
+spaces.  They must be single-column characters.
+.TP
+.B set/unset wordbounds
+Detect word boundaries more accurately by treating punctuation
+characters as parts of words.
 .TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
-Defines a syntax named \fIstr\fP which can be activated via the \fB-Y\fP
-flag, or will be automatically activated if the current filename matches
-\fIfileregex\fP.  All following \fBcolor\fP statements will apply to
-\fIsyntax\fP until a new syntax is defined.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] "\fIregex\fP" ...
-For the currently defined syntax, display all expressions matching
-\fIregex\fP with foreground color \fIfgcolor\fP and optional background
-color \fIbgcolor\fP.  Legal colors for foreground and background color
-are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to force a stronger color highlight.  If your
-terminal supports transparency, not specifying a \fIbgcolor\fP tells
-\fBnano\fP to attempt to use a transparent background.
-.TP
-.B color \fIfgcolor\fP[,\fIbgcolor\fP] start="\fIsr\fP" end="\fIer\fP"
-Display expressions which start with \fIsr\fP and end with \fIer\fP
-with foreground color \fIfgcolor\fP and optional background color
-\fIbgcolor\fP.  This allows syntax 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.
-\fI
+Defines a syntax named \fIstr\fP 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
+\fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
+will apply to \fIsyntax\fP 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
+special: it takes no \fIfileregex\fP, and applies to files that don't
+match any other syntax's \fIfileregex\fP.
+.TP
+.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+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
+must be specified.  Legal colors for foreground and background color
+are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
+use the prefix "bright" to force a stronger color highlight for the
+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" ...
+Same as above, except that the expression matching is case insensitive.
+.TP
+.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+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,
+at least one of which must be specified.  This allows syntax
+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"
+Same as above, except that the expression matching is case insensitive.
+.TP
+.B include "\fIsyntaxfile\fP"
+Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
+\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
+\fBicolor\fP commands.
+.SH KEY BINDINGS
+Key bindings may be reassigned via the following commands:
+.TP
+.B bind \fIkey\fP \fIfunction\fP  \fImenu\fP
+Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
+context of menu \fImenu\fP.  The format of  \fIkey\fP should be one of:
+.TP
+.B ^ 
+followed by an alpha character or the word "Space".
+Example: ^C
+.TP
+.B M- 
+followed by a prinable character or the word "Space".
+Example: M-C
+.TP
+.B F 
+followed by a numeric value from 1 to 16.
+Example: F10
+.TP
+Valid function names to be bound include:
+.TP 3
+.B help
+Invoke the help menu.
+.TP
+.B cancel
+Cancel the current command.
+.TP
+.B exit
+Exit from the program.
+.TP
+.B writeout
+Write the current buffer to disk.
+.TP
+.B justify
+Justify the current text.
+.TP
+.B insert
+Insert a file into the current buffer (or into a new buffer when multibuffer
+is enabled).
+.TP
+.B whereis
+Search for text in the current buffer.
+.TP
+.B searchagain
+Repeat the last search command.
+.TP
+.B up
+Move up in the editor or browser.
+.TP
+.B down
+Move down in the editor or browser.
+.TP
+.B left
+Move left in the editor or browser.
+.TP
+.B right
+Move right in the editor or browser.
+.TP
+.B cut
+Cut the current line of text and store it.
+.TP
+.B uncut
+Copy the currently stored text into the current buffer position.
+.TP
+.B curpos
+Show the current line, column, word positions in the file.
+.TP
+.B firstline
+Move to the first line of the file.
+.TP
+.B lastline
+Move to the last line of the file.
+.TP
+.B gotoline
+Move to a specific line (and column if specified).
+.TP
+.B replace
+Interactively replace text within the current buffer.
+.TP
+.B mark
+Begin selecting text for cutting or pasting at the current position.
+.TP
+.B copytext
+Copy the currently marked text without deleting it.
+.TP
+.B indent
+Indent the currently marked text (shift to the right).
+.TP
+.B unindent
+Un-indent the currently marked text (shift to the left).
+.TP
+.B nextword
+Move the cursor to the beginning of the next word.
+.TP
+.B prevword
+Move the cursor to the beginning of the previous word.
+.TP
+.B home
+Move the cursor to the beginning of the current line.
+.TP
+.B end
+Move the cursor to the end of the current line.
+.TP
+.B beginpara
+Move the cursor to the beginning of the current paragraph.
+.TP
+.B endpara
+Move the cursor to the end of the current paragraph.
+.TP
+.B findbracket
+Move the cursor to the matching bracket (brace, parenthesis, etc.) of the one
+under the cursor.
+.TP
+.B scrollup
+Scroll up one line of text from the current position.
+.TP
+.B scrolldown
+Scroll down one line of text from the current position.
+.TP
+.B prevbuf
+Switch to editing/viewing the previous buffer when using multibuffer mode.
+.TP
+.B nextbuf
+Switch to editing/viewing the next buffer when using multibuffer mode.
+.TP
+.B verbatim
+Insert the next character verbatim into the file.
+.TP
+.B tab
+Insert a tab at the current cursor location.
+.TP
+.B enter
+Insert a new line below the current one.
+.TP
+.B delete
+Delete the character under the cursor.
+.TP
+.B fulljustify
+Justify the entire current file.
+.TP
+.B wordcount
+Count the number of words in the current buffer.
+.TP
+.B refresh
+Refresh the screen.
+.TP
+.B undo
+Undo the text action peformed (add text, delete text, etc).
+.TP
+.B redo
+"Re-do" the last undone action (i.e. undo an undo)
+.TP
+.B suspend
+Suspend the editor (if the suspend function is enabled, see the 
+"suspendenable" entry below).
+.TP
+.B casesens
+Toggle case sensitivity in searching (search/replace menus only).
+.TP
+.B regexp
+Toggle whether searching/replacing is based on literal strings or regular expressions.
+.TP
+.B prevhistory
+Show the previous history entry in the prompt menus (e.g. search).
+.TP
+.B nexthistory
+Show the next history entry in the prompt menus (e.g. search).
+.TP
+.B dontreplace
+Switch back to searching instead of replacing.
+.TP
+.B gototext
+Search for files matching a string in the file browser (reading or writing files).
+.TP
+.B dosformat
+When writing a file, switch to writing a DOS format (CR/LF).
+.TP
+.B macformat
+When writing a file, switch to writing a Mac format.
+.TP
+.B append
+When writing a file, append to the end instead of overwriting.
+.TP
+.B prepend
+When writing a file, 'prepend' (write at the beginning) instead of overwriting.
+.TP
+.B backup
+When writing a file, create a backup of the current file.
+.TP
+.B firstfile
+Move to the first file when using the file browser (reading or writing files).
+.TP
+.B lastfile
+Move to the last file when using the file browser (reading or writing files).
+.TP
+.B nohelp
+Toggle showing/hiding the two-line list of key bindings at the bottom of the screen.
+.TP
+.B constupdate
+Constantly display the current line, column, word positions.
+.TP
+.B morespace
+Toggle showing/hiding the blank line which 'separates' the 'title' from the file text.
+.TP
+.B smoothscroll
+Toggle smooth scrolling when moving via the arrow keys.
+.TP
+.B whitespacedisplay
+Toggle whether whitespace is shown.
+.TP
+.B smarthome
+Toggle whether the smart home key function is enabled.
+.TP
+.B autoindent
+Toggle whether new lines will contain the same amount of whitespace as the line above.
+.TP
+.B cuttoend
+Toggle whether cutting text will cut the whole line or just from the current cursor
+position to the end of the line.
+.TP
+.B nowrap
+Toggle whether long lines will be wrapped to the next line.
+.TP
+.B suspendenable
+Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
+.TP
+
+Valid menu sections are:
+.TP
+.B main
+The main editor window where text is entered.
+.TP
+.B search
+The search menu (AKA whereis).
+.TP
+.B replace
+The 'search to replace' menu.
+.TP
+.B replacewith
+The 'replace with' menu, which comes up after 'search to replace'.
+.TP
+.B gotoline
+The 'goto line (and column)' menu.
+.TP
+.B writeout
+The 'write file' menu.
+.TP
+.B insert
+The 'insert file' menu.
+.TP
+.B extcmd
+The menu for inserting output from an external comman, reached from the insert menu.
+.TP
+.B help
+The help menu.
+.TP
+.B spell
+The interactive spell checker Yes/no menu.
+.TP
+.B browser
+The file browser for inserting or writing a file.
+.TP
+.B whereisfile
+The 'search for a file' menu in the file browser.
+.TP
+.B gotodir
+The 'go to directory' menu.
+.TP
+.B all
+A special name meaning: apply to all menus where this function exists.
 .SH FILES
 .TP
 .I SYSCONFDIR/nanorc
@@ -194,9 +535,7 @@ Per-user configuration file
 \fI/usr/share/doc/nano/examples/nanorc.sample\fP (or equivalent on your
 system)
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see
-.I AUTHORS
-and
-.I THANKS
-for details).
-This manual page was written by Jordi Mallach <jordi@gnu.org>.
+Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+\fITHANKS\fP for details).  This manual page was originally written by
+Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
+others).

doc/man/rnano.1

@@ -0,0 +1,98 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+.\" Skeleton based on nano-tiny.1:
+.\" Copyright (C) 2002 Free Software Foundation, Inc.
+.\"
+.\" This document is dual-licensed.  You may distribute and/or modify it
+.\" under the terms of either of the following licenses:
+.\"
+.\" * The GNU General Public License, as published by the Free Software
+.\"   Foundation, version 3 or (at your option) any later version.  You
+.\"   should have received a copy of the GNU General Public License
+.\"   along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" * The GNU Free Documentation License, as published by the Free
+.\"   Software Foundation, version 1.2 or (at your option) any later
+.\"   version, with no Invariant Sections, no Front-Cover Texts, and no
+.\"   Back-Cover Texts.  You should have received a copy of the GNU Free
+.\"   Documentation License along with this program.  If not, see
+.\"   <http://www.gnu.org/licenses/>.
+.\"
+.\" $Id$
+.TH RNANO 1 "version 2.0.0" "August 23, 2007"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.SH NAME
+rnano \- Restricted mode for Nano's ANOther editor, an enhanced free
+Pico clone
+
+.SH SYNOPSIS
+.B rnano
+.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
+.br
+
+.SH DESCRIPTION
+This manual page briefly documents the \fBrnano\fP command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
+.\" respectively.
+\fBnano\fP is a small, free and friendly editor which aims to replace
+Pico, the default editor included in the non-free Pine package. Rather
+than just copying Pico's look and feel, \fBnano\fP also implements some
+missing (or disabled by default) features in Pico, such as "search and
+replace" and "go to line and column number".
+.PP
+\fBrnano\fP is a restricted version of \fBnano\fP, which only edits
+specific files and doesn't allow the user access to the filesystem or a
+command shell.
+.PP
+In restricted mode, \fBnano\fP will \fInot\fP:
+.IP \[bu] 2
+read or write to any file not specified on the command line;
+.IP \[bu]
+read any nanorc files;
+.IP \[bu]
+allow suspending;
+.IP \[bu]
+allow a file to be appended to, prepended to, or saved under a different
+name;
+.IP \[bu]
+use backup files or spell checking.
+
+.SH OPTIONS
+.TP
+.B \+\fILINE\fP,\fICOLUMN\fP
+Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+(at least one of which must be specified) on startup, instead of the
+default of line 1, column 1.
+.TP
+.B \-?
+Same as \fB-h (\-\-help)\fP.
+.TP
+.B \-h (\-\-help)
+Show a summary of command line options and exit.
+.TP
+.B \-V (\-\-version)
+Show the current version number and exit.
+.PP
+See the \fBnano\fP(1) manpage for the complete documentation of
+\fBnano\fP.
+
+.SH BUGS
+Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
+
+The \fBnano\fP mailing list is available from \fBnano-devel@gnu.org\fP.
+
+To subscribe, email to \fBnano-devel-request@gnu.org\fP with a subject
+of "subscribe".
+
+.SH HOMEPAGE
+http://www.nano-editor.org/
+
+.SH AUTHOR
+Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
+This manual page was originally written by Thijs Kinkhorst
+<thijs@kinkhorst.com>, for the Debian system (but may be used by
+others).

doc/nanorc.sample

@@ -1,268 +0,0 @@
-## Sample initialization file for GNU nano
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read!  Also note that characters specially
-## interpreted by the shell should not be escaped here.
-##
-## To make sure a value is not enabled, use "unset <option>"
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-
-## Use auto-indentation.
-# set autoindent
-
-## Backup files to filename~.
-# set backup
-
-## The directory to put the backup files in.
-# set backupdir ""
-
-## The characters treated as closing brackets.  They cannot contain tabs
-## or spaces.  Only closing punctuation, optionally followed by closing
-## brackets, can end sentences.
-##
-# set brackets "'")}]>"
-
-## Constantly display the cursor position in the status bar.
-# set const
-
-## Use cut to end of line by default.
-# 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
-## this number.
-##
-# set fill -8
-
-## Enable ~/.nano_history for saving and reading search/replace strings.
-# set historylog
-
-## Use the blank line below the titlebar as extra editing space.
-# set morespace
-
-## Enable mouse support, so that mouse clicks can be used to set the
-## mark and run shortcuts.
-# set mouse
-
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer).  You must have configured with --enable-multibuffer
-## or --enable-extra for this to work.
-##
-# set multibuffer
-
-## Don't convert files from DOS/Mac format.
-# set noconvert
-
-## Don't follow symlinks when writing files.
-# set nofollow
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-# set nohelp
-
-## Don't wrap text at all.
-# set nowrap
-
-## Set operating directory.  nano will not read or write files outside
-## this directory and its subdirectories.  Also, the current directory
-## is changed to here, so files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
-# set operatingdir ""
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation.  They cannot contain
-## tabs or spaces.  Only closing punctuation, optionally followed by
-## closing brackets, can end sentences.
-##
-# set punct ".?!"
-
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.  Default:
-# set quotestr "^([ 	]*[\|>:}#])+"
-## if you have regexps, otherwise:
-# set quotestr "> "
-## You can get old nano quoted-justify behavior via:
-# set quotestr "(> )+"
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Do extended regular expression searches by default.
-# set regexp
-
-## Make the Home key smarter.  When Home is pressed anywhere but at the
-## very beginning of non-whitespace characters on a line, the cursor
-## will jump to that beginning (either forwards or backwards).  If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
-# set smarthome
-
-## Use smooth scrolling as the default.
-# set smooth
-
-## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
-##
-# set speller "aspell -x -c"
-
-## Allow nano to be suspended.
-# set suspend
-
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Save automatically on exit, don't prompt.
-# set tempfile
-
-## Disallow file modification; why would you want this in an rcfile? ;)
-# set view
-
-## The two characters used to display the first characters of tabs and
-## spaces.  187 decimal (00BB hexadecimal) and 183 decimal (00B7
-## hexadecimal) seem to be good values for these.
-# set whitespace "  "
-
-## Color setup
-## Format:
-## syntax "short description" ["filename regex" ...]
-## color foreground,background "regex" ["regex"...]
-##
-## Legal colors: white, black, red, blue, green, yellow, magenta, cyan.
-## You may use the prefix "bright" to mean a stronger color highlight.
-##
-## To use multi-line regexes use the start="regex" end="regex" format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color.  If you don't want this, be sure
-## to set the background color to black or white.
-##
-# syntax "c-file" "\.(c|h)$"
-# color red "\<[A-Z_]{2,}\>" 
-# color green "\<(float|double|char|int|short|long|enum|void|static|const|struct|union|typedef|extern|signed|unsigned|inline)\>"
-# color brightyellow "\<(for|if|while|do|else|case|switch|goto|continue|break|return)\>"
-# color brightcyan "^ *# *(define|undef|include|ifn?def|endif|elif|else|if)"
-# color brightmagenta "'([^\]|(\\['abfnrtv\\]))'" "'\\(([0-7][0-7]?)|([0-3][0-7][0-7]))'" "'\\x[0-9A-Fa-f][0-9A-Fa-f]?'"
-##
-## You will in general want your comments and strings to come last,
-## because syntax highlighting rules will be applied in the order they
-## are read in.
-##
-# color brightyellow "<[^= ]*>" ""(\\.|[^\"])*""
-##
-## This string is VERY resource intensive!!!
-# color brightyellow start=""(\\.|[^\"])*\\ *$" end="^(\\.|[^\"])*""
-##
-## And we want to have some nice comment highlighting too
-# color brightblue "//.*"
-# color brightblue start="/\*" end="\*/"
-
-## Here is a short example for HTML
-# syntax "HTML" "\.html$"
-# color blue start="<" end=">"
-# color red "&[^; ]*;"
-
-## Here is a short example for TeX files
-# syntax "TeX" "\.tex$"
-# color green "\\.|\\[A-Za-z]*"
-# color magenta "[{}]"
-# color blue "%.*"
-
-## Here is an example for quoted emails (under e.g. mutt)
-# syntax "mutt"
-# color green "^>.*"
-
-## Here is an example for groff
-##
-# syntax "groff" "\.ms$" "\.mm$" "\.me$" "\.tmac$" "^tmac." ".rof"
-## The argument of .nr or .ds
-# color cyan "^\.ds [^ ]*"
-# color cyan "^\.nr [^ ]*"
-## Single character escapes
-# color brightmagenta "\\."
-## Highlight the argument of \f or \s in the same color
-# color brightmagenta "\\f."
-# color brightmagenta "\\f\(.."
-# color brightmagenta "\\s(\+|\-)?[0-9]"
-## \n
-# color cyan "(\\|\\\\)n."
-# color cyan "(\\|\\\\)n\(.."
-# color cyan start="(\\|\\\\)n\[" end="]"
-## Requests
-# color brightgreen "^\. *[^ ]*"
-## Comments
-# color yellow "^\.\\\".*$"
-## Strings
-# color green "(\\|\\\\)\*."
-# color green "(\\|\\\\)\*\(.."
-# color green start="(\\|\\\\)\*\[" end="]"
-## Characters
-# color brightred "\\\(.."
-# color brightred start="\\\[" end="]"
-## Macro arguments
-# color brightcyan "\\\\\$[1-9]"
-
-## Here is an example for perl
-##
-# syntax "perl" "\.p[lm]$"
-# color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
-# color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
-# color cyan start="[$@%]" end="( |\\W|-)"
-# color yellow "".*"|qq\|.*\|"
-# color white "[sm]/.*/"
-# color white start="(^use| = new)" end=";"
-# color green "#.*"
-# color yellow start="<< 'STOP'" end="STOP"
-
-## Here is an example for Java source
-##
-# syntax "Java source" "\.java$"
-# color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
-# color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-# color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
-# color red ""[^\"]*""
-# color yellow "\<(true|false|null)\>"
-# color blue "//.*"
-# color blue start="/\*" end="\*/"
-# color brightblue start="/\*\*" end="\*/"
-# color brightgreen,green " +$"
-
-## Here is an example for patch files
-##
-# syntax "patch" "\.(patch|diff)$"
-# color brightgreen "^\+.*"
-# color green "^\+\+\+.*"
-# color brightblue "^ .*"
-# color brightred "^-.*"
-# color red "^---.*"
-# 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 brightwhite "\\f[BIPR]"
-# color yellow "\.(br|DS|RS|RE|PD)"
-
-## Here is an example for your .nanorc
-##
-# syntax "nanorc" "(\.|/|)nanorc$"
-## highlight possible errors and parameters
-# color brightwhite "^ *(set|unset|syntax|color).*$"
-## set, unset and syntax
-# color cyan "^ *(set|unset) +(autoindent|backup|backupdir|brackets|const|cut|fill|historylog|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|punct|quotestr|rebinddelete|regexp|smarthome|smooth|speller|suspend|tabsize|tempfile|view|whitespace)"
-# color green "^ *(set|unset|syntax)\>"
-## colors
-# color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-# color magenta "^ *color\>" "\<(start|end)="
-## strings
-# color white "\"(\\.|[^\"])*\""
-## comments
-# color blue "^ *#.*$"

doc/nanorc.sample.in

@@ -0,0 +1,293 @@
+## Sample initialization file for GNU nano.
+##
+## Please note that you must have configured nano with --enable-nanorc
+## for this file to be read!  Also note that this file should not be in
+## DOS or Mac format, and that characters specially interpreted by the
+## shell should not be escaped here.
+##
+## To make sure a value is disabled, use "unset <option>".
+##
+## For the options that take parameters, the default value is given.
+## Other options are unset by default.
+##
+## Quotes inside string parameters don't have to be escaped with
+## backslashes.  The last double quote in the string will be treated as
+## its end.  For example, for the "brackets" option, ""')>]}" will match
+## ", ', ), >, ], and }.
+
+## Use auto-indentation.
+# set autoindent
+
+## Backup files to filename~.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Do backwards searches by default.
+# set backwards
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## The characters treated as closing brackets when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+##
+# set brackets ""')>]}"
+
+## Do case sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the statusbar.  Note that
+## this overrides "quickblank".
+# set const
+
+## Use cut to end of line by default.
+# set cut
+
+## Set the line length for wrapping text and justifying paragraphs.
+## If fill is 0 or less, the line length will be the screen width less
+## this number.
+##
+# set fill -8
+
+## Enable ~/.nano_history for saving and reading search/replace strings.
+# set historylog
+
+## The opening and closing brackets that can be found by bracket
+## searches.  They cannot contain blank characters.  The former set must
+## come before the latter set, and both must be in the same order.
+##
+# set matchbrackets "(<[{)>]}"
+
+## Use the blank line below the titlebar as extra editing space.
+# set morespace
+
+## Enable mouse support, if available for your system.  When enabled,
+## mouse clicks can be used to place the cursor, set the mark (with a
+## double click), and execute shortcuts.  The mouse will work in the X
+## Window System, and on the console when gpm is running.
+##
+# set mouse
+
+## Allow multiple file buffers (inserting a file will put it into a
+## separate buffer).  You must have configured with --enable-multibuffer
+## for this to work.
+##
+# set multibuffer
+
+## Don't convert files from DOS/Mac format.
+# set noconvert
+
+## Don't follow symlinks when writing files.
+# set nofollow
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't add newlines to the ends of files.
+# set nonewlines
+
+## Don't wrap text at all.
+# set nowrap
+
+## Set operating directory.  nano will not read or write files outside
+## this directory and its subdirectories.  Also, the current directory
+## is changed to here, so any files are inserted from this dir.  A blank
+## string means the operating directory feature is turned off.
+##
+# set operatingdir ""
+
+## Preserve the XON and XOFF keys (^Q and ^S).
+# set preserve
+
+## The characters treated as closing punctuation when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+##
+# set punct "!.?"
+
+## Do quick statusbar blanking.  Statusbar messages will disappear after
+## 1 keystroke instead of 26.  Note that "const" overrides this.
+##
+# set quickblank
+
+## The email-quote string, used to justify email-quoted paragraphs.
+## This is an extended regular expression if your system supports them,
+## otherwise a literal string.  Default:
+# set quotestr "^([ 	]*[#:>\|}])+"
+## if you have extended regular expression support, otherwise:
+# set quotestr "> "
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Fix numeric keypad key confusion problem.
+# set rebindkeypad
+
+## Do extended regular expression searches by default.
+# set regexp
+
+## Make the Home key smarter.  When Home is pressed anywhere but at the
+## very beginning of non-whitespace characters on a line, the cursor
+## will jump to that beginning (either forwards or backwards).  If the
+## cursor is already at that position, it will jump to the true
+## beginning of the line.
+# set smarthome
+
+## Use smooth scrolling as the default.
+# set smooth
+
+## Use this spelling checker instead of the internal one.  This option
+## does not properly have a default value.
+##
+# set speller "aspell -x -c"
+
+## Allow nano to be suspended.
+# set suspend
+
+## Use this tab size instead of the default; it must be greater than 0.
+# set tabsize 8
+
+## Convert typed tabs to spaces.
+# set tabstospaces
+
+## Save automatically on exit, don't prompt.
+# set tempfile
+
+## Disallow file modification.  Why would you want this in an rcfile? ;)
+# set view
+
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
+# set whitespace "  "
+
+## Detect word boundaries more accurately by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+
+## Color setup
+##
+## Format:
+##
+## syntax "short description" ["filename regex" ...]
+##
+## 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 filename regexes, and applies to files that
+## don't match any other syntax's filename regexes.
+##
+## color foreground,background "regex" ["regex"...]
+## or
+## icolor foreground,background "regex" ["regex"...]
+##
+## "color" will do case sensitive matches, while "icolor" will do case
+## insensitive matches.
+##
+## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
+## For foreground colors, you may use the prefix "bright" to get a
+## stronger highlight.
+##
+## To use multi-line regexes, use the start="regex" end="regex"
+## [start="regex" end="regex"...] format.
+##
+## If your system supports transparency, not specifying a background
+## color will use a transparent color.  If you don't want this, be sure
+## to set the background color to black or white.
+##
+## If you wish, you may put your syntaxes in separate files.  You can
+## make use of such files (which can only include "syntax", "color", and
+## "icolor" commands) as follows:
+##
+## include "/path/to/syntax_file.nanorc"
+##
+## Unless otherwise noted, the name of the syntax file (without the
+## ".nanorc" extension) should be the same as the "short description"
+## name inside that file.  These names are kept fairly short to make
+## them easier to remember and faster to type using nano's -Y option.
+##
+## All regexes should be extended regular expressions.
+
+## Key bindings
+## Please see nanorc(5) for more details on this
+##
+## Here are some samples to get you going
+##
+# bind M-W nowrap main
+# bind M-A casesens search
+# bind ^S research main
+
+## Set this if your backspace key sends delete most of the time (2.1.3+)
+# bind kdel backspace all
+
+
+## Nanorc files
+# include "@PKGDATADIR@/nanorc.nanorc"
+
+## C/C++
+# include "@PKGDATADIR@/c.nanorc"
+
+## Cascading Style Sheets
+# include "@PKGDATADIR@/css.nanorc"
+
+## Debian files
+# include "@PKGDATADIR@/debian.nanorc"
+
+## Gentoo files
+# include "@PKGDATADIR@/gentoo.nanorc"
+
+## HTML
+# include "@PKGDATADIR@/html.nanorc"
+
+## PHP
+# include "@PKGDATADIR@/php.nanorc"
+
+## TCL
+# include "@PKGDATADIR@/tcl.nanorc"
+
+## TeX
+# include "@PKGDATADIR@/tex.nanorc"
+
+## Quoted emails (under e.g. mutt)
+# include "@PKGDATADIR@/mutt.nanorc"
+
+## Patch files
+# include "@PKGDATADIR@/patch.nanorc"
+
+## Manpages
+# include "@PKGDATADIR@/man.nanorc"
+
+## Groff
+# include "@PKGDATADIR@/groff.nanorc"
+
+## Perl
+# include "@PKGDATADIR@/perl.nanorc"
+
+## Python
+# include "@PKGDATADIR@/python.nanorc"
+
+## Ruby
+# include "@PKGDATADIR@/ruby.nanorc"
+
+## Java
+# include "@PKGDATADIR@/java.nanorc"
+
+## AWK
+# include "@PKGDATADIR@/awk.nanorc"
+
+## Assembler
+# include "@PKGDATADIR@/asm.nanorc"
+
+## Bourne shell scripts
+# include "@PKGDATADIR@/sh.nanorc"
+
+## POV-Ray
+# include "@PKGDATADIR@/pov.nanorc"
+
+## XML-type files
+# include "@PKGDATADIR@/xml.nanorc"

doc/syntax/Makefile.am

@@ -0,0 +1,27 @@
+pkgdata_DATA =	asm.nanorc \
+		c.nanorc \
+		groff.nanorc \
+		html.nanorc \
+		java.nanorc \
+		man.nanorc \
+		mutt.nanorc \
+		nanorc.nanorc \
+		patch.nanorc \
+		perl.nanorc \
+		pov.nanorc \
+		python.nanorc \
+		ruby.nanorc \
+		sh.nanorc \
+		tex.nanorc \
+		tcl.nanorc \
+		php.nanorc \
+		gentoo.nanorc \
+		debian.nanorc \
+		awk.nanorc \
+		css.nanorc \
+		xml.nanorc \
+		ocaml.nanorc \
+		objc.nanorc \
+		fortran.nanorc
+
+EXTRA_DIST = $(pkgdata_DATA)

doc/syntax/asm.nanorc

@@ -0,0 +1,17 @@
+## Here is an example for assembler.
+##
+syntax "asm" "\.(S|s|asm)$"
+color red "\<[A-Z_]{2,}\>"
+color brightgreen "\.(data|subsection|text)"
+color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
+color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
+icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
+## Highlight strings (note: VERY resource intensive)
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+## Highlight comments
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+## Highlight trailing whitespace
+color ,green "[[:space:]]+$"

doc/syntax/awk.nanorc

@@ -0,0 +1,38 @@
+## Here is an example for awk.
+##
+syntax "awk" "\.awk$"
+## records
+icolor brightred "\$[0-9A-Z_!@#$*?-]+"
+## awk-set variables
+color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
+color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
+color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
+## function declarations and special patterns
+color brightgreen "\<(function|extension|BEGIN|END)\>"
+## operators
+color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
+## flow control
+color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
+color brightyellow "\<(break|continue|return)\>"
+## I/O statements
+color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
+color brightgreen "\<(system|fflush)\>"
+## standard functions
+color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
+color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
+color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
+color magenta "\<(mktime|strftime|systime)\>"
+color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
+color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
+
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+## Comment highlighting
+color brightblue "(^|[[:space:]])#.*$"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"

doc/syntax/c.nanorc

@@ -0,0 +1,30 @@
+## Here is an example for C/C++.
+##
+syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+color brightred "\<[A-Z_][0-9A-Z_]+\>" 
+color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
+color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
+color magenta "\<(goto|continue|break|return)\>"
+color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+##
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+##
+## This string is VERY resource intensive!
+color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+## Comment highlighting
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"

doc/syntax/css.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for css files.
+##
+syntax "css" "\.css$"
+color brightred     "."
+color brightyellow  start="\{" end="\}"
+color brightwhite   start=":" end="([;^\{]|$)"
+color brightblue    ":active|:focus|:hover|:link|:visited|:link|:after|:before|$"
+color brightblue    start="\/\*" end="\\*/"
+color green         ";|:|\{|\}"

doc/syntax/debian.nanorc

@@ -0,0 +1,20 @@
+## Here is an exmaple for apt's sources.list
+## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
+## (mail@milianw.de).
+##
+syntax "apt/sources.list" "sources\.list(\.old|~)?$"
+# component
+color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
+# distribution
+color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+# URI
+color brightgreen "(http|file|ftp):/[^ ]+"
+# cdroms
+# [^\]] does not work...
+color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
+# deb / deb-src
+color yellow "^deb"
+color yellow "^deb-src"
+# comments
+color brightblue "#.*"
+

doc/syntax/fortran.nanorc

@@ -0,0 +1,41 @@
+## Here is an example for Fortran 90/95
+
+syntax "fortran" "\.(f|f90|f95)$" 
+
+#color red "\<[A-Z_]a[0-9A-Z_]+\>" 
+color red "\<[0-9]+\>" 
+
+icolor green "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
+icolor green "\<(append|asis|assign|assignment|associated|character|common)\>"
+icolor green "\<(complex|data|default|delim|dimension|double precision)\>"
+icolor green "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
+icolor green "\<(implicit|include|index|inquire|integer|intent|interface)\>"
+icolor green "\<(intrinsic|iostat|kind|logical|module|none|null|only)>"
+icolor green "\<(operator|optional|pack|parameter|pointer|position|private)\>"
+icolor green "\<(program|public|real|recl|recursive|selected_int_kind)\>"
+icolor green "\<(selected_real_kind|subroutine|status)\>"
+
+icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
+icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
+icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
+icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
+icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
+icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
+icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>" 
+icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
+icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
+icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
+icolor cyan "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+
+icolor yellow "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
+icolor yellow "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
+icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
+
+icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
+
+## String highlighting.  
+icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
+
+## Comment highlighting
+icolor blue "!.*"
+

doc/syntax/gentoo.nanorc

@@ -0,0 +1,55 @@
+## Here is an example for Gentoo ebuilds/eclasses
+##
+syntax "ebuild" "\.e(build|class)$"
+## All the standard portage functions
+color brightgreen "^src_(unpack|prepare|configure|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+## Highlight bash related syntax
+color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
+color green "\<(declare|eval|exec|let)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "-[edfgruwxL]\>"
+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+## Highlight variables ... official portage ones in red, all others in bright red
+color brightred "\$\{?[a-zA-Z_0-9]+\}?"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
+color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" "\<WANT_AUTO(CONF|MAKE)\>" "\<AT_M4DIR\>"
+## Highlight portage commands
+color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?|error|log|patch|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>"
+color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>"
+color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)"
+color brightblue "\<(|doc|ins|exe)into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+## Highlight common commands used in ebuilds
+color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
+## Highlight comments (doesnt work that well)
+color yellow "#.*$"
+## Highlight strings (doesnt work that well)
+color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
+
+## Here is an example for Portage control files
+##
+syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
+## Base text:
+color green "^.+$"
+## Use flags:
+color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
+color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+## Likely version and slot numbers:
+color magenta "-[[:digit:]].*([[:space:]]|$)"
+color magenta ":[^[:space:]]+([[:space:]]|$)"
+## Accepted arches:
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc(-fbsd)?|x86(-fbsd)?)\>"
+color white "[[:space:]][*~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*.*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+## Comments:
+color yellow "#.*$"

doc/syntax/groff.nanorc

@@ -0,0 +1,24 @@
+## Here is an example for groff.
+##
+syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
+## The argument of .ds or .nr
+color cyan "^\.(ds|nr) [^[[:space:]]]*"
+## Single character escapes
+color brightmagenta "\\."
+## Highlight the argument of \f or \s in the same color
+color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
+## Newlines
+color cyan "(\\|\\\\)n(.|\(..)"
+color cyan start="(\\|\\\\)n\[" end="]"
+## Requests
+color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
+## Comments
+color yellow "^\.\\".*$"
+## Strings
+color green "(\\|\\\\)\*(.|\(..)"
+color green start="(\\|\\\\)\*\[" end="]"
+## Characters
+color brightred "\\\(.."
+color brightred start="\\\[" end="]"
+## Macro arguments
+color brightcyan "\\\\\$[1-9]"

doc/syntax/html.nanorc

@@ -0,0 +1,5 @@
+## Here is a short example for HTML.
+##
+syntax "html" "\.html$"
+color blue start="<" end=">"
+color red "&[^;[[:space:]]]*;"

doc/syntax/java.nanorc

@@ -0,0 +1,12 @@
+## Here is an example for Java.
+##
+syntax "java" "\.java$"
+color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
+color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
+color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color red ""[^"]*""
+color yellow "\<(true|false|null)\>"
+color blue "//.*"
+color blue start="/\*" end="\*/"
+color brightblue start="/\*\*" end="\*/"
+color ,green "[[:space:]]+$"

doc/syntax/man.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for manpages.
+##
+syntax "man" "\.[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 brightwhite "\\f[BIPR]"
+color yellow "\.(br|DS|RS|RE|PD)"

doc/syntax/mutt.nanorc

@@ -0,0 +1,4 @@
+## Here is an example for quoted emails (under e.g. mutt).
+##
+syntax "mutt"
+color green "^>.*"

doc/syntax/nanorc.nanorc

@@ -0,0 +1,16 @@
+## Here is an example for nanorc files.
+##
+syntax "nanorc" "\.?nanorc$"
+## Possible errors and parameters
+icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+## Keywords
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
+icolor green "^[[:space:]]*(set|unset|include|syntax|header)\>"
+## Colors
+icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
+## Strings
+icolor white ""(\\.|[^"])*""
+## Comments
+icolor brightblue "^[[:space:]]*#.*$"
+icolor cyan "^[[:space:]]*##.*$"

doc/syntax/objc.nanorc

@@ -0,0 +1,41 @@
+## Here is an example for C/C++/Obj-C.
+##
+syntax "m" "\.m$"
+
+
+## Stuffs
+color brightwhite "\<[A-Z_][0-9A-Z_]+\>" 
+color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<[[:alpha:]_][[:alnum:]_]*_t\>"
+color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
+color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
+color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
+color brightgreen "\<(goto|continue|break|return)\>"
+color brightgreen "@\<(en(code|d)|i(mplementation|nterface)|selector)\>"
+##
+## GCC builtins
+color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+
+## Selector/method
+color brightmagenta "(^|[[:space:]])\[.*[[:space:]].*\]"
+color white ":[[:alnum:]]*"
+color magenta "[[:alnum:]]*:"
+color white "\[[^][:space:]]*\]"
+
+##
+## String highlighting.  You will in general want your comments and
+## strings to come last, because syntax highlighting rules will be
+## applied in the order they are read in.
+color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
+color brightblue "@"(\\.|[^"])*""
+##
+## This string is VERY resource intensive!
+## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+
+## Comment highlighting
+color yellow "//.*"
+color yellow start="/\*" end="\*/"
+

doc/syntax/ocaml.nanorc

@@ -0,0 +1,27 @@
+# OCaml sample nanorc
+#
+syntax "ocaml" "\.mli?$"
+#uid
+color red "\<[A-Z][0-9a-z_]{2,}\>"
+#declarations
+color green "\<(let|val|method|in|and|rec|private|virtual|constraint)\>"
+#structure items
+color red "\<(type|open|class|module|exception|external)\>"
+#patterns
+color blue "\<(fun|function|functor|match|try|with)\>"
+#patterns-modifiers
+color yellow "\<(as|when|of)\>" 
+#conditions
+color cyan "\<(if|then|else)\>"
+#blocs
+color magenta "\<(begin|end|object|struct|sig|for|while|do|done|to|downto)\>"
+#constantes
+color green "\<(true|false)\>"
+#modules/classes
+color green "\<(include|inherit|initializer)\>"
+#expr modifiers
+color yellow "\<(new|ref|mutable|lazy|assert|raise)\>"
+#comments
+color white start="\(\*" end="\*\)"
+#strings (no multiline handling yet)
+color brightblack ""[^\"]*""

doc/syntax/patch.nanorc

@@ -0,0 +1,10 @@
+## Here is an example for patch files.
+##
+syntax "patch" "\.(patch|diff)$"
+color brightgreen "^\+.*"
+color green "^\+\+\+.*"
+color brightblue "^ .*"
+color brightred "^-.*"
+color red "^---.*"
+color brightyellow "^@@.*"
+color magenta "^diff.*"

doc/syntax/perl.nanorc

@@ -0,0 +1,12 @@
+## Here is an example for Perl.
+##
+syntax "perl" "\.p[lm]$"
+header "^#!.*/perl[-0-9._]*"
+color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+icolor cyan start="[$@%]" end="( |[^0-9A-Z_]|-)"
+color yellow "".*"|qq\|.*\|"
+color white "[sm]/.*/"
+color white start="(^use| = new)" end=";"
+color green "#.*"
+color yellow start="<< 'STOP'" end="STOP"

doc/syntax/php.nanorc

@@ -0,0 +1,30 @@
+## Here is an example for PHP
+##
+syntax "php" "\.php[2345s~]?$"
+
+## php markings
+color brightgreen "(<\?(php)?|\?>)"
+
+## functions
+color white "\<[a-z_]*\("
+
+## types
+color green "\<(var|float|global|double|bool|char|int|enum|const)\>"
+
+## structure
+color brightyellow "\<(class|new|private|public|function|for|foreach|if|while|do|else|elseif|case|default|switch)\>"
+
+## control flow
+color magenta "\<(goto|continue|break|return)\>"
+
+## strings
+color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
+
+## comments
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+#color blue start="<" end=">"
+#color red "&[^;[[:space:]]]*;"
+
+## Trailing whitespace
+color ,green "[[:space:]]+$"

doc/syntax/pov.nanorc

@@ -0,0 +1,15 @@
+## Here is an example for POV-Ray.
+##
+syntax "pov" "\.(pov|POV|povray|POVRAY)$"
+color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
+color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+color brightred "^\<(texture)\>"
+color brightred "\<(light_source|background)\>"
+color brightred "\<(fog|object|camera)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color brightmagenta "\<(union|group|subgroup)\>"
+## Comment highlighting
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"

doc/syntax/python.nanorc

@@ -0,0 +1,10 @@
+## Here is an example for Python.
+##
+syntax "python" "\.py$"
+header "^#!.*/python[-0-9._]*"
+icolor brightblue "def [0-9A-Z_]+"
+color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
+color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
+color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
+color brightred "#.*$"

doc/syntax/ruby.nanorc

@@ -0,0 +1,31 @@
+## Here is an example for Ruby.
+##
+syntax "ruby" "\.rb$"
+header "^#!.*/ruby[-0-9._]*"
+## Asciibetical list of reserved words
+color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+## Constants
+color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
+## Ruby "symbols"
+icolor magenta "([ 	]|^):[0-9A-Z_]+\>"
+## Some unique things we want to stand out
+color brightyellow "\<(__FILE__|__LINE__)\>"
+## Regular expressions
+color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+## Shell command expansion is in `backticks` or like %x{this}.  These are
+## "double-quotish" (to use a perlism).
+color brightblue "`[^`]*`" "%x\{[^}]*\}"
+## Strings, double-quoted
+color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+## Expression substitution.  These go inside double-quoted strings,
+## "like #{this}".
+color brightgreen "#\{[^}]*\}"
+## Strings, single-quoted
+color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+## Comments
+color cyan "#[^{].*$" "#$"
+color brightcyan "##[^{].*$" "##$"
+## "Here" docs
+color green start="<<-?'?EOT'?" end="^EOT"
+## Some common markers
+color brightcyan "(XXX|TODO|FIXME|\?\?\?)"

doc/syntax/sh.nanorc

@@ -0,0 +1,14 @@
+## Here is an example for Bourne shell scripts.
+##
+syntax "sh" "\.sh$"
+header "^#!.*/(ba|k|pdk|)sh[-0-9_]*"
+icolor brightgreen "^[0-9A-Z_]+\(\)"
+color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "-[Ldefgruwx]\>"
+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color cyan "(^|[[:space:]])#.*$"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color ,green "[[:space:]]+$"

doc/syntax/tcl.nanorc

@@ -0,0 +1,16 @@
+syntax "tcl" "\.tcl$"
+
+## Standard Tcl [info commands]
+color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
+## Basic Tcl sub commands.
+color green "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
+color green "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
+## Extended TclX [info commands]
+color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
+## Syntax.
+color brightblue "proc[[:space:]]" "(\{|\})"
+color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
+color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color ,green "[[:space:]]+$"
+color ,magenta "^([[:space:]]+|)#.*"

doc/syntax/tex.nanorc

@@ -0,0 +1,6 @@
+## Here is a short example for TeX files.
+##
+syntax "tex" "\.tex$"
+icolor green "\\.|\\[A-Z]*"
+color magenta "[{}]"
+color blue "%.*"

doc/syntax/xml.nanorc

@@ -0,0 +1,9 @@
+## Here is an example for xml files.
+##
+syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
+color green  start="<" end=">"
+color cyan   "<[^> ]+"
+color cyan   ">"
+color yellow start="<!DOCTYPE" end="[/]?>"
+color yellow start="<!--" end="-->"
+color red    "&[^;]*;"

doc/texinfo/.gitignore

@@ -1,4 +1,3 @@
-Makefile
-Makefile.in
-nano.info
 texinfo.tex
+nano.html
+nano.info

doc/texinfo/Makefile.am

@@ -2,4 +2,9 @@ info_TEXINFOS = nano.texi
 
 MAKEINFO = makeinfo --no-split
 
-EXTRA_DIST = nano.info
+BUILT_SOURCES = nano.html
+
+nano.html: nano.texi
+	makeinfo --no-split --html < $< > $@
+
+EXTRA_DIST = $(info_TEXINFOS) $(BUILT_SOURCES)

doc/texinfo/nano.texi

@@ -5,11 +5,11 @@
 @c %**end of header
 
 @c This file has the new style title page commands.
-@c Run `makeinfo' rather than `texinfo-format-buffer'.
+@c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 1.3.6
-@set UPDATED 11 Mar 2005
+@set VERSION 2.0.0
+@set UPDATED 17 Dec 2007
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 1.3.6
+@subtitle version 2.0.0
 
 @author Chris Allegretta
 @page
@@ -33,28 +33,22 @@ editor.
 
 This manual is part of the GNU @code{nano} distribution.@*
 @sp4
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Chris Allegretta.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
+This document is dual-licensed.  You may distribute and/or modify it
+under the terms of either of the following licenses:
 
-@iftex
-Permission is granted to process this file through @TeX{} and print the
-results, provided the printed document carries copying permission notice
-identical to this one except for the removal of this paragraph (this
-paragraph not being relevant to the printed manual).
-@end iftex
+* The GNU General Public License, as published by the Free Software
+  Foundation, version 3 or (at your option) any later version.  You
+  should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation
-approved by the Foundation.
+* The GNU Free Documentation License, as published by the Free Software
+  Foundation, version 1.2 or (at your option) any later version, with no
+  Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+  You should have received a copy of the GNU Free Documentation License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 You may contact the author by
 e-mail: @email{chrisa@@asty.org}@*
@@ -70,6 +64,7 @@ editor.
 * Editor Basics::
 * Online Help::
 * Feature Toggles::
+* Nanorc Files::
 * The File Browser::
 * Pico Compatibility::
 * Building and Configure Options::
@@ -80,8 +75,9 @@ editor.
 
 GNU @code{nano} is a small and friendly text editor.  Besides basic text
 editing, @code{nano} offers many extra features like an interactive
-search and replace, goto line number, auto-indentation, feature toggles,
-internationalization support, and filename tab completion.
+search and replace, go to line and column number, auto-indentation,
+feature toggles, internationalization support, and filename tab
+completion.
 
 @menu
 * Overview::
@@ -91,12 +87,29 @@ internationalization support, and filename tab completion.
 @node Overview, Command Line Options, Introduction, Introduction
 @section Overview
 
-@code{nano} +LINE [GNU long option] [option] [ @var{file ...} ]
-
 The original goal for @code{nano} was a complete bug-for-bug compatible
-emulation of Pico, but nano's main goal is to be as compatible as
-possible while offering a superset of Pico's functionality.  Also see
-@xref{Pico Compatibility}, for other differences.
+emulation of Pico, but @code{nano}'s current goal is to be as compatible
+as possible while offering a superset of Pico's functionality.  See
+@xref{Pico Compatibility}, for more info.
+
+The usual way to invoke @code{nano} is:
+
+@quotation
+@code{nano [OPTION]@dots{} [FILE]}
+@end quotation
+
+But it is also possible to edit several files in a row.  Additionally,
+the cursor can be put on a desired line number by adding this number
+with a plus sign before any filename, and even in a desired column by
+adding it with a comma.  So the complete synopsis is:
+
+@quotation
+@code{nano [OPTION]@dots{} [[+LINE] FILE]@dots{}}
+
+@code{nano [OPTION]@dots{} [[+,COLUMN] FILE]@dots{}}
+
+@code{nano [OPTION]@dots{} [[+LINE,COLUMN] FILE]@dots{}}
+@end quotation
 
 Email bug reports to @email{nano@@nano-editor.org}.
 
@@ -106,6 +119,12 @@ Email bug reports to @email{nano@@nano-editor.org}.
 @code{nano} takes the following options from the command line:
 
 @table @code
+@item +LINE,COLUMN
+Start at line number LINE and column number COLUMN (at least one of
+which must be specified) instead of the default of line 1, column 1.
+
+@item -?
+Same as @code{-h, --help}.
 
 @item -A, --smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -118,55 +137,84 @@ line.
 When saving a file, back up the previous version of it to the current
 filename suffixed with a ~.
 
-@item -E, --backupdir=[dir]
-Set the directory where @code{nano} puts the backup files if file
+@item -C <dir>, --backupdir=<dir>
+Set the directory where @code{nano} puts unique backup files if file
 backups are enabled.
 
+@item -D, --boldtext
+Use bold text instead of reverse video text.
+
+@item -E, --tabstospaces
+Convert typed tabs to spaces.
+
 @item -F, --multibuffer
 Enable multiple file buffers, if available.
 
+@item -H, --historylog
+Log search and replace strings to ~/.nano_history, so they can be
+retrieved in later sessions, if nanorc support is available.
+
 @item -I, --ignorercfiles
 Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
 available.
 
-@item -N, --noconvert
-Do not convert files from DOS/Mac format.
+@item -K, --rebindkeypad
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
 
-@item -Q [str], --quotestr [str]
-Set the quoting string for justifying.  The default is
+@item -L, --nonewlines
+Don't add newlines to the ends of files.
+
+@item -N, --noconvert
+Don't convert files from DOS/Mac format.
+
+@item -O, --morespace
+Use the blank line below the titlebar as extra editing space.
+
+@item -Q <str>, --quotestr=<str>
+Set the quoting string for justifying.  The default value is
 
 @quotation
 @code{^([ \t]*[|>:@}#])+}
 @end quotation
 
-if regular expression support is available, or ``> '' otherwise.  Note
-that @code{\t} above stands for a literal Tab character.
+if extended regular expression support is available, or "> " otherwise.
+Note that @code{\t} above stands for a literal Tab character.
 
-@item -R, --regexp
-Turn on regular expression search and search/replace.
+@item -R, --restricted
+Restricted mode: don't read or write to any file not specified on the
+command line; read any nanorc files; allow suspending; allow a file to
+be appended to, prepended to, or saved under a different name if it
+already has one; or use backup files or spell checking.  Also accessible
+by invoking @code{nano} with any name beginning with 'r' (e.g. "rnano").
 
 @item -S, --smooth
-Enable smooth scrolling.
+Enable smooth scrolling.  Text will scroll line-by-line, instead of the
+usual chunk-by-chunk behavior.
 
-@item -T [num], --tabsize=[#cols]
-Set the displayed tab length to [#cols] columns.
+@item -T <#cols>, --tabsize=<#cols>
+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
+keystroke instead of 25.  Note that -c overrides this.
 
 @item -V, --version
-Print the version number and copyright and quit.
+Show the current version number and exit.
 
-@item -Y, --syntax=[str]
-Specify a specific syntax highlighting from the .nanorc to use, if
-available.
+@item -W, --wordbounds
+Detect word boundaries more accurately by treating punctuation
+characters as parts of words.
 
-@item -Z, --restricted
-Restricted mode: Don't read or write to any file not specified on the
-command line, read any nanorc files, allow suspending, or allow a file
-to be appended to, prepended to, or saved under a different name if it
-already has one.  Also accessible by invoking @code{nano} with any name
-beginning with 'r' (e.g. "rnano").
+@item -Y <str>, --syntax=<str>
+Specify a specific syntax highlighting from the nanorc to use, if
+available.  See @xref{Nanorc Files}, for more info.
 
 @item -c, --const
 Constantly display the cursor position and line number on the statusbar.
+Note that this overrides -U.
 
 @item -d, --rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
@@ -174,7 +222,7 @@ work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 
 @item -h, --help
-Print the usage and exit.
+Show a summary of command line options and exit.
 
 @item -i, --autoindent
 Automatically indent new lines to the same number of spaces and tabs as
@@ -188,10 +236,12 @@ 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).
+Enable mouse support, if available for your system.  When enabled, mouse
+clicks can be used to place the cursor, set the mark (with a double
+click), and execute shortcuts.  The mouse will work in the X Window
+System, and on the console when gpm is running.
 
-@item -o [dir], --operatingdir=[dir]
+@item -o <dir>, --operatingdir=<dir>
 Set operating directory.  Makes @code{nano} set up something similar to
 a chroot.
 
@@ -199,52 +249,50 @@ a chroot.
 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.
+@item -r <#cols>, --fill=<#cols>
+Wrap lines at column #cols.  If this value is 0 or less, wrapping will
+occur at the width of the screen less #cols, 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
-command specified in the SPELL environment variable, or, if SPELL is not
-set, its own interactive spell checker that requires the @code{spell}
-program to be installed on your system.
+@item -s <prog>, --speller=<prog>
+Invoke the given program as the spell checker.  By default, @code{nano}
+uses the command specified in the SPELL environment variable, or, if
+SPELL is not set, its own interactive spell checker that requires the
+@code{spell} program to be installed on your system.
 
 @item -t, --tempfile
-Do not ask whether or not to save the current contents of the file when
+Don't ask whether or not to save the current contents of the file when
 exiting, assume yes.  This is most useful when using @code{nano} as the
 composer of a mailer program.
 
+@item -v, --view
+Don't allow the contents of the file to be altered.  Note that this
+option should NOT be used in place of correct file permissions to
+implement a read-only file.
+
+@item -w, --nowrap
+Don't wrap long lines at any length.  This option overrides any value
+for -r.
+
 @anchor{Expert Mode}
 @item -x, --nohelp
-In Expert Mode, the Shortcut Lists will not appear at the bottom of the
-screen.  This affects the location of the statusbar as well, as in
-Expert Mode it is located at the very bottom of the editor.
+Expert Mode: don't show the Shortcut Lists at the bottom of the screen.
+This affects the location of the statusbar as well, as in Expert Mode it
+is located at the very bottom of the editor.
 
 Note: When accessing the help system, Expert Mode is temporarily
 disabled to display the help system navigation keys.
 
-@item -v, --view
-Do not allow the contents of the file to be altered.  Note that this
-flag should NOT be used in place of correct file permissions to
-implement a read-only file.
-
-@item -w, --nowrap
-Do not wrap long lines at any length.  This option overrides any value
-for -r.
-
 @item -z, --suspend
-Enable suspend ability of @code{nano} using the system's suspend
+Enable @code{nano}'s suspend ability using the system's suspend
 keystroke (usually ^Z).
 
 @item -a, -b, -e, -f, -g, -j
 Ignored, for compatibility with Pico.
-
-@item +LINE
-Start at line number LINE instead of the default of line 1.
 @end table
 
+
 @node Editor Basics, Online Help, Introduction, Top
 @chapter Editor Basics
 @menu
@@ -253,38 +301,39 @@ Start at line number LINE instead of the default of line 1.
 * The Titlebar::
 * The Statusbar::
 * Shortcut Lists::
+* Using the Mouse::
 @end menu
 
 @node Entering Text, Special Functions, Editor Basics, Editor Basics
 @section Entering Text
 
 All key sequences in @code{nano} are entered using the keyboard.
-@code{nano} is a ``modeless'' editor.  All keys with the exception of
-Control and Meta key sequences will enter text into the file being
+@code{nano} is a "modeless" editor.  All keys, with the exception of
+Control and Meta key sequences, will enter text into the file being
 edited.
 
 @node Special Functions, The Titlebar, Entering Text, Editor Basics
 @section Special Functions
 
-Special functions use the Control key (displayed in the help and
-shortcut lists as ^), the Meta key (displayed as M), or the Esc key.
+Special functions use the Control (Ctrl) key, displayed in the help and
+shortcut lists as ^; the Meta key, displayed as M; or the Escape (Esc)
+key.
 
 @itemize @bullet
 @item
-Control key sequences are entered by holding down the Control key and
+Control key sequences are entered by holding down the Ctrl key and
 pressing the desired key, or by pressing the Esc key twice and pressing
 the desired key.
 @item
 Pressing Esc twice and then typing a three-digit number from 000 to 255
-will enter the character with the corresponding ASCII code.
+will enter the character with the corresponding value.
 @item
-Meta key sequences can be entered in a number of possible ways: Pressing
-the Escape key, then releasing it and pressing the desired key, or
-holding down the Alt key while pressing the desired key.  This varies
-from keyboard to keyboard, and certain commercial operating systems
-``swallow'' the Alt key so that it never reaches the application.  If
-your operating system does this, you should use the Escape key to
-generate Meta key sequences.
+Meta key sequences are entered by holding down the Meta key (normally
+the Alt key) and pressing the desired key, or by pressing the Esc key
+once and pressing the desired key.  Certain operating systems "swallow"
+the Alt key so that it never reaches the application; if your operating
+system does this, you should use the Esc key to generate Meta key
+sequences.
 @end itemize
 
 @node The Titlebar, The Statusbar, Special Functions, Editor Basics
@@ -293,32 +342,42 @@ generate Meta key sequences.
 The titlebar is the line displayed at the top of the editor.  There are
 three sections: left, center and right.  The section on the left
 displays the version of @code{nano} being used.  The center section
-displays the current file name, or ``New Buffer'' if the file has not
-yet been named.  The section on the right will display ``Modified'' if
-the file has been modified since it was last saved or opened.
+displays the current filename, or "New Buffer" if the file has not yet
+been named.  The section on the right will display "Modified" if the
+file has been modified since it was last saved or opened.
 
-Special modes: When @code{nano} is in ``File browser'' mode, the center
-section will display the current directory instead of the filename.
-@xref{The File Browser}.
+Special modes: When @code{nano} is in "File browser" mode, the center
+section will display the current directory instead of the filename.  See
+@xref{The File Browser}, for more info.
 
 @node The Statusbar, Shortcut Lists, The Titlebar, Editor Basics
 @section The Statusbar
 
-The statusbar is located three lines from the bottom of the screen (or
-the bottom line in Expert Mode.  @xref{Expert Mode}, for more info).
+The statusbar is the third line from the bottom of the screen, or the
+bottom line in Expert Mode.  See @xref{Expert Mode}, for more info.  It
+shows important and informational messages.  Any error messages that
+occur from using the editor will appear on the statusbar.  Any questions
+that are asked of the user will be asked on the statusbar, and any user
+input (search strings, filenames, etc.) will be input on the statusbar.
 
-The Statusbar shows important and informational messages.  Any error
-messages that occur from using the editor will appear on the statusbar.
-Any questions that are asked of the user will be asked on the statusbar,
-and any user input (search strings, file names, etc) will be input on
-the statusbar.
-
-@node Shortcut Lists, , The Statusbar, Editor Basics
+@node Shortcut Lists, Using the Mouse, The Statusbar, Editor Basics
 @section Shortcut Lists
 
 The Shortcut Lists are the two lines at the bottom of the screen which
 show some of the more commonly used functions in the editor.
 
+@node Using the Mouse, , Shortcut Lists, Editor Basics
+@section Using the Mouse
+
+When mouse support has been configured and enabled, a single mouse click
+places the cursor at the indicated position.  Clicking a second time in
+the same position toggles the mark.  Clicking in the shortcut list
+executes the selected shortcut.
+
+The mouse will work in the X Window System, and on the console when gpm
+is running.
+
+
 @node Online Help, Feature Toggles, Editor Basics, Top
 @chapter Online Help
 
@@ -328,65 +387,320 @@ editor and available keystrokes.  Navigation is via the ^Y (Page Up)
 and ^V (Page Down) keys.  ^X exits the help system.
 
 
-@node Feature Toggles, The File Browser, Online Help, Top
+@node Feature Toggles, Nanorc Files, Online Help, Top
 @chapter Feature Toggles
 
-Toggles allow you to change certain aspects of the editor that
-would normally be done via command line flags.  They are invoked via
-certain Meta key sequences.  @xref{Special Functions}, for more info.
-The following global toggles are available:
+Toggles allow you to change certain aspects of the editor that would
+normally be done via command line options.  They are invoked via Meta
+key sequences.  See @xref{Special Functions}, for more info.  The
+following global toggles are available:
 
 @table @code
 
-@item Backup File Toggle (Meta-B)
-toggles the -B (@code{--backup}) command line flag.
+@item Backup Files Toggle (Meta-B)
+toggles the -B (@code{--backup}) command line option.
+
+@item Constant Cursor Position Display Toggle (Meta-C)
+toggles the -c (@code{--const}) command line option.
 
 @item Multiple File Buffers Toggle (Meta-F)
-toggles the -F (@code{--multibuffer}) command line flag.
+toggles the -F (@code{--multibuffer}) command line option.
 
-@item Backup File Toggle (Meta-H)
-toggles the -A (@code{--smarthome}) command line flag.
+@item Smart Home Key Toggle (Meta-H)
+toggles the -A (@code{--smarthome}) command line option.
 
 @item Auto Indent Toggle (Meta-I)
-toggles the -i (@code{--autoindent}) command line flag.
+toggles the -i (@code{--autoindent}) command line option.
 
 @item Cut To End Toggle (Meta-K)
-toggles the -k (@code{--cut}) command line flag.
+toggles the -k (@code{--cut}) command line option.
 
-@item Auto Line Wrap Toggle (Meta-L)
-toggles the -w (@code{--nowrap}) command line flag.
+@item Long Line Wrapping Toggle (Meta-L)
+toggles the -w (@code{--nowrap}) command line option.
 
-@item Mouse Toggle (Meta-M)
-toggles the -m (@code{--mouse}) command line flag.
+@item Mouse Support Toggle (Meta-M)
+toggles the -m (@code{--mouse}) command line option.
 
-@item More Space Toggle (Meta-O)
-toggles the -O (@code{--morespace}) command line flag.
+@item No Conversion From DOS/Mac Format Toggle (Meta-N)
+toggles the -N (@code{--noconvert}) command line option.
+
+@item More Space For Editing Toggle (Meta-O)
+toggles the -O (@code{--morespace}) command line option.
+
+@item Whitespace Display Toggle (Meta-P)
+toggles whitespace display mode if you have a "whitespace" option in
+your nanorc.  See @xref{Nanorc Files}, for more info.
+
+@item Tabs to Spaces Toggle (Meta-Q)
+toggles the -E (@code{--tabstospaces}) command line option.
 
 @item Smooth Scrolling Toggle (Meta-S)
-toggles the -S (@code{--smooth}) command line flag.
+toggles the -S (@code{--smooth}) command line option.
 
-@item Expert/Nohelp Toggle (Meta-X)
-toggles the -x (@code{--nohelp}) command line flag.
+@item Expert/No Help Toggle (Meta-X)
+toggles the -x (@code{--nohelp}) command line option.
+
+@item Color Syntax Highlighting Toggle (Meta-Y)
+toggles color syntax highlighting if you have color syntaxes in your
+nanorc.  See @xref{Nanorc Files}, for more info.
 
 @item Suspend Toggle (Meta-Z)
-toggles the -z (@code{--suspend}) command line flag.
+toggles the -z (@code{--suspend}) command line option.
 
 @end table
 
 
-@node The File Browser, Pico Compatibility, Feature Toggles, Top
+@node Nanorc Files, The File Browser, Feature Toggles, Top
+@chapter Nanorc Files
+
+The nanorc files contain the default settings for @code{nano}.  They
+should not be in DOS or Mac format.  During startup, @code{nano} will
+first read its system-wide settings from SYSCONFDIR/nanorc, and then
+user-specific settings from ~/.nanorc.
+
+A nanorc file accepts a series of "set" and "unset" commands, which can
+be used to configure @code{nano} on startup without using the command
+line options.  Additionally, the "syntax", "color", and "icolor"
+keywords are used to define syntax highlighting rules for different text
+patterns.  @code{nano} will read one command per line.
+
+Options in nanorc files take precedence over @code{nano}'s defaults, and
+command line options override nanorc settings.  Options are also unset
+by default, except for those that take arguments.
+
+Quotes inside string parameters don't have to be escaped with
+backslashes.  The last double quote in the string will be treated as its
+end.  For example, for the "brackets" option,
+
+@quotation
+@code{""')>]@}"}
+@end quotation
+
+will match @code{"}, @code{'}, @code{)}, @code{>}, @code{]}, and
+@code{@}}.
+
+The supported commands and arguments are:
+
+@table @code
+
+@item set/unset autoindent
+Use auto-indentation.
+
+@item set/unset backup
+Create backup files in "filename~".
+
+@item set backupdir "directory"
+Set the directory where @code{nano} puts unique backup files if file
+backups are enabled.
+
+@item set/unset backwards
+Do backwards searches by default.
+
+@item set/unset boldtext
+Use bold text instead of reverse video text.
+
+@item set brackets "string"
+Set the characters treated as closing brackets when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is
+
+@quotation
+@code{""')>]@}"}
+@end quotation
+
+@item set/unset casesensitive
+Do case sensitive searches by default.
+
+@item set/unset const
+Constantly display the cursor position in the status bar.
+
+@item set/unset cut
+Use cut to end of line by default, instead of cutting the whole line.
+
+@item set fill "n"
+Wrap lines at column number "n".  If "n" is 0 or less, the maximum line
+length will be the screen width less "n" columns.  The default value is
+-8.
+
+@item set/unset historylog
+Enable ~/.nano_history for saving and reading search/replace strings.
+
+@item set matchbrackets "string"
+Set the opening and closing brackets that can be found by bracket
+searches.  They cannot contain blank characters.  The former set must
+come before the latter set, and both must be in the same order.  The
+default value is
+
+@quotation
+@code{"(<[@{)>]@}"}
+@end quotation
+
+@item set/unset morespace
+Use the blank line below the titlebar as extra editing space.
+
+@item set/unset mouse
+Enable mouse support, so that mouse clicks can be used to place the
+cursor, set the mark (with a double click), or execute shortcuts.
+
+@item set/unset multibuffer
+Allow inserting files into their own buffers.
+
+@item set/unset noconvert
+Don't convert files from DOS/Mac format.
+
+@item set/unset nofollow
+Don't follow symlinks when writing files.
+
+@item set/unset nohelp
+Don't display the help lists at the bottom of the screen.
+
+@item set/unset nonewlines
+Don't add newlines to the ends of files.
+
+@item set/unset nowrap
+Don't wrap text at all.
+
+@item set operatingdir "directory"
+@code{nano} will only read and write files inside "directory" and its
+subdirectories.  Also, the current directory is changed to here, so
+files are inserted from this directory.  By default, the operating
+directory feature is turned off.
+
+@item set/unset preserve
+Preserve the XON and XOFF keys (^Q and ^S).
+
+@item set punct "string"
+Set the characters treated as closing punctuation when justifying
+paragraphs.  They cannot contain blank characters.  Only closing
+punctuation, optionally followed by closing brackets, can end sentences.
+The default value is @code{"!.?"}.
+
+@item set/unset quickblank
+Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.
+
+@item set quotestr "string"
+The email-quote string, used to justify email-quoted paragraphs.  This
+is an extended regular expression if your system supports them,
+otherwise a literal string.  The default value is
+
+@quotation
+@code{"^([ \\t]*[#:>\\|@}])+"}
+@end quotation
+
+if you have extended regular expression support, or "> " otherwise.
+Note that '\\t' stands for a literal Tab character.
+
+@item set/unset rebinddelete
+Interpret the Delete key differently so that both Backspace and Delete
+work properly.  You should only need to use this option if Backspace
+acts like Delete on your system.
+
+@item set/unset rebindkeypad
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
+
+@item set/unset regexp
+Do extended regular expression searches by default.
+
+@item set/unset smarthome
+Make the Home key smarter.  When Home is pressed anywhere but at the
+very beginning of non-whitespace characters on a line, the cursor will
+jump to that beginning (either forwards or backwards).  If the cursor is
+already at that position, it will jump to the true beginning of the
+line.
+
+@item set/unset smooth
+Use smooth scrolling by default.
+
+@item set speller "spellprog"
+Use spelling checker "spellprog" instead of the built-in one, which
+calls "spell".
+
+@item set/unset suspend
+Allow @code{nano} to be suspended.
+
+@item set tabsize "n"
+Use a tab size of "n" columns.  The value of "n" must be greater than 0.
+The default value is 8.
+
+@item set/unset tabstospaces
+Convert typed tabs to spaces.
+
+@item set/unset tempfile
+Save automatically on exit, don't prompt.
+
+@item set/unset view
+Disallow file modification.
+
+@item set whitespace "string"
+Set the two characters used to display the first characters of tabs and
+spaces.  They must be single-column characters.
+
+@item set/unset wordbounds
+Detect word boundaries more accurately by treating punctuation
+characters as part of a word.
+
+@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.
+
+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 color fgcolor,bgcolor "regex" @dots{}
+For the currently defined syntax, display all expressions matching the
+extended regular expression "regex" with foreground color "fgcolor" and
+background color "bgcolor", at least one of which must be specified.
+Legal colors for foreground and background color are: white, black, red,
+blue, green, yellow, magenta, and cyan.  You may use the prefix "bright"
+to force a stronger color highlight for the foreground.  If your
+terminal supports transparency, not specifying a "bgcolor" tells "nano"
+to attempt to use a transparent background.
+
+@item icolor fgcolor,bgcolor "regex" @dots{}
+Same as above, except that the expression matching is case insensitive.
+
+@item color fgcolor,bgcolor start="sr" end="er"
+Display expressions which start with the extended regular expression
+"sr" and end with the extended regular expression "er" with foreground
+color "fgcolor" and background color "bgcolor", at least one of which
+must be specified.  This allows syntax highlighting to span multiple
+lines.  Note that all subsequent instances of "sr" after an initial "sr"
+is found will be highlighted until the first instance of "er".
+
+@item icolor fgcolor,bgcolor start="sr" end="er"
+Same as above, except that the expression matching is case insensitive.
+
+@item include "syntaxfile"
+Read in self-contained color syntaxes from "syntaxfile".  Note that
+"syntaxfile" can only contain "syntax", "color", and "icolor" commands.
+
+@end table
+
+
+@node The File Browser, Pico Compatibility, Nanorc Files, Top
 @chapter The File Browser
 
 When reading or writing files, pressing ^T will invoke the file browser.
 Here, one can navigate directories in a graphical manner in order to
 find the desired file.
 
-Basic movement in the file browser is accomplished with the arrow keys
-and page up/down.  The behavior of the enter (or `s') key varies by what
-is currently selected.  If the currently selected object is a directory,
-the file browser will enter and display the contents of the directory.
-If the object is a file, this filename and path are copied to the
-statusbar and the file browser is exited.
+Basic movement in the file browser is accomplished with the arrow keys,
+page up, and page down.  More advanced movement is accomplished by
+searching via ^W (or 'w') and changing directories via ^_ (or 'g').  The
+behavior of the Enter (or 's') key varies by what is currently selected.
+If the currently selected object is a directory, the file browser will
+enter and display the contents of the directory.  If the object is a
+file, this filename and path are copied to the statusbar, and the file
+browser exits.
 
 @node Pico Compatibility, Building and Configure Options, The File Browser, Top
 @chapter Pico Compatibility
@@ -403,24 +717,24 @@ incompatible with Pico, method for entering search and replace strings.
 In the old method, previous entries would be displayed by default as
 editable text in front of the cursor, as opposed to being bracketed and
 uneditable as it is in Pico.  The old behavior could be made compatible
-with Pico via the @code{-p} flag, but recent versions of Pico use the
-@code{-p} flag to preserve the XON and XOFF sequences within the editor.
-Since with the new method search and replace strings can still be edited
-by simply hitting the up arrow key once, the old method was removed
-completely.
+with Pico via the @code{-p} option, but recent versions of Pico use the
+@code{-p} option to preserve the XON and XOFF sequences within the
+editor.  Since, with the new method, search and replace strings can
+still be edited by simply hitting the up arrow key once, the old method
+was removed completely.
 
 
-@item Writing or Appending Selected Text to Files
-Text selected using the Control-Caret (^^) key can be written out or
-appended to a new or existing file using the Writeout key (^O).
+@item Writing, Appending, or Prepending Selected Text to Files
+Text selected using the marking key (^^) can be written out, appended,
+or prepended to a new or existing file using the WriteOut key (^O).
 
 @item Toggles
 Many options which alter the functionality of the program can be
 "toggled" on or off using Meta key sequences, meaning the program does
 not have to be restarted to turn a particular feature of the editor on
 or off.  Please see the internal help function (^G) for a list of what
-functions can be toggled for a particular version of @code{nano}.  Also
-see @xref{Feature Toggles}, though this may be out of date.
+functions can be toggled for a particular version of @code{nano}.  See
+@xref{Feature Toggles}, for more info.
 
 @item Cursor Position Display
 The output of the "Display Cursor Position" in @code{nano} displays
@@ -428,11 +742,11 @@ the given column position, as well as the row and total character
 position of the cursor.
 
 @item Interactive Replace and Spell Checker
-It is worth noting that the @code{nano} replace function is interactive,
-i.e, it does not stop after one search string is found and automatically
-replace it.  The @code{nano} implementation will stop at each search
+It is worth noting that @code{nano}'s replace function is interactive,
+i.e. it does not stop after one search string is found and automatically
+replace it.  The @code{nano} implementation will pause at each search
 string found and query whether to replace this instance or not.  The
-internal spell checker operates similarly.  Note that these is no way to
+internal spell checker operates similarly.  Note that there is no way to
 force these functions to behave in the Pico fashion.  As of version
 1.1.99pre1, misspelled words are sorted and trimmed for uniqueness in
 the internal spell checker such that the words 'apple' and 'Apple' will
@@ -446,62 +760,96 @@ Building @code{nano} from source is fairly straightforward if you are
 familiar with compiling programs with autoconf support:
 
 @itemize @bullet
-@item tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of nano)
+@item tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of
+@code{nano})
 @item cd nano-x.y.z/
 @item ./configure
 @item make
 @item make install
 @end itemize
 
-if you are looking to optimize @code{nano} for size, you may want to
-consider the following command line options:
-
+The possible options to @code{./configure} are:
 
 @table @code
 
+@item --disable-browser
+Disable the mini file browser when reading or writing files.
+
+@item --disable-help
+Disable the help function.  Doing this makes the binary much smaller,
+but makes it difficult for new users to learn more than very basic
+things about using the editor.
+
+@item --disable-justify
+Disable the justify and unjustify functions.
+
+@item --disable-mouse
+Disable all mouse functionality.  This also disables the -m command line
+option, which enables the mouse functionality.
+
+@item --disable-operatingdir
+Disable setting the operating directory.  This also disables the -o
+command line option, which sets the operating directory.
+
+@item --disable-speller
+Disable use of the spell checker.  This also disables the -s command
+line option, which allows specifying an alternate spell checker.
+
 @item --disable-tabcomp
 Disable the tab completion code when reading or writing files.
 
-@item --disable-justify
-Disable the justify (^J)/unjustify (^U) functions in the editor.
-
-@item --disable-speller
-Disable spell checker ability.
-
-@item --disable-help
-Disable the help function (^G).  Disabling this option makes the binary
-much smaller, but makes it difficult for new users to learn more than
-very basic things about using the editor.
-
-@item --disable-browser
-Disable the mini file browser (^T) when reading or writing files.
-
-@item --disable-mouse
-Disable all mouse functionality.  This also disables the -m command line
-flag, which enables the mouse functions.
-
-@item --disable-operatingdir
-Disable setting the operating directory.  This also disables the -o
-command line flag.
+@item --disable-wrapping
+Disable all long line wrapping.  This also eliminates the -w command
+line option, which enables long line wrapping.
 
 @item --enable-tiny
 This option disables all the above.  It also disables some of the larger
-internals of the editor, like the marker code (^^) and the cut to line
-(-k) option, which depends on the marker code to work properly.  It also
-disables the function toggles.
+internals of the editor, like the marking code and the cut to end of
+line code.  It also disables the function toggles.
 
-@item --disable-wrapping
-Disable all word wrapping in the editor.  This also eliminates the -w
-command line flag, as nonwrapping is then the default behavior.
+@item --enable-debug
+Enable support for runtime debug output.  This can get pretty messy, so
+chances are you only want this feature to work on the nano source.
+
+@item --enable-extra
+Enable extra features.  At the moment, this is just easter egg-type
+stuff.
+
+@item --enable-color
+Enable support for syntax coloring of files using the nanorc file.  This
+enables nanorc support as well.
+
+@item --enable-multibuffer
+Enable support for opening multiple files at a time and switching
+between them on the fly.
+
+@item --enable-nanorc
+Enable support for reading the nanorc file at startup.  You can store
+custom settings in the nanorc file rather than having to pass command
+line options to get desired behavior.  See @xref{Nanorc Files}, for
+more info.
+
+@item --enable-all
+Shortcut for enabling the above four features (extra, color,
+multibuffer, and nanorc).
 
 @item --disable-nls
-Disables Native Language support.  This will make the available GNU
-@code{nano} translations unusable.
+Disables Native Language support.  This will disable use of the
+available GNU @code{nano} translations.
+
+@item --disable-wrapping-as-root
+Disable long line wrapping by default when nano is run as root.
+
+@item --enable-utf8
+Enable support for reading and writing Unicode files.  This will require
+either a wide version of curses, or a UTF-8-enabled version of Slang.
+
+@item --disable-utf8
+Disable support for reading and writing Unicode files.
 
 @item --with-slang
-Compiling GNU @code{nano} with Slang is supported, and will make the
-binary notably smaller than if compiled with ncurses or other curses
-libraries.
+Compiling @code{nano} with Slang is supported, and will make the binary
+notably smaller than if compiled with ncurses or other curses libraries.
 
 @end table
 

m4/.cvsignore

@@ -1,2 +0,0 @@
-Makefile.in
-Makefile

m4/Makefile.am

@@ -1,4 +1,5 @@
-EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
-	     stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
-	     lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
-	     iconv.m4 lcmessage.m4 glib-2.0.m4
+EXTRA_DIST = ac_define_dir.m4 codeset.m4 gettext.m4 glib-2.0.m4 \
+		glibc21.m4 iconv.m4 intdiv0.m4 inttypes_h.m4 \
+		inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 \
+		lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 \
+		stdint_h.m4 uintmax_t.m4 ulonglong.m4

m4/ac_define_dir.m4

@@ -0,0 +1,34 @@
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro sets VARNAME to the expansion of the DIR variable,
+dnl taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is then offered as both an output variable and a C
+dnl preprocessor symbol.
+dnl
+dnl Example:
+dnl
+dnl    AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <kasal@ucw.cz>
+dnl @author Andreas Schwab <schwab@suse.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @author Alexandre Oliva
+dnl @version 2006-10-13
+dnl @license AllPermissive
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])

m4/glib-2.0.m4

@@ -19,6 +19,9 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run
          gmodule) 
              pkg_config_args="$pkg_config_args gmodule-2.0"
          ;;
+         gmodule-no-export) 
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
          gobject) 
              pkg_config_args="$pkg_config_args gobject-2.0"
          ;;

nano-regress

@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+use strict;
+
+sub combinations {
+  return [] unless @_;
+  my $first = shift;
+  my @rest = combinations(@_);
+  return @rest, map { [$first, @$_] } @rest;
+} 
+
+my @allargs=("--enable-debug", "--disable-justify", "--disable-extra", "--enable-tiny", "--disable-browser --disable-help --disable-mouse --disable-operatingdir --disable-speller", "--disable-multibuffer", "--disable-nanorc", "--with-slang");
+my @combos =  combinations(@allargs);
+
+my $i = 0;
+foreach my $name (@combos) {
+    my @args = @$name;
+    my $pct = $i / $#combos * 100;
+    printf "Trying with options: @args, %d%% done...\n", $pct;
+    if (system "(./configure @args && make clean all) >/dev/null 2>&1") {
+	print "Build failed for args: @args\n";
+	print "Try running make to reproduce\n";
+	exit(1);
+    }
+    $i++;
+}
+
+print "All options completed successfully!\n";

nano.spec.in

@@ -1,44 +1,39 @@
 %define name	@PACKAGE@
-%define ver	@VERSION@
-%define rel	1
+%define version	@VERSION@
+%define release	1
 
 Summary	: Pico editor clone with enhancements
 Name		: %{name}
-Version		: %{ver}
-Release		: %{rel}
-Copyright	: GPL
-Group		: Console/Editors
-URL		: http://www.nano-editor.org
-Source		: http://www.nano-editor.org/dist/v1.3/%{name}-%{ver}.tar.gz
-BuildRoot	: /var/tmp/%{name}-buildroot
-Requires	: ncurses
+Version		: %{version}
+Release		: %{release}
+License		: GPL
+Group		: Applications/Editors
+URL		: http://www.nano-editor.org/
+Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+BuildRoot	: %{_tmppath}/%{name}-%{version}-root
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
 
 %description
-GNU nano is a small and friendly text editor.  It aims to emulate the Pico
-text editor while also offering a few enhancements.
+GNU nano is a small and friendly text editor.  It aims to emulate the
+Pico text editor while also offering a few enhancements.
 
 %prep
 %setup -q
 
 %build
 %configure --enable-all
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf %{buildroot}
+make DESTDIR="%{buildroot}" install
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/*
-%{_mandir}/*/*
-%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_mandir}/man*/*
+%{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
-
-%changelog
-* Sat Mar 30 2002 Chris Allegretta <chrisa@asty.org>
-- Accepted into main distribution
-- Added Packager and URL tage from original spec file.
-* Tue Mar 06 2002 Brett Pemberton <generica@email.com>
-- Initial spec-file
+%{_datadir}/locale/*/LC_MESSAGES/nano.mo
+%{_datadir}/nano/*

po/.cvsignore

@@ -1,18 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-POTFILES
-Rules-quot
-boldquot.sed
-cat-id*
-en@boldquot.header
-en@quot.header
-insert-header.sin
-messages
-messages.mo
-nano.pot
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-cat*
-quot.sed
-*.gmo

po/.gitignore

@@ -0,0 +1,11 @@
+/*.gmo
+
+/Makefile.in.in
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/insert-header.sin
+/POTFILES
+/quot.sed
+/remove-potcdate.sin

po/ChangeLog

@@ -1,3 +1,357 @@
+2007-12-09  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: Add zh_CN.
+	* es.po, fr.po, it.po, nb.po, nl.po, pt_BR.po: New pull from the TP,
+	to fetch the now corrected latest pt_BR file.
+
+2007-12-08  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_CN.po: New Simplified Chinese translation by
+	LI Daobing <lidaobing@gmail.com>.
+	* fr.po, ga.po, ms.po, nl.po, nn.po, vi.po: Translation updates taken
+	from the Translation Project.
+	* Refreshed the rest of the files from the latest TP archive.
+
+2007-09-18  Jordi Mallach  <jordi@gnu.org>
+
+	* po/ru.po: Updated Russian translation by Sergey A. Ribalchenko.
+
+2007-08-11  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* po/update.pl: Relicense to the GNU GPL version 3 or later.
+
+2007-07-31  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* po/update.pl: Update copyright notice to account for
+	modifications.
+
+2007-01-29  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* ru.po: Updated Russian translation by Dimitriy Ryazantcev.
+	* ru.po: Fix incorrect "Project-Id-Version" entry and misplaced
+	space.
+
+2007-01-13  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* es.po: Fix misplaced space.
+	* eu.po: Fix typos and misplaced space.
+	* fr.po: Fix misplaced space.
+	* gl.po: Fix typos and misplaced space.
+	* nb.po: Fix typos and more misplaced space.
+
+2007-01-06  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* nb.po: Fix misplaced space.
+
+2006-12-06  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms again.
+	* ms.po: Fix incorrect "Project-Id-Version" entry.
+
+2006-12-06  Jordi Mallach <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2006-11-20  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* tr.po: Removed unneeded blank plural forms, as gettext 0.15
+	generates errors upon encountering them.
+
+2006-10-25  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-16  Jordi Mallach  <jordi@gnu.org>
+
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+
+2006-10-10  Jordi Mallach  <jordi@gnu.org>
+
+	* gl.po: Updated Galician translation by
+	Francisco Javier Tsao Santín.
+
+2006-10-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Refetch the current nano 1.9.99pre0 pt_BR file from
+	the TP, as the latest file offered is apparently for 1.3.11pre1.
+
+2006-10-02  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Restore previous version of pt_BR, as it was for
+	nano 1.9.99pre0, and the current version is for 1.3.11pre1.
+
+2006-09-27  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-10  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms again.
+
+2006-09-10  Jordi Mallach  <jordi@gnu.org>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-09-02  Jordi Mallach  <jordi@gnu.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by
+	Joao Victor Duarte Martins.
+
+2006-09-01  Benno Schulenberg  <bensberg@justemail.net>
+
+	* ChangeLog: Fix incorrect years in two entries.
+
+2006-08-31  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* bg.po: Fix misplaced space.
+
+2006-08-31  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cardenes Medina.
+
+2006-08-28  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+
+2006-08-25  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+2006-08-15  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* hu.po: Removed unneeded duplicate plural forms, as gettext
+	0.15 generates errors upon encountering them.
+	* id.po: Removed unneeded duplicate plural forms, as gettext
+	0.15 generates errors upon encountering them.
+
+2006-06-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-20  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* fr.po: Fix incorrect "Project-Id-Version" entry.
+	* hu.po: Fix incorrect "Project-Id-Version" entry.
+	* it.po: Fix incorrect "Project-Id-Version" entry.
+
+2006-06-19  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+
+2006-06-17  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* de.po: Updated German translation by Michael Piefel.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-06-12  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2006-06-09  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* ga.po: Updated Irish translation by Kevin Patrick Scannell.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-05-17  Jordi Mallach  <jordi@gnu.org>
+
+	* LINGUAS: Added "ga".
+	* ga.po: New Irish translation by
+	Kevin Patrick Scannell <scannell@SLU.EDU>.
+
+2006-05-10  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2006-03-15  Jordi Mallach  <jordi@gnu.org>
+
+	* sv.po: Updated Swedish translation by Daniel Nylander.
+
+2006-03-06  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Vietnamese translation by
+	Phan Vinh Thinh.
+
+2005-12-21  Jordi Mallach  <jordi@gnu.org>
+
+	* bg.po: Updated Bulgarian translation by Anton Zinoviev.
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+
+2005-12-13  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* de.po: Updated German translation by Michael Piefel.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+
+2005-11-08  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add prompt.c.
+
+2005-11-05  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add browser.c.
+
+2005-11-01  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add help.c.
+
+2005-10-23  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* eu.po: Updated Basque translation by Mikel Olasagasti.
+	* fr.po: Updated French translation by Jean-Philippe Guérard.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ms.po: Updated Malay translation by Sharuzzaman Ahmat Raslan.
+	* nl.po: Updated Dutch translation by Benno Schulenberg.
+	* zh_TW: Updated Traditional Chinese translation by
+	Wei-Lun Chao.
+	
+2005-08-22  Jordi Mallach  <jordi@gnu.org>
+	* bg.po: New Bulgarian translation by
+	Yavor Doganov <yavor@doganov.org>.
+
+	* LINGUAS: Added "bg".
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+
+2005-08-16  Jordi Mallach  <jordi@gnu.org>
+
+	* nl.po: Updated Dutch translation by
+	Benno Schulenberg and Reinout van Schouwen.
+
+2005-07-24  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Add text.c.
+
+2005-07-19  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-07-18  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-07-07  Jordi Mallach  <jordi@gnu.org>
+
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ca.po: Updated Catalan translation.
+
+2005-06-28  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* POTFILES.in: Remove source files that contain no translatable
+	strings.
+
+2005-06-19  David Lawrence Ramsey  <pooka109@cox.net>
+
+	* pt_BR.po: Typo fix.
+
+2005-06-15  Jordi Mallach  <jordi@gnu.org>
+
+	* de.po: Typo fix by Jens Seidel.
+
+2005-05-23  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+
+2005-04-27  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+
+2005-04-22  Jordi Mallach  <jordi@gnu.org>
+
+	* nb.po: Updated Norwegian bokmål translation by
+	Geir Helland.
+
+2005-04-20  Jordi Mallach  <jordi@gnu.org>
+
+	* ms.po: Updated Malay translation by
+	Sharuzzaman Ahmat Raslan.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: Updated Vietnamese translation by Phan Vinh Thinh.
+
+2005-04-18  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* ro.po: Updated Romanian translation by Laurentiu Buzdugan.
+
+2005-04-14  Jordi Mallach  <jordi@gnu.org>
+
+	* es.po: Updated Spanish translation by
+	Ricardo Javier Cárdenes Medina.
+
+2005-04-13  Jordi Mallach  <jordi@gnu.org>
+
+	* vi.po: New Vietnamese translation by Phan Vinh Thinh.
+	* LINGUAS: Added "vi".
+
+2005-04-09  Jordi Mallach  <jordi@gnu.org>
+
+	* zh_TW.po: Added Plural-Forms header and fix format specification
+	typos.
+
+2005-04-08  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* it.po: Updated Italian translation by Marco Colombo.
+	* zh_TW.po: Updated Traditional Chinese translation by
+	CHAO Wei-Lun.
+
+2005-04-06  Jordi Mallach  <jordi@gnu.org>
+
+	* rw.po: New Kinyarwanda translation by Steve Murphy.
+	* LINGUAS: Added "rw".
+
+2005-04-05  Jordi Mallach  <jordi@gnu.org>
+
+	* fr.po: Updated French translation by
+	Jean-Philippe Guérard.
+	* ro.po: Updated Romanian translation by
+	Laurentiu Buzdugan.
+
 2005-03-11  Jordi Mallach  <jordi@gnu.org>
 
 	* ms.po: Updated Malay translation by

po/LINGUAS

@@ -1,2 +1,2 @@
 # List of available languages.
-ca cs da de es eu fi fr gl hu id it ms nb nl nn pl pt_BR ro ru sr sv tr uk zh_TW
+bg ca cs da de es eu fi fr ga gl hu id it ms nb nl nn pl pt_BR ro ru rw sr sv tr uk vi zh_CN zh_TW

po/POTFILES.in

@@ -1,17 +1,14 @@
 # $Id$
 # List of source files containing translatable strings.
 
-# Package source files
-src/cut.c
+src/browser.c
 src/files.c
 src/global.c
-src/move.c
+src/help.c
 src/nano.c
+src/prompt.c
 src/rcfile.c
 src/search.c
+src/text.c
 src/utils.c
 src/winio.c
-
-# Package header files
-src/nano.h
-src/proto.h