From 6b335f8205e9d47569ebb2db90ede2c4aa7615ce Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Wed, 18 Jul 2018 13:27:36 +1000 Subject: docs: networking: Convert bridge.txt to rst The kernel documentation is now restructured text. Convert the Ethernet Bridge documentation and include it in the toplevel kernel documentation. - Fix heading adornments. - Add license identifier. Signed-off-by: Tobin C. Harding Signed-off-by: David S. Miller --- Documentation/networking/bridge.rst | 21 +++++++++++++++++++++ Documentation/networking/bridge.txt | 15 --------------- Documentation/networking/index.rst | 1 + 3 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 Documentation/networking/bridge.rst delete mode 100644 Documentation/networking/bridge.txt (limited to 'Documentation') diff --git a/Documentation/networking/bridge.rst b/Documentation/networking/bridge.rst new file mode 100644 index 000000000000..4aef9cddde2f --- /dev/null +++ b/Documentation/networking/bridge.rst @@ -0,0 +1,21 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================= +Ethernet Bridging +================= + +In order to use the Ethernet bridging functionality, you'll need the +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). + diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.txt deleted file mode 100644 index a27cb6214ed7..000000000000 --- a/Documentation/networking/bridge.txt +++ /dev/null @@ -1,15 +0,0 @@ -In order to use the Ethernet bridging functionality, you'll need the -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). - diff --git a/Documentation/networking/index.rst b/Documentation/networking/index.rst index 06bdd8232b2a..f0ae9b65dfba 100644 --- a/Documentation/networking/index.rst +++ b/Documentation/networking/index.rst @@ -18,6 +18,7 @@ Contents: failover net_failover alias + bridge .. only:: subproject -- cgit v1.2.3