---

yaml --- r: 315508 b: refs/heads/master c: 8427b2a h: refs/heads/master v: v3
git-mirror · Jul 19, 2012 · 3f37300 · 3f37300
1 parent ac7ab4f
commit 3f37300
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b0d2f9ed3d8e92feada7c5d70fa85be46e6f948
+refs/heads/master: 8427b2acfdd5e6c554fb7ad1fbccf53a24a08454
diff --git a/trunk/Documentation/networking/bridge.txt b/trunk/Documentation/networking/bridge.txt
@@ -1,7 +1,14 @@
 In order to use the Ethernet bridging functionality, you'll need the
-userspace tools. These programs and documentation are available
-at http://www.linuxfoundation.org/en/Net:Bridge.  The download page is
-http://prdownloads.sourceforge.net/bridge.
+userspace tools.
+
+Documentation for Linux bridging is on:
+   http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+
+The bridge-utilities are maintained at:
+   git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git
+
+Additionally, the iproute2 utilities can be used to configure
+bridge devices.
 
 If you still have questions, don't hesitate to post to the mailing list 
 (more info https://lists.linux-foundation.org/mailman/listinfo/bridge).