From 3e5fcec76c12b45a5dd12cb731e160c8e8fb1e0c Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 13 Jun 2016 12:17:13 +0200 Subject: [PATCH] remove the GNU marker from nano's name Signed-off-by: Benno Schulenberg --- README | 6 +++--- README.GIT | 4 ++-- THANKS | 2 +- UPGRADE | 6 +++--- configure.ac | 10 +++++----- doc/faq.html | 16 ++++++++-------- doc/man/nanorc.5 | 2 +- doc/nanorc.sample.in | 2 +- doc/texinfo/nano.texi | 13 ++++++------- nano.spec.in | 2 +- src/nano.c | 4 ++-- 11 files changed, 33 insertions(+), 34 deletions(-) diff --git a/README b/README index b304ada7..9e759650 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - GNU nano - an enhanced clone of the Pico text editor. + nano - an enhanced clone of the Pico text editor Overview @@ -68,5 +68,5 @@ Mailing Lists and Bug Reports Current Status - GNU nano has reached its sixth milestone, 2.5.x. This is now a - "rolling" release: bug fixing and development go hand in hand. + 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 ce1a14dd..240632f2 100644 --- a/README.GIT +++ b/README.GIT @@ -1,14 +1,14 @@ INSTRUCTIONS TO COMPILE AND INSTALL NANO GIT VERSIONS ===================================================== -The latest version of GNU nano is available via git, but building this needs a +The latest version of nano is available via git, but building this needs a bit more care than the official stable and unstable tarballs. Prerequisites ------------- -To successfully compile GNU nano from the git repo, you'll need the following +To successfully compile nano from the git repo, you'll need the following packages: - autoconf (version >= 2.61) diff --git a/THANKS b/THANKS index eaf54b1e..4c95d42e 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -The following people have helped GNU nano in some way or another. +The following people have helped nano in some way or other. If we missed you here, let us know! diff --git a/UPGRADE b/UPGRADE index 72c6d679..243a0ba3 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,5 +1,5 @@ -GNU nano upgrading information -============================== +nano upgrading information +========================== Visible changes since 2.0 ------------------------- @@ -108,4 +108,4 @@ Visible changes since 1.0 - Creation of backup files (-B). - Search/replace history (-H). -See the GNU nano manual for detailed information on each feature. +See the nano manual for detailed information on each feature. diff --git a/configure.ac b/configure.ac index c47885ba..9eec18d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,24 @@ -# Configuration for GNU nano - a small and user-friendly text editor +# Configuration for 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. # -# GNU nano is free software; you can redistribute it and/or modify it +# 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 +# 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 +# along with nano; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, # USA. -AC_INIT([GNU nano], [2.5.3], [nano-devel@gnu.org], [nano]) +AC_INIT([nano], [2.6.0], [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 9575e608..5b196721 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -1,21 +1,21 @@ - The GNU nano editor FAQ + The nano editor FAQ -

The GNU nano editor FAQ

+

The 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 GNU nano?
+ 1.3. What is 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 GNU nano.

+

2. Where to get 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 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.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.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 GNU nano.

+

2. Where to get nano.

2.1. FTP and WWW sites that carry nano.

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

    @@ -222,7 +222,7 @@

    5. Internationalization

    5.1. There's no translation for my language!

    -

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

    +

    In June 2001, 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 d94c7ed8..93183f59 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 \- GNU nano's rcfile +nanorc \- 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 48f62cc5..47d3bc76 100644 --- a/doc/nanorc.sample.in +++ b/doc/nanorc.sample.in @@ -1,4 +1,4 @@ -## Sample initialization file for GNU nano. +## Sample initialization file for 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 2b3564fe..58c52d83 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -19,17 +19,17 @@ @c end tex @titlepage -@title GNU @code{nano} +@title @code{nano} @subtitle a small and friendly text editor. @subtitle version 2.5.2 @author Chris Allegretta @page -This manual documents GNU @code{nano}, a small and friendly text +This manual documents @code{nano}, a small and friendly text editor. -This manual is part of the GNU @code{nano} distribution.@* +This manual is part of the @code{nano} distribution.@* @sp 4 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2014, 2015 Free Software Foundation, Inc. @@ -56,8 +56,7 @@ e-mail: @email{chrisa@@asty.org}@* @node Top @top -This manual documents GNU @code{nano}, a small and friendly text -editor. +This manual documents @code{nano}, a small and friendly text editor. @menu * Introduction:: @@ -76,7 +75,7 @@ editor. @node Introduction @chapter Introduction -GNU @code{nano} is a small and friendly text editor. Besides basic text +@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, @@ -1474,7 +1473,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 GNU @code{nano} translations. +available @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 f60d24e3..34223cc6 100644 --- a/nano.spec.in +++ b/nano.spec.in @@ -18,7 +18,7 @@ Requires(post) : info Requires(preun) : info %description -GNU nano is a small and friendly text editor. It aims to emulate the +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 8bbe7415..27e1c7da 100644 --- a/src/nano.c +++ b/src/nano.c @@ -935,9 +935,9 @@ void usage(void) void version(void) { #ifdef REVISION - printf(" GNU nano from git, commit %s (after %s)\n", REVISION, VERSION); + printf(" nano from git, commit %s (after %s)\n", REVISION, VERSION); #else - printf(_(" GNU nano, version %s\n"), VERSION); + printf(_(" nano, version %s\n"), VERSION); #endif printf(" (C) 1999..2016 Free Software Foundation, Inc.\n"); printf(