From 3af6d22bb3850ab2bac67287e3a3d3b0e32868e5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 21:41:07 +0200
Subject: Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 README | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'README')

diff --git a/README b/README
index 9925ac1..ad65c8d 100644
--- a/README
+++ b/README
@@ -17,6 +17,7 @@ Description
 
 Files
    CONTRIBUTING
+   CONTRIBUTING.d/*
        Instructions for reporting bugs and contributing.
 
    INSTALL
@@ -35,16 +36,13 @@ Files
        Change log.  Includes most relevant changes.  However, it's not
        as complete as the git(1) log.
 
-   Makefile, share/mk/*
+   GNUmakefile, share/mk/*
        Build system.  For help, consult the <INSTALL> file, and run
        'make help'.
 
    lsm
        Linux software map.  See also <https://lsm.qqx.org/>.
 
-   .mailmap
-       See gitmailmap(5).
-
    LICENSES/*.txt
        Licenses in use by the project.
 
@@ -62,20 +60,20 @@ Files
        Default directory for files created by the build system.
 
 Versions
-   Tarballs
-       <https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/>
+   Distribution
+       <https://kernel.org/pub/linux/docs/man-pages/>
+       <https://www.alejandro-colomar.es/share/dist/man-pages/>
 
    Git
-       <git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git>
        <https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/>
-
-       A secondary git(1) repository can be found at:
-       <git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git>
-       <http://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git/>
+       <https://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git/>
 
    Online man-pages
        PDF
-             <https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/book/>
+             <https://kernel.org/pub/linux/docs/man-pages/book/>
+             <https://www.alejandro-colomar.es/share/dist/man-pages/>
+       HTML
+             <https://man7.org/linux/man-pages/index.html>
 
 History
    Tarballs
@@ -83,7 +81,7 @@ History
        <https://www.win.tue.nl/~aeb/ftpdocs/linux-local/manpages.archive/>
 
    Maintainers
-       Alejandro Colomar <alx@kernel.org> <http://www.alejandro-colomar.es/>
+       Alejandro Colomar <alx@kernel.org> <https://www.alejandro-colomar.es/>
              2020 - present (5.09 - HEAD)
        Michael Kerrisk <mtk.manpages@gmail.com> <https://man7.org/>
              2004 - 2021    (2.00 - 5.13)
@@ -107,7 +105,7 @@ See also
        man-pages(7)
 
    Website
-       <http://www.kernel.org/doc/man-pages/index.html>.
+       <https://www.kernel.org/doc/man-pages/index.html>.
 
    Downstream packages
        Arch man-pages
-- 
cgit v1.2.3