diff --git a/configure.ac b/configure.ac
index 1c6ef38a4d9ca7e5d505af0fdca4a56e227bd928..336e2fac733317c8a0c9c603e26a776e227bfb94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,20 +3,18 @@
# 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
-# 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 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.
#
-# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
AC_INIT([GNU nano], [2.6.3], [nano-devel@gnu.org], [nano])
AC_CONFIG_SRCDIR([src/nano.c])
diff --git a/src/browser.c b/src/browser.c
index 8e37816ddd928dbb077c02df67a9636088acf312..84e36048273e8fea50cd6dff407b55e7375f959e 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * browser.c *
+ * browser.c -- This file is part of GNU nano. *
* *
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
* 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/chars.c b/src/chars.c
index 86276b719abc5b9163e71a645b86dcd0e7a40da6..8f723641e9086d497d3cd802e5467b90ac75b2b1 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * chars.c *
+ * chars.c -- This file is part of GNU nano. *
* *
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
* 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/color.c b/src/color.c
index 64a8dde7072f66bd73b773c5f40b57383678ae09..9797949c28b2f9b90bb4ed61d2ea70054fb344eb 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * color.c *
+ * color.c -- This file is part of GNU nano. *
* *
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
* 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/cut.c b/src/cut.c
index 6d141a3eb0fec68a1dfb1c69570baf4d38c8f243..14c52c2a95fef191ee00f881df08dc4fe6eb6932 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,25 +1,23 @@
/**************************************************************************
- * cut.c *
+ * cut.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014 Mark Majeres *
* Copyright (C) 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/files.c b/src/files.c
index e3b88836292f7f389fa042199636ca4262ed92ca..11f8eda22e5cb5e33e47a2e5df5e96abcd9f4bcf 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * files.c *
+ * files.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
@@ -839,7 +837,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkw
if (len > 0) {
#ifndef NANO_TINY
/* If file conversion isn't disabled and the last character in
- * this file is '\r', set format to Mac if we currently think
+ * This file is '\r', set format to Mac if we currently think
* the file is a *nix file, or to both DOS and Mac if we
* currently think the file is a DOS file. */
if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT) && format < 2)
diff --git a/src/global.c b/src/global.c
index 739757cfe7f94035790ebbcdbb08b88feb8d9dc5..11f4e2a36596e759f1d834fdcd38038075363e73 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * global.c *
+ * global.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/help.c b/src/help.c
index 9d7b380c842010fb6068cbe64125e7e84a9e5569..823fa2a2bb265a79462ca0836fcc3f1a860bfab7 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * help.c *
+ * help.c -- This file is part of GNU nano. *
* *
* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, *
* 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/move.c b/src/move.c
index 0d7507b06d9938c386c291bd3ad33baf691bcd6e..f3ad6e55f2e2d429fe2e8983dbb3192e3fb3e7fb 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * move.c *
+ * move.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/nano.c b/src/nano.c
index 1caff3ebb788c1f660a231ba2705194befc69cd0..062d3f1bddab608f6e3ecf5dca816581c837b98e 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * nano.c *
+ * nano.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/nano.h b/src/nano.h
index 4fa9ef51c4630ca0b05c12a287a1124f76fc0779..0f402952fcc07df513e67fe966fc0377c306b49b 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,24 +1,22 @@
/**************************************************************************
- * nano.h *
+ * nano.h -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
*
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/prompt.c b/src/prompt.c
index a902185305b7428ee29236a7eb266fa1dde077cf..3ab5b510a22f3780678060b98c653c0381a72a68 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * prompt.c *
+ * prompt.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/proto.h b/src/proto.h
index 4ec4fdd086f74f94740f53d48287a7b6c5e9e4da..85f7b10a12176fea3dc95703d35fa64257a36559 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,22 +1,21 @@
/**************************************************************************
- * proto.h *
+ * proto.h -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
- * 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, 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. *
+ * 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 of the License, *
+ * 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. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/rcfile.c b/src/rcfile.c
index fe4847510890743cccaaac4d108cb33a9ef3cf00..c34af92b22ad92669ecac140c5e132271dd98c0b 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,25 +1,23 @@
/**************************************************************************
- * rcfile.c *
+ * rcfile.c -- This file is part of GNU nano. *
* *
* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
* 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014 Mike Frysinger *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/search.c b/src/search.c
index 071322b74864b99154af43b78c737edb249d280b..181eb9e96f2a75fe91d0e0182efead67b882940c 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * search.c *
+ * search.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/text.c b/src/text.c
index 869da10e30e7e884314819103ce3add1aaa6f7bc..31bfc0abb88f329673e43bc147942453b145a05c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,5 +1,5 @@
/**************************************************************************
- * text.c *
+ * text.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
@@ -7,20 +7,18 @@
* Copyright (C) 2016 Mike Scalora *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/utils.c b/src/utils.c
index 4710379e782617eae9e34b453c315d7518121800..dd29741fa8da86867060cb4eb197a35d05a3660d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * utils.c *
+ * utils.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/
diff --git a/src/winio.c b/src/winio.c
index aa4dd6c0f5291898574fe3b37f079832f1f50398..37ef8274b4baecefc72b2a7623e5f23332df8b6d 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,24 +1,22 @@
/**************************************************************************
- * winio.c *
+ * winio.c -- This file is part of GNU nano. *
* *
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
* 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
- * 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, 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 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. *
+ * 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 this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301, USA. *
+ * along with this program. If not, see http://www.gnu.org/licenses/. *
* *
**************************************************************************/