From 49fc528d88c6b11670fe213c66c93a1d06d14b80 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 14 Aug 2016 21:18:00 +0200 Subject: [PATCH] restore the GNU marker in nano's name --- IMPROVEMENTS | 4 ++-- README | 6 +++--- README.GIT | 6 +++--- THANKS | 2 +- configure.ac | 10 +++++----- doc/faq.html | 16 ++++++++-------- doc/man/nanorc.5 | 2 +- doc/nanorc.sample.in | 2 +- doc/texinfo/nano.texi | 12 ++++++------ nano.spec.in | 2 +- src/nano.c | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/IMPROVEMENTS b/IMPROVEMENTS index 592fb63a..7de047b0 100644 --- a/IMPROVEMENTS +++ b/IMPROVEMENTS @@ -1,5 +1,5 @@ -Improvements in nano -==================== +Improvements in GNU nano +======================== Since 2.6.0: - Ctrl+Arrow should now work also on a Linux virtual console. diff --git a/README b/README index 2af62db2..c3ea0b1c 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - nano - an enhanced clone of the Pico text editor + GNU nano - an enhanced clone of the Pico text editor. Overview @@ -68,5 +68,5 @@ Mailing Lists and Bug Reports Current Status - nano has reached its seventh milestone, 2.6.x. Since 2.5.0, it is - a "rolling" release: bug fixing and development go hand in hand. + GNU nano has reached its seventh milestone, 2.6.x. Since 2.5.0, it + is a "rolling" release: bug fixing and development go hand in hand. diff --git a/README.GIT b/README.GIT index 240632f2..f208afcb 100644 --- a/README.GIT +++ b/README.GIT @@ -1,14 +1,14 @@ INSTRUCTIONS TO COMPILE AND INSTALL NANO GIT VERSIONS ===================================================== -The latest version of nano is available via git, but building this needs a -bit more care than the official stable and unstable tarballs. +The latest version of GNU nano is available via git, but building this needs +a bit more care than the official stable and unstable tarballs. Prerequisites ------------- -To successfully compile nano from the git repo, you'll need the following +To successfully compile GNU nano from the git repo, you'll need the following packages: - autoconf (version >= 2.61) diff --git a/THANKS b/THANKS index 4c95d42e..eaf54b1e 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -The following people have helped nano in some way or other. +The following people have helped GNU nano in some way or another. If we missed you here, let us know! diff --git a/configure.ac b/configure.ac index 514c0835..1c6ef38a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,24 @@ -# Configuration for nano - a small and user-friendly text editor +# Configuration for GNU nano - a small and user-friendly text editor # # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. # -# nano is free software; you can redistribute it and/or modify it +# 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. # -# nano is distributed in the hope that it will be useful, but +# 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 nano; if not, write to the Free Software +# along with GNU nano; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, # USA. -AC_INIT([nano], [2.6.3], [nano-devel@gnu.org], [nano]) +AC_INIT([GNU nano], [2.6.3], [nano-devel@gnu.org], [nano]) AC_CONFIG_SRCDIR([src/nano.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE diff --git a/doc/faq.html b/doc/faq.html index 397fd747..0b9508e4 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -1,21 +1,21 @@ - The nano editor FAQ + The GNU nano editor FAQ -

The nano editor FAQ

+

The GNU nano editor FAQ

Table of Contents

1. General

1.1 About this FAQ
1.2. How do I contribute to it?
- 1.3. What is nano?
+ 1.3. What is GNU nano?
1.4. What is the history behind nano?
1.5. Why the name change from TIP?
1.6. What is the current version of nano?
1.7. I want to read the manpage without having to download the program!

-

2. Where to get nano.

+

2. Where to get GNU nano.

2.1. FTP and WWW sites that carry nano.
2.2. RedHat and derivatives (.rpm) packages.
2.3. Debian (.deb) packages.
@@ -69,8 +69,8 @@

This FAQ was originally written and maintained by Chris Allegretta <chrisa@asty.org>, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey <pooka109@gmail.com>. Maybe someone else will volunteer to maintain this FAQ someday, who knows...

1.2. How do I contribute to it?

Your best bet is to send it to the nano email address, nano@nano-editor.org and if it is useful enough it will be included in future versions.

-

1.3. What is nano?

-

nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from The University of Washington. It aims to "emulate Pico as closely as possible and perhaps include extra functionality".

+

1.3. What is GNU nano?

+

GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from The University of Washington. It aims to "emulate Pico as closely as possible and perhaps include extra functionality".

1.4. What is the history behind nano?

Funny you should ask!

In the beginning...

@@ -88,7 +88,7 @@

1.7. I want to read the man page without having to download the program!

Jeez, demanding, aren't we? Okay, look here.

-

2. Where to get nano.

+

2. Where to get GNU nano.

2.1. FTP and WWW sites that carry nano.

The nano distribution can be downloaded at the following web sites:

    @@ -221,7 +221,7 @@

    5. Internationalization

    5.1. There's no translation for my language!

    -

    In June 2001, nano entered the Translation Project and since then, translations should be managed from there.

    +

    In June 2001, GNU nano entered the Translation Project and since then, translations should be managed from there.

    If there isn't a translation for your language, you could ask your language team to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a translation disclaimer to the FSF (this is necessary as nano is an official GNU package, but it does not mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).

    In any case, translating nano is very easy. Just grab the latest nano.pot file listed on nano's page at the TP, and translate each msgid line into your native language on the msgstr line. When you're done, you should send it to the TP's central po repository.

    5.2. I don't like the translation for <x> in my language. How can I fix it?

    diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index fcdc251d..b27c674e 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -21,7 +21,7 @@ .\" Please adjust this date whenever revising the manpage. .\" .SH NAME -nanorc \- nano's rcfile +nanorc \- GNU nano's rcfile .SH DESCRIPTION The \fInanorc\fP file contains the default settings for \fBnano\fP, a small and friendly editor. The file should be in Unix format, not in diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in index 3a1bfe06..6c568997 100644 --- a/doc/nanorc.sample.in +++ b/doc/nanorc.sample.in @@ -1,4 +1,4 @@ -## Sample initialization file for nano. +## 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 diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 4f39c1e3..d777472b 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -19,16 +19,16 @@ @c end tex @titlepage -@title @code{nano} +@title GNU @code{nano} @subtitle a small and friendly text editor. @subtitle version 2.6.3 @author Chris Allegretta @page -This manual documents @code{nano}, a small and friendly text editor. +This manual documents GNU @code{nano}, a small and friendly text editor. -This manual is part of the @code{nano} distribution.@* +This manual is part of the GNU @code{nano} distribution.@* @sp 4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2014, 2015 Free Software Foundation, Inc. @@ -55,7 +55,7 @@ e-mail: @email{chrisa@@asty.org}@* @node Top @top -This manual documents @code{nano}, a small and friendly text editor. +This manual documents GNU @code{nano}, a small and friendly text editor. @menu * Introduction:: @@ -74,7 +74,7 @@ This manual documents @code{nano}, a small and friendly text editor. @node Introduction @chapter Introduction -@code{nano} is a small and friendly text editor. Besides basic text +GNU @code{nano} is a small and friendly text editor. Besides basic text editing, @code{nano} offers many extra features, such as an interactive search-and-replace, undo/redo, syntax coloring, smooth scrolling, auto-indentation, go-to-line-and-column-number, feature toggles, @@ -1491,7 +1491,7 @@ chances are you only want this feature when you're working on the nano source. @item --disable-nls Disables Native Language support. This will disable the use of any -available @code{nano} translations. +available GNU @code{nano} translations. @item --disable-wrapping-as-root Disable hard-wrapping of overlong lines by default when @code{nano} diff --git a/nano.spec.in b/nano.spec.in index 38a3f8df..ccb20a5e 100644 --- a/nano.spec.in +++ b/nano.spec.in @@ -18,7 +18,7 @@ Requires(post) : info Requires(preun) : info %description -nano is a small and friendly text editor. It aims to emulate the +GNU nano is a small and friendly text editor. It aims to emulate the Pico text editor while also offering several enhancements. %prep diff --git a/src/nano.c b/src/nano.c index 4d82c938..55c01216 100644 --- a/src/nano.c +++ b/src/nano.c @@ -920,9 +920,9 @@ void usage(void) void version(void) { #ifdef REVISION - printf(" nano from git, %s\n", REVISION); + printf(" GNU nano from git, %s\n", REVISION); #else - printf(_(" nano, version %s\n"), VERSION); + printf(_(" GNU nano, version %s\n"), VERSION); #endif printf(" (C) 1999..2016 Free Software Foundation, Inc.\n"); printf(_(" (C) 2014..%s the contributors to nano\n"), "2016");