From 514cd9a099e69aa42dd461143624ccd44cbf7020 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg <bensberg@justemail.net> Date: Mon, 29 Aug 2016 17:10:49 +0200 Subject: [PATCH] update the license text to the preferred version Mentioning "GNU nano" instead of "This program" and referring to the website instead of to a postal address. --- configure.ac | 20 +++++++++----------- src/browser.c | 22 ++++++++++------------ src/chars.c | 22 ++++++++++------------ src/color.c | 22 ++++++++++------------ src/cut.c | 22 ++++++++++------------ src/files.c | 24 +++++++++++------------- src/global.c | 22 ++++++++++------------ src/help.c | 22 ++++++++++------------ src/move.c | 22 ++++++++++------------ src/nano.c | 22 ++++++++++------------ src/nano.h | 22 ++++++++++------------ src/prompt.c | 22 ++++++++++------------ src/proto.h | 23 +++++++++++------------ src/rcfile.c | 22 ++++++++++------------ src/search.c | 22 ++++++++++------------ src/text.c | 22 ++++++++++------------ src/utils.c | 22 ++++++++++------------ src/winio.c | 22 ++++++++++------------ 18 files changed, 181 insertions(+), 216 deletions(-) diff --git a/configure.ac b/configure.ac index 1c6ef38a..336e2fac 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 8e37816d..84e36048 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 86276b71..8f723641 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 64a8dde7..9797949c 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 6d141a3e..14c52c2a 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 e3b88836..11f8eda2 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 739757cf..11f4e2a3 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 9d7b380c..823fa2a2 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 0d7507b0..f3ad6e55 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 1caff3eb..062d3f1b 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 4fa9ef51..0f402952 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 a9021853..3ab5b510 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 4ec4fdd0..85f7b10a 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 fe484751..c34af92b 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 071322b7..181eb9e9 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 869da10e..31bfc0ab 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 4710379e..dd29741f 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 aa4dd6c0..37ef8274 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/. * * * **************************************************************************/ -- GitLab