* [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst
@ 2022-08-23 23:09 Jakub Kicinski
2022-08-24 0:41 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2022-08-23 23:09 UTC (permalink / raw)
To: davem
Cc: netdev, edumazet, pabeni, Jakub Kicinski, Stephen Rothwell,
Stephen Hemminger
The table marking length needs to be adjusted after removal
and reshuffling.
Fixes: 1202cdd66531 ("Remove DECnet support from kernel")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--
CC: Stephen Hemminger <stephen@networkplumber.org>
---
Documentation/admin-guide/sysctl/net.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
index 82879a9d5683..65087caf82d4 100644
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -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
============================================
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst
2022-08-23 23:09 [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst Jakub Kicinski
@ 2022-08-24 0:41 ` Stephen Rothwell
2022-08-24 1:04 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2022-08-24 0:41 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, edumazet, pabeni, Stephen Hemminger
[-- Attachment #1: Type: text/plain, Size: 3431 bytes --]
Hi Jakub,
On Tue, 23 Aug 2022 16:09:06 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> The table marking length needs to be adjusted after removal
> and reshuffling.
>
> Fixes: 1202cdd66531 ("Remove DECnet support from kernel")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> --
> CC: Stephen Hemminger <stephen@networkplumber.org>
> ---
> Documentation/admin-guide/sysctl/net.rst | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
> index 82879a9d5683..65087caf82d4 100644
> --- a/Documentation/admin-guide/sysctl/net.rst
> +++ b/Documentation/admin-guide/sysctl/net.rst
> @@ -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
> ============================================
> --
> 2.37.2
>
How about this instead so that everything lines up nicely:
diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
index 82879a9d5683..871031462e83 100644
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -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
============================================
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst
2022-08-24 0:41 ` Stephen Rothwell
@ 2022-08-24 1:04 ` Jakub Kicinski
2022-08-24 2:10 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2022-08-24 1:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: davem, netdev, edumazet, pabeni, Stephen Hemminger
On Wed, 24 Aug 2022 10:41:43 +1000 Stephen Rothwell wrote:
> On Tue, 23 Aug 2022 16:09:06 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > The table marking length needs to be adjusted after removal
> > and reshuffling.
> >
> > Fixes: 1202cdd66531 ("Remove DECnet support from kernel")
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> > --
> > CC: Stephen Hemminger <stephen@networkplumber.org>
>
> 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.
> diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst
> index 82879a9d5683..871031462e83 100644
> --- a/Documentation/admin-guide/sysctl/net.rst
> +++ b/Documentation/admin-guide/sysctl/net.rst
> @@ -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
> ============================================
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst
2022-08-24 1:04 ` Jakub Kicinski
@ 2022-08-24 2:10 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2022-08-24 2:10 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, edumazet, pabeni, Stephen Hemminger
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
Hi Jakub,
On Tue, 23 Aug 2022 18:04:54 -0700 Jakub Kicinski <kuba@kernel.org> 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
:-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-24 2:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-23 23:09 [PATCH net-next] docs: fix the table in admin-guide/sysctl/net.rst Jakub Kicinski
2022-08-24 0:41 ` Stephen Rothwell
2022-08-24 1:04 ` Jakub Kicinski
2022-08-24 2:10 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).