From b4c38a723f03c08210edce57f5eb1900b2106da9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 26 Jul 2020 02:23:40 -0400 Subject: [PATCH] drop "coding: UTF-8" header This header is used inconsistently -- man pages are UTF-8 encoded but not setting this marker. It's only respected by the man-db package, and seems a bit anachronistic at this point when UTF-8 is the standard default nowadays. Signed-off-by: Mike Frysinger Signed-off-by: Michael Kerrisk --- man1/iconv.1 | 2 -- man3/mbstowcs.3 | 1 - man3/newlocale.3 | 1 - man5/locale.5 | 1 - man7/armscii-8.7 | 1 - man7/charsets.7 | 1 - man7/cp1251.7 | 1 - man7/cp1252.7 | 1 - man7/iso_8859-1.7 | 1 - man7/iso_8859-10.7 | 1 - man7/iso_8859-11.7 | 1 - man7/iso_8859-13.7 | 1 - man7/iso_8859-14.7 | 1 - man7/iso_8859-15.7 | 1 - man7/iso_8859-16.7 | 1 - man7/iso_8859-2.7 | 1 - man7/iso_8859-3.7 | 1 - man7/iso_8859-4.7 | 1 - man7/iso_8859-5.7 | 1 - man7/iso_8859-6.7 | 1 - man7/iso_8859-7.7 | 1 - man7/iso_8859-8.7 | 1 - man7/iso_8859-9.7 | 1 - man7/koi8-r.7 | 1 - man7/koi8-u.7 | 1 - man8/iconvconfig.8 | 2 -- scripts/convert_to_utf_8.sh | 2 +- 27 files changed, 1 insertion(+), 29 deletions(-) diff --git a/man1/iconv.1 b/man1/iconv.1 index 3649e6dbe..8207e1cea 100644 --- a/man1/iconv.1 +++ b/man1/iconv.1 @@ -1,5 +1,3 @@ -'\" t -*- coding: UTF-8 -*- -.\" .\" Copyright (C) 2014 Marko Myllynen .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man3/mbstowcs.3 b/man3/mbstowcs.3 index f92ab681c..cf650506e 100644 --- a/man3/mbstowcs.3 +++ b/man3/mbstowcs.3 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright (c) Bruno Haible .\" and Copyright 2014 Michael Kerrisk .\" diff --git a/man3/newlocale.3 b/man3/newlocale.3 index 2d71f1a8c..86b961fc6 100644 --- a/man3/newlocale.3 +++ b/man3/newlocale.3 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright (C) 2014 Michael Kerrisk .\" .\" %%%LICENSE_START(VERBATIM) diff --git a/man5/locale.5 b/man5/locale.5 index 85e548bc1..f6b63da9d 100644 --- a/man5/locale.5 +++ b/man5/locale.5 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright (C) 1994 Jochen Hein (Hein@Student.TU-Clausthal.de) .\" Copyright (C) 2008 Petr Baudis (pasky@suse.cz) .\" Copyright (C) 2014 Michael Kerrisk diff --git a/man7/armscii-8.7 b/man7/armscii-8.7 index 94c51e368..163c81d5b 100644 --- a/man7/armscii-8.7 +++ b/man7/armscii-8.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/charsets.7 b/man7/charsets.7 index ceb5154ef..734ebfb1b 100644 --- a/man7/charsets.7 +++ b/man7/charsets.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright (c) 1996 Eric S. Raymond .\" and Copyright (c) Andries Brouwer .\" diff --git a/man7/cp1251.7 b/man7/cp1251.7 index 382de42c8..fdc1af847 100644 --- a/man7/cp1251.7 +++ b/man7/cp1251.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/cp1252.7 b/man7/cp1252.7 index 07ac84bf5..759a4061d 100644 --- a/man7/cp1252.7 +++ b/man7/cp1252.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2014 (C) Marko Myllynen .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-1.7 b/man7/iso_8859-1.7 index 202768231..8c57bcfbc 100644 --- a/man7/iso_8859-1.7 +++ b/man7/iso_8859-1.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 1993-1995 Daniel Quinlan (quinlan@yggdrasil.com) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-10.7 b/man7/iso_8859-10.7 index 82c8eeda5..02f89221c 100644 --- a/man7/iso_8859-10.7 +++ b/man7/iso_8859-10.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-11.7 b/man7/iso_8859-11.7 index 073ddc657..afc931b00 100644 --- a/man7/iso_8859-11.7 +++ b/man7/iso_8859-11.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-13.7 b/man7/iso_8859-13.7 index 06de48839..6a5304b11 100644 --- a/man7/iso_8859-13.7 +++ b/man7/iso_8859-13.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-14.7 b/man7/iso_8859-14.7 index 592bd0838..cb39a9e91 100644 --- a/man7/iso_8859-14.7 +++ b/man7/iso_8859-14.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-15.7 b/man7/iso_8859-15.7 index 5e71a41aa..9946b0bc2 100644 --- a/man7/iso_8859-15.7 +++ b/man7/iso_8859-15.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 1993-1995 Daniel Quinlan (quinlan@yggdrasil.com) .\" Copyright 1999 Dimitri Papadopoulos (dpo@club-internet.fr) .\" diff --git a/man7/iso_8859-16.7 b/man7/iso_8859-16.7 index 8d9b5a259..5bf518279 100644 --- a/man7/iso_8859-16.7 +++ b/man7/iso_8859-16.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2002 Ionel Mugurel Ciobîcă (IMCiobica@netscape.net) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-2.7 b/man7/iso_8859-2.7 index 095f0612d..a9e478b58 100644 --- a/man7/iso_8859-2.7 +++ b/man7/iso_8859-2.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 1999 Roman Maurer (roman.maurer@hermes.si) .\" Copyright 1993-1995 Daniel Quinlan (quinlan@yggdrasil.com) .\" diff --git a/man7/iso_8859-3.7 b/man7/iso_8859-3.7 index 5f2605852..b9e00fd10 100644 --- a/man7/iso_8859-3.7 +++ b/man7/iso_8859-3.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-4.7 b/man7/iso_8859-4.7 index 6eefaef93..4ef5c0e05 100644 --- a/man7/iso_8859-4.7 +++ b/man7/iso_8859-4.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-5.7 b/man7/iso_8859-5.7 index 7e3c8cec1..1396b36de 100644 --- a/man7/iso_8859-5.7 +++ b/man7/iso_8859-5.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-6.7 b/man7/iso_8859-6.7 index 5e1608a2e..d2c5aea08 100644 --- a/man7/iso_8859-6.7 +++ b/man7/iso_8859-6.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-7.7 b/man7/iso_8859-7.7 index f59570888..97bb728d8 100644 --- a/man7/iso_8859-7.7 +++ b/man7/iso_8859-7.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 1999 Dimitri Papadopoulos (dpo@club-internet.fr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-8.7 b/man7/iso_8859-8.7 index b7e1c5f7b..bdfaa571c 100644 --- a/man7/iso_8859-8.7 +++ b/man7/iso_8859-8.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis (edimitro@tee.gr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/iso_8859-9.7 b/man7/iso_8859-9.7 index b97efc29c..705971e45 100644 --- a/man7/iso_8859-9.7 +++ b/man7/iso_8859-9.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2002 Dimitri Papadopoulos (dpo@club-internet.fr) .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/koi8-r.7 b/man7/koi8-r.7 index 7ee9e2927..7d1977eb3 100644 --- a/man7/koi8-r.7 +++ b/man7/koi8-r.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2001 Alexey Mahotkin .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man7/koi8-u.7 b/man7/koi8-u.7 index 0c56e949f..987918724 100644 --- a/man7/koi8-u.7 +++ b/man7/koi8-u.7 @@ -1,4 +1,3 @@ -'\" t -*- coding: UTF-8 -*- .\" Copyright 2009 Lefteris Dimitroulakis .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/man8/iconvconfig.8 b/man8/iconvconfig.8 index 2cc3536f4..b57282965 100644 --- a/man8/iconvconfig.8 +++ b/man8/iconvconfig.8 @@ -1,5 +1,3 @@ -'\" t -*- coding: UTF-8 -*- -.\" .\" Copyright (C) 2014 Marko Myllynen .\" .\" %%%LICENSE_START(GPLv2+_DOC_FULL) diff --git a/scripts/convert_to_utf_8.sh b/scripts/convert_to_utf_8.sh index b8a5e83ba..28f5a72cf 100755 --- a/scripts/convert_to_utf_8.sh +++ b/scripts/convert_to_utf_8.sh @@ -33,7 +33,7 @@ fi out_dir="$1" shift -enc_line="'\\\" t -*- coding: UTF-8 -*-" +enc_line="" for f in "$@"; do enc=$(file -bi "$f" | cut -d = -f 2)