diff --git a/README b/README
index b304ada7ee328cff8b7cd21e7a1a2a906a0402fa..9e759650e42ae39046880054d2466875374fffb9 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 ce1a14dd2260a2c91fab5d349eff6c555f99c0f6..240632f27aa145a9216eff84893e530444e35d58 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 eaf54b1efbca0de7bba0997096ecf21f84054ee1..4c95d42e27c6620908b7a65debb59070ea3ffc0b 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 72c6d67933fd9adc671a597c438d459e9df770db..243a0ba3126ea85cb3e34cafd0c2c90058b3b85f 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 c47885baab0186b9a4a3091e2cf8f8705dadca60..9eec18d0ecb8df23edee188cad5d167d8decdc1b 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 9575e6087f21e26b2acc3060567076227f604fdd..5b196721a7dafbbce973e1442aea684f3f7f944f 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -1,21 +1,21 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>The GNU nano editor FAQ</title>
+ <title>The nano editor FAQ</title>
<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>
+<h1>The nano editor FAQ</h1>
<h2>Table of Contents</h2>
<h2><a href="#1">1. General</a></h2>
<blockquote><p><a href="#1.1">1.1 About this FAQ</a><br>
<a href="#1.2">1.2. How do I contribute to it?</a><br>
- <a href="#1.3">1.3. What is GNU nano?</a><br>
+ <a href="#1.3">1.3. What is nano?</a><br>
<a href="#1.4">1.4. What is the history behind nano?</a><br>
<a href="#1.5">1.5. Why the name change from TIP?</a><br>
<a href="#1.6">1.6. What is the current version of nano?</a><br>
<a href="#1.7">1.7. I want to read the manpage without having to download the program!</a></p></blockquote>
-<h2><a href="#2">2. Where to get GNU nano.</a></h2>
+<h2><a href="#2">2. Where to get nano.</a></h2>
<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>
@@ -69,8 +69,8 @@
<blockquote><p>This FAQ was originally written and maintained by Chris Allegretta <<a href="mailto:chrisa@asty.org">chrisa@asty.org</a>>, who also happens to be the creator of nano. It was then maintained by David Lawrence Ramsey <<a href="mailto:pooka109@gmail.com">pooka109@gmail.com</a>>. 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>
-<blockquote><p>GNU nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to "emulate Pico as closely as possible and perhaps include extra functionality".</p></blockquote>
+<h2><a name="1.3"></a>1.3. What is nano?</h2>
+<blockquote><p>nano is designed to be a free replacement for the Pico text editor, part of the Pine email suite from <a href="http://www.washington.edu/pine/">The University of Washington</a>. It aims to "emulate Pico as closely as possible and perhaps include extra functionality".</p></blockquote>
<h2><a name="1.4"></a>1.4. What is the history behind nano?</h2>
<blockquote><p>Funny you should ask!</p>
<p><b>In the beginning...</b></p>
@@ -88,7 +88,7 @@
<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/v2.4/nano.1.html">here</a>.</p></blockquote>
<hr width="100%">
-<h1><a name="2"></a>2. Where to get GNU nano.</h1>
+<h1><a name="2"></a>2. Where to get nano.</h1>
<h2><a name="2.1"></a>2.1. FTP and WWW sites that carry nano.</h2>
<blockquote><p>The nano distribution can be downloaded at the following fine web and ftp sites:</p>
<ul>
@@ -222,7 +222,7 @@
<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://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+<blockquote><p>In June 2001, nano entered the <a href="http://translationproject.org/html/welcome.html">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 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 <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 latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> 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 <x> in my language. How can I fix it?</h2>
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index d94c7ed815738cbd428983ea35a78f3371a93184..93183f59ba87b333fd3dd8b8d0ec717cd374bb4b 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 48f62cc5cf75355fb7dc683be324c61008be68f2..47d3bc765b52de3ac528a91f43a04d7b5524d32b 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 2b3564fe55623e574540c23a5c157d1e2b167fc0..58c52d83be834021d1fc7237ddabf31c979e9386 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 f60d24e3b8001045075838802c11de119c5f21ed..34223cc68dc445b3b6895a05a63f27e2dc679818 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 8bbe7415aedc1205a7b56dfd2f8a544f22014eab..27e1c7da7bc7cc9210a12a080aa9201f5e9b5d92 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(