mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: "U-Boot Version 2 (barebox)" <barebox@lists.infradead.org>
Subject: Re: where is Documentation/parameters.txt?
Date: Fri, 27 Jun 2014 21:38:33 +0200	[thread overview]
Message-ID: <20140627193833.GP14257@pengutronix.de> (raw)
In-Reply-To: <alpine.LFD.2.11.1406270745300.3483@localhost>

On Fri, Jun 27, 2014 at 07:49:49AM -0400, Robert P. J. Day wrote:
> On Fri, 27 Jun 2014, Holger Schurig wrote:
> 
> > >   oh, sorry, i missed that doc *branch*, my fault.
> >
> > It's totally new ... and awesome (compared to the old docs).
> 
>   ok, possibly a silly question but, as i now read it, if i want to
> work with the sphinx-based docs, i should be working off the "doc"
> branch and restrict my changes to just the files in the Documentation
> directory.
> 
>   but recently, i submitted a patch to correct the misspelling
> "persistant", and some of those changes were in Documentation/, while
> other examples of that were scattered elsewhere (arch/, scripts/).

That's fine. I'll solve the merges conflicts.

> 
>   so what's the protocol for correcting "documentation" (eg., inline
> comments in source files) as opposed to the content under
> Documentation? should non-Documentation patches be submitted against
> the master branch? or does the "doc" branch track master closely
> enough that i can exclusively stay on the "doc" branch?
> 
>   as in, should i resubmit that earlier patch broken into two parts?
> and if one submits a patch against the "doc" branch, should that be
> identified in the patch itself? the subject line?

Please send documentation patches only against the doc branch. I'll
resolve the merge conflicts against master should there be any.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2014-06-27 19:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-26 21:27 Robert P. J. Day
2014-06-27  4:51 ` Sascha Hauer
2014-06-27  9:03   ` Robert P. J. Day
2014-06-27  9:10     ` Holger Schurig
2014-06-27 11:49       ` Robert P. J. Day
2014-06-27 12:45         ` Holger Schurig
2014-06-27 19:38         ` Sascha Hauer [this message]

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=20140627193833.GP14257@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=rpjday@crashcourse.ca \
    /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