Skip to contentSkip to conversation

docs: fix the table in admin-guide/sysctl/net.rst

PATCH In review Jakub Kicinski 2 participants 4 messages Aug 23, 2022 – Aug 24, 2022

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 docs: fix the table in admin-guide/sysctl/net.rst

The table marking length needs to be adjusted after removal and reshuffling.

Fixes 1202cdd66531 ("Remove DECnet support from kernel")

--
CC: Stephen Hemminger <[email protected]>

---
 Documentation/admin-guide/sysctl/net.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/admin-guide/sysctl/net.rst +3 -3
index 82879a9d5683..65087caf82d4 100644
@@ -31,9 +31,9 @@ see only some of them, depending on your kernel's configuration.
 
 Table : Subdirectories in /proc/sys/net
 
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
  Directory Content               Directory  Content
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
  802       E802 protocol         mptcp     Multipath TCP
  appletalk Appletalk protocol    netfilter Network Filter
  ax25      AX25                  netrom     NET/ROM
@@ -42,7 +42,7 @@ Table : Subdirectories in /proc/sys/net
  ethernet  Ethernet protocol     unix      Unix domain sockets
  ipv4      IP version 4          x25       X.25 protocol
  ipv6      IP version 6
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
 
 1. /proc/sys/net/core - Network core options
 ============================================
Signature · 1 line
2.37.2
#1 lore raw

Hi Jakub,

Quoted 41 lines · On Tue, 23 Aug 2022 16:09:06 -0700 Jakub Kicinski <[email protected]> wrote:

The table marking length needs to be adjusted after removal and reshuffling.

Fixes 1202cdd66531 ("Remove DECnet support from kernel")

--
CC: Stephen Hemminger <[email protected]>

---
 Documentation/admin-guide/sysctl/net.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/admin-guide/sysctl/net.rst +3 -3
index 82879a9d5683..65087caf82d4 100644
@@ -31,9 +31,9 @@ see only some of them, depending on your kernel's configuration.
 
 Table : Subdirectories in /proc/sys/net
 
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
  Directory Content               Directory  Content
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
  802       E802 protocol         mptcp     Multipath TCP
  appletalk Appletalk protocol    netfilter Network Filter
  ax25      AX25                  netrom     NET/ROM
@@ -42,7 +42,7 @@ Table : Subdirectories in /proc/sys/net
  ethernet  Ethernet protocol     unix      Unix domain sockets
  ipv4      IP version 4          x25       X.25 protocol
  ipv6      IP version 6
- ========= =================== = ========== ==================
+ ========= ================== = ========== ==================
 
 1. /proc/sys/net/core - Network core options
 ============================================
Signature · 1 line
2.37.2

How about this instead so that everything lines up nicely:

Documentation/admin-guide/sysctl/net.rst +5 -5
index 82879a9d5683..871031462e83 100644
@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration.
 
 Table : Subdirectories in /proc/sys/net
 
- ========= =================== = ========== ==================
- Directory Content               Directory  Content
- ========= =================== = ========== ==================
+ ========= =================== = ========= ===================
+ Directory Content               Directory Content
+ ========= =================== = ========= ===================
  802       E802 protocol         mptcp     Multipath TCP
  appletalk Appletalk protocol    netfilter Network Filter
- ax25      AX25                  netrom     NET/ROM
+ ax25      AX25                  netrom    NET/ROM
  bridge    Bridging              rose      X.25 PLP layer
  core      General parameter     tipc      TIPC
  ethernet  Ethernet protocol     unix      Unix domain sockets
  ipv4      IP version 4          x25       X.25 protocol
  ipv6      IP version 6
- ========= =================== = ========== ==================
+ ========= =================== = ========= ===================
 
 1. /proc/sys/net/core - Network core options
 ============================================
Signature · 2 lines
Cheers,
Stephen Rothwell
author maintainer
#2 lore raw
Quoted 5 lines · On Wed, 24 Aug 2022 10:41:43 +1000 Stephen Rothwell wrote:
Quoted 4 lines · On Tue, 23 Aug 2022 16:09:06 -0700 Jakub Kicinski <[email protected]> wrote:

The table marking length needs to be adjusted after removal and reshuffling.

Quoted 7 lines
Quoted 5 lines
Fixes 1202cdd66531 ("Remove DECnet support from kernel")

--
CC: Stephen Hemminger <[email protected]>

How about this instead so that everything lines up nicely:

Thanks for reviewing, seems like I misunderstood the warning and fixed it accidentally :o

Should I trim the first 'Content' column to the min required length as well? Commit 1202cdd66531 (which is in -next only) reshuffled the entire table anyway so we won't be preserving any history by not trimming.

Quoted 29 lines
Documentation/admin-guide/sysctl/net.rst +5 -5
index 82879a9d5683..871031462e83 100644
@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration.
 
 Table : Subdirectories in /proc/sys/net
 
- ========= =================== = ========== ==================
- Directory Content               Directory  Content
- ========= =================== = ========== ==================
+ ========= =================== = ========= ===================
+ Directory Content               Directory Content
+ ========= =================== = ========= ===================
  802       E802 protocol         mptcp     Multipath TCP
  appletalk Appletalk protocol    netfilter Network Filter
- ax25      AX25                  netrom     NET/ROM
+ ax25      AX25                  netrom    NET/ROM
  bridge    Bridging              rose      X.25 PLP layer
  core      General parameter     tipc      TIPC
  ethernet  Ethernet protocol     unix      Unix domain sockets
  ipv4      IP version 4          x25       X.25 protocol
  ipv6      IP version 6
- ========= =================== = ========== ==================
+ ========= =================== = ========= ===================
 
 1. /proc/sys/net/core - Network core options
 ============================================
#3 lore raw

Hi Jakub,

Quoted 5 lines · On Tue, 23 Aug 2022 18:04:54 -0700 Jakub Kicinski <[email protected]> wrote:

Should I trim the first 'Content' column to the min required length as well? Commit 1202cdd66531 (which is in -next only) reshuffled the entire table anyway so we won't be preserving any history by not trimming.

I don't think that is necessary, but also don't really care either way :-)

Signature · 2 lines
Cheers,
Stephen Rothwell