netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Poirier <bpoirier@suse.com>
To: netdev@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>, Jeremy Eder <jeder@redhat.com>
Subject: [PATCH 1/2] net: Fix indentation of the conf/ documentation block
Date: Mon, 21 Mar 2016 13:21:39 -0700	[thread overview]
Message-ID: <1458591700-5547-1-git-send-email-bpoirier@suse.com> (raw)

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 <jeder@redhat.com>
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
 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

             reply	other threads:[~2016-03-21 20:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-21 20:21 Benjamin Poirier [this message]
2016-03-21 20:21 ` [PATCH 2/2] igmp: Document sysctl_igmp_max_msf Benjamin Poirier
2016-03-22  2:58   ` David Miller
2016-03-22  2:58 ` [PATCH 1/2] net: Fix indentation of the conf/ documentation block David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458591700-5547-1-git-send-email-bpoirier@suse.com \
    --to=bpoirier@suse.com \
    --cc=corbet@lwn.net \
    --cc=jeder@redhat.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).