update URL to the marc.info mail archive

The name marc.theaimsgroup.com is no longer active, and has
migrated to marc.info.

Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 644acce079df81ecd7c2cf8774b3e7fcba9c49d5..0a1df5e5f58e7fee13ea47d53ba324d2c3ace66f 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4669,5 +4669,5 @@ Write a chapter on using plumbing and writing scripts.
 Alternates, clone -reference, etc.
 
 More on recovery from repository corruption.  See:
 Alternates, clone -reference, etc.
 
 More on recovery from repository corruption.  See:

-       http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
-       http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
+       http://marc.info/?l=git&m=117263864820799&w=2
+       http://marc.info/?l=git&m=117147855503798&w=2

diff --git a/builtin/apply.c b/builtin/apply.c
index ff01ebff3d29516cdffa315ae564b2b75e7d5164..a88c372de59d950c2aae68455347ea0004e169fb 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -473,7 +473,7 @@ static char *find_name_gnu(const char *line, const char *def, int p_value)
 
        /*
         * Proposed "new-style" GNU patch/diff format; see
 
        /*
         * Proposed "new-style" GNU patch/diff format; see

-        * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
+        * http://marc.info/?l=git&m=112927316408690&w=2

         */
        if (unquote_c_style(&name, line, NULL)) {
                strbuf_release(&name);
         */
        if (unquote_c_style(&name, line, NULL)) {
                strbuf_release(&name);

diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 331b9b07d4eedb07377de605ebb87691427b7bb4..d15b313d4b5e65bc583b7c1f0e4efbb5ac56cb00 100755 (executable)
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Fredrik Kuivinen
 #
 
 # Copyright (c) 2005 Fredrik Kuivinen
 #
 

-# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
+# See http://marc.info/?l=git&m=111463358500362&w=2 for a

 # nice description of what this is about.
 
 
 # nice description of what this is about.