]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
README: update location of git repositories, remove broken info link
authorQuentin Monnet <quentin.monnet@netronome.com>
Fri, 9 Feb 2018 17:11:09 +0000 (09:11 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 14 Feb 2018 00:42:51 +0000 (16:42 -0800)
Reflect the recent change of location for the git repositories, and the
creation of the -next development repo, in README and README.devel.

Also remove the link to the Linux Foundation wiki that contained
information about iproute2. The link is now broken, I did not find any
alternative page to point to.

Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: David Ahern <dsahern@gmail.com>
README
README.devel

diff --git a/README b/README
index 386fbaf6cf7da63f53c2ebb9fa7c4312f246a80c..1b7f44272f5a1bc5e79a35672b86cb2801951fa7 100644 (file)
--- a/README
+++ b/README
@@ -1,13 +1,13 @@
 This is a set of utilities for Linux networking.
 
-Information:
-    http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
-
 Download:
     http://www.kernel.org/pub/linux/utils/net/iproute2/
 
-Repository:
-    git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
+Stable version repository:
+    git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
+
+Development repository:
+    git://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git
 
 How to compile this.
 --------------------
index 9b7d11e3322fbef7d39369e7019477d2e35f37ae..60c95468383c139cdd905129155a6a2f1a6907c3 100644 (file)
@@ -4,12 +4,15 @@ development. Most new features require a kernel and a utility component.
 Please submit both to the Linux networking mailing list
    <netdev@vger.kernel.org>
 
-The current source is in the git repository:
-    git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
+The current source for the stable version is in the git repository:
+    git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
 
-The master branch contains the source corresponding to the current
-code in the mainline Linux kernel (ie follows Linus). The net-next
-branch is a temporary branch that tracks the code intended for the
-next release; it corresponds with networking development branch in
-the kernel.
+The development git repository is available at the following address:
+    git://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git
 
+The stable repository contains the source corresponding to the
+current code in the Linux networking tree (net), which in turn is
+aligned on the mainline Linux kernel (ie follows Linus).
+The iproute2-next repository tracks the code intended for the next
+release; it corresponds with networking development tree (net-next)
+in the kernel.