From df0e90fca7e20312d4e16c6ad21ac0d5837d6638 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Mon, 20 Jun 2016 19:44:56 +0200 Subject: [PATCH 1/2] Use https and drop www. for nano-editor.org. Switch to https and drop www. suffix for all occurrences of the website URL. --- README | 2 +- doc/faq.html | 14 +++++++------- nano.spec.in | 4 ++-- src/nano.c | 2 +- src/winio.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index 9e75965..2af62db 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ How to compile and install nano Web Page - http://www.nano-editor.org/ + https://nano-editor.org/ Mailing Lists and Bug Reports diff --git a/doc/faq.html b/doc/faq.html index 5b19672..0bb876b 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -84,22 +84,22 @@

1.5. Why the name change from TIP?

On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", 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).

1.6. What is the current version of nano?

-

The current stable version of nano *should* be 2.4.2. Of course, you should always check the nano homepage to see what the latest and greatest version is.

+

The current stable version of nano *should* be 2.4.2. Of course, you should always check the nano homepage to see what the latest and greatest version is.

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

-

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

+

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


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:

2.2. RedHat and derivatives (.rpm) packages.

2.3. Debian (.deb) packages.

@@ -232,9 +232,9 @@

6. Advocacy and Licensing

6.1. Why should I use nano instead of Pico?

-

There are many reasons to use nano instead of Pico. A more complete list can be found at the nano homepage.

+

There are many reasons to use nano instead of Pico. A more complete list can be found at the nano homepage.

6.2. Why should I use Pico instead of nano?

-

Again, check out the nano homepage 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.

Note that the last of these no longer applies to the new version of Pine, Alpine, which is under the Apache License, version 2.0.

+

Again, check out the nano homepage 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.

Note that the last of these no longer applies to the new version of Pine, Alpine, which is under the Apache License, version 2.0.

6.3. What is so bad about the older Pine license?

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 Debian Free Software Guidelines. 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.

6.4. Okay, well, what mail program should I use then?

@@ -248,7 +248,7 @@ Of course, due to the license change you can now use the http://mail.gnu.org/mailman/listinfo/help-nano/
nano-devel - http://mail.gnu.org/mailman/listinfo/nano-devel/

7.2. I want to send the development team a big load of cash (or just a thank you).

-

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

+

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

7.3. How do I submit a bug report or patch?

The best place to submit bugs is to the Savannah bug tracker as you can check whether the bug you are submitting has already been submitted. diff --git a/nano.spec.in b/nano.spec.in index 34223cc..c9f9f4d 100644 --- a/nano.spec.in +++ b/nano.spec.in @@ -9,8 +9,8 @@ Summary : a user-friendly editor, a Pico clone with enhancements License : GPLv3+ Group : Applications/Editors -URL : http://www.nano-editor.org/ -Source : http://www.nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz +URL : https://nano-editor.org/ +Source : https://nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires : autoconf, automake, gettext-devel, ncurses-devel, texinfo diff --git a/src/nano.c b/src/nano.c index b53e1f0..5573cd5 100644 --- a/src/nano.c +++ b/src/nano.c @@ -928,7 +928,7 @@ void version(void) printf(" (C) 1999..2016 Free Software Foundation, Inc.\n"); printf(_(" (C) 2014..%s the contributors to nano\n"), "2016"); printf( - _(" Email: address@hidden Web: http://www.nano-editor.org/")); + _(" Email: address@hidden Web: https://nano-editor.org/")); printf(_("\n Compiled options:")); #ifdef NANO_TINY diff --git a/src/winio.c b/src/winio.c index 511c96a..07c68a3 100644 --- a/src/winio.c +++ b/src/winio.c @@ -3224,7 +3224,7 @@ void do_credits(void) "", "", "", - "http://www.nano-editor.org/" + "https://nano-editor.org/" }; const char *xlcredits[XLCREDIT_LEN] = { -- 2.8.1