Re: [PATCH 1/2] net: Fix indentation of the conf/ documentation block

[David Miller]

From: Benjamin Poirier 
Date: Mon, 21 Mar 2016 13:21:39 -0700

> Commit d67ef35fff67 ("clarify documentation for
> net.ipv4.igmp_max_memberships") mistakenly indented a block of
> documentation such that it now looks like it belongs to a specific sysctl.
> Restore that block's original position.
> 
> Cc: Jeremy Eder 
> Signed-off-by: Benjamin Poirier 

Applied.

[PATCH 1/2] net: Fix indentation of the conf/ documentation block

[Benjamin Poirier]

Commit d67ef35fff67 ("clarify documentation for
net.ipv4.igmp_max_memberships") mistakenly indented a block of
documentation such that it now looks like it belongs to a specific sysctl.
Restore that block's original position.

Cc: Jeremy Eder 
Signed-off-by: Benjamin Poirier 
---
 Documentation/networking/ip-sysctl.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/networking/ip-sysctl.txt 
b/Documentation/networking/ip-sysctl.txt
index d5df40c..d3768e8 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -946,16 +946,16 @@ igmp_max_memberships - INTEGER
The value 5459 assumes no IP header options, so in practice
this number may be lower.
 
-   conf/interface/*  changes special settings per interface (where
-   "interface" is the name of your network interface)
-
-   conf/all/*is special, changes the settings for all interfaces
-
 igmp_qrv - INTEGER
 Controls the IGMP query robustness variable (see RFC2236 8.1).
 Default: 2 (as specified by RFC2236 8.1)
 Minimum: 1 (as specified by RFC6636 4.5)
 
+conf/interface/*  changes special settings per interface (where
+"interface" is the name of your network interface)
+
+conf/all/*   is special, changes the settings for all interfaces
+
 log_martians - BOOLEAN
Log packets with impossible addresses to kernel log.
log_martians for the interface will be enabled if at least one of
-- 
2.7.2