aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorTobin C. Harding <me@tobin.cc>2018-07-18 13:27:36 +1000
committerDavid S. Miller <davem@davemloft.net>2018-07-18 15:28:27 -0700
commit6b335f8205e9d47569ebb2db90ede2c4aa7615ce (patch)
tree90f583076f70966f9c46e8443635f54b725726a5 /Documentation
parent735dadf894f091bc15c06aedf8c1e99f971d3962 (diff)
downloadlinux-6b335f8205e9d47569ebb2db90ede2c4aa7615ce.tar.gz
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 <me@tobin.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/bridge.rst (renamed from Documentation/networking/bridge.txt)6
-rw-r--r--Documentation/networking/index.rst1
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.rst
index a27cb6214ed7..4aef9cddde2f 100644
--- a/Documentation/networking/bridge.txt
+++ b/Documentation/networking/bridge.rst
@@ -1,3 +1,9 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+=================
+Ethernet Bridging
+=================
+
In order to use the Ethernet bridging functionality, you'll need the
userspace tools.
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