CONTRIBUTING, MAINTAINER_NOTES: Remove MAINTAINER_NOTES

That file is also interesting to contributors, and fits nicely into
CONTRIBUTING.  Move the text there, and remove the file.

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 1a0d16f646accf9aa09e91330fe147344b39fec9..fc4d727240d60f1192fc0b7e2ecaf77740a496a6 100644 (file)
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -191,6 +191,15 @@ Reporting bugs
        There's also a bugzilla, but we don't use it as much as the mailing list.
 
 Notes
+   External and autogenerated pages
+       A few pages come from external sources.  Fixes to the pages should
+       really go to the upstream source.
+
+       tzfile(5), zdump(8), and zic(8) come from the tz project
+       <https://www.iana.org/time-zones>.
+
+       bpf-helpers(7) is autogenerated from the Linux kernel sources using
+       scripts.  See man-pages commits 53666f6c3 and 19c7f7839 for details.
 
 Bugs
    Bugzilla:

diff --git a/MAINTAINER_NOTES b/MAINTAINER_NOTES
deleted file mode 100644 (file)
index 4001bd4..0000000
--- a/MAINTAINER_NOTES
+++ /dev/null
@@ -1,11 +0,0 @@
-Externally generated pages
-==========================
-
-A few pages come from external sources. Fixes to the pages should really
-go to the upstream source.
-
-tzfile(5), zdump(8), and zic(8) come from the tz project
-(https://www.iana.org/time-zones).
-
-bpf-helpers(7) is autogenerated from the kernel sources using scripts.
-See man-pages commits 53666f6c3 and 19c7f7839 for details.