summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-07-19 09:01:07 +0200
committerDavid S. Miller <davem@davemloft.net>2012-07-19 19:48:07 +0200
commit8427b2acfdd5e6c554fb7ad1fbccf53a24a08454 (patch)
tree39848357025f42cdd807562d4843f351003e1d19 /Documentation/networking
parentnet: e100: ucode is optional in some cases (diff)
downloadlinux-8427b2acfdd5e6c554fb7ad1fbccf53a24a08454.tar.xz
linux-8427b2acfdd5e6c554fb7ad1fbccf53a24a08454.zip
bridge: update documentation references
Update the references to bridge utilities and web pages to current locations Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/bridge.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.txt
index a7ba5e4e2c91..a27cb6214ed7 100644
--- a/Documentation/networking/bridge.txt
+++ b/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).