Re: [PATCH v2 0/4] Use singular "they" when appropriate

> > I just retried a "competing" merge that got ugly ;-)
> > 
> > Between Derrick's two "singular they" patches (one for comments, the
> > other for docs) and Felipe's two patches (the same split), they
> > touch identical base text.  Only the way they neuter the description
> > is different, and to me the latter feels a bit more ESL friendly.
> > 
> > So, the main things that are missing from Felipe's version that we
> > may want to build on top before the whole discussion can be
> > concluded are:
> > 
> >  - Derrick's "typofix" patch, but if I recall correctly it needed a
> >    fix-up in one of its hunks?
> > 
> >  - Guidelines; you had a more generic readability tips that would
> >    (incidentally) result in nudging the writers to be more gender
> >    neutral, which I think is going in the right direction, but I do
> >    prefer to see an explicit mention of gender-neutrality as one
> >    bullet item.
> 
> I will send a v3 soon with Felipe's two patches, a fixed typo patch,
> and a new set of guidelines.