From: Johannes Berg <johannes@sipsolutions.net>
To: Jani Nikula <jani.nikula@intel.com>, linux-wireless@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Subject: Re: [PATCH 1/2] mac80211: fix some sphinx warnings
Date: Fri, 21 Oct 2016 15:17:00 +0200 [thread overview]
Message-ID: <1477055820.4068.48.camel@sipsolutions.net> (raw)
In-Reply-To: <87h985q1y6.fsf@intel.com>
On Fri, 2016-10-21 at 16:14 +0300, Jani Nikula wrote:
> On Fri, 21 Oct 2016, Johannes Berg <johannes@sipsolutions.net> wrote:
> >
> > On Fri, 2016-10-21 at 15:57 +0300, Jani Nikula wrote:
> > >
> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > > ---
> > > include/net/mac80211.h | 21 +++++++++++++--------
> > > 1 file changed, 13 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/include/net/mac80211.h b/include/net/mac80211.h
> > > index a810dfcb83c2..e2dba93e374f 100644
> > > --- a/include/net/mac80211.h
> > > +++ b/include/net/mac80211.h
> > > @@ -811,14 +811,18 @@ enum mac80211_rate_control_flags {
> > > * in the control information, and it will be filled by the rate
> > > * control algorithm according to what should be sent. For
> > > example,
> > > * if this array contains, in the format { <idx>, <count> } the
> > > - * information
> > > + * information::
> > >
> > [...]
> >
> > interesting, are these not enabled by default?
> rst wants indented blocks to be separated by blank lines from the
> preceding and following blocks. For that you could just add the blank
> lines, and it'll work.
>
> I presumed this was nicer as preformatted/monospaced text, and for
> that you'll need the "::". Up to you to have that or not.
Well, I meant the warnings :)
But yeah, this is better as preformatted text. It never came out that
way with docbook either, I think, but now we can fix that.
> > I guess I'll pick up these patches, even if they probably make
> > things
> > worse in my tree, since there it's still using docbook. But once we
> > merge everything it should be good then.
>
> Oh, it's built as reStructuredText in Linus' tree. Again, up to you.
Right. No worries. I just haven't gotten my own change back from
Linus's tree into mine, but it only means that generating the doc from
mac80211-next or net-next might be weird, which isn't a problem.
johannes
next prev parent reply other threads:[~2016-10-21 13:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-21 12:57 [PATCH 1/2] mac80211: fix some sphinx warnings Jani Nikula
2016-10-21 12:57 ` [PATCH 2/2] mac80211: use inline kernel-doc for struct ieee80211_hw Jani Nikula
2016-10-21 13:01 ` Johannes Berg
2016-10-21 13:18 ` Jani Nikula
2016-10-21 18:59 ` Arend van Spriel
2016-10-21 19:56 ` Johannes Berg
2016-10-26 6:09 ` Johannes Berg
2016-10-26 8:36 ` Jani Nikula
2016-10-26 8:55 ` Johannes Berg
2016-10-21 13:01 ` [PATCH 1/2] mac80211: fix some sphinx warnings Johannes Berg
2016-10-21 13:14 ` Jani Nikula
2016-10-21 13:17 ` Johannes Berg [this message]
2016-10-26 6:02 ` Johannes Berg
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=1477055820.4068.48.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=jani.nikula@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-wireless@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).