Re: [Ksummit-discuss] [PATCH 1/2] code-of-conduct: Fix the ambiguity about collecting email addresses

[Pavel Machek]

> > Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
> > ---
> >  Documentation/process/code-of-conduct.rst | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst
> > index ab7c24b5478c..aa40e34e7785 100644
> > --- a/Documentation/process/code-of-conduct.rst
> > +++ b/Documentation/process/code-of-conduct.rst
> > @@ -31,7 +31,7 @@ Examples of unacceptable behavior by participants include:
> >  * Trolling, insulting/derogatory comments, and personal or political attacks
> >  * Public or private harassment
> >  * Publishing othersâ private information, such as a physical or electronic
> > -  address, without explicit permission
> > +  address not ordinarily collected by the project, without explicit permission
> >  * Other conduct which could reasonably be considered inappropriate in a
> >    professional setting
> >
> 
> I agree we want something like this, the question is whether we want
> to change the CoC text from upstream, or clarify it in a separate
> section.

If this comes from some kind of "upstream", that should be clearly
marked so in the document or at least in the git log. I was always
wondering who created that "useful document".

									Pavel
(And would still like to know what the background story is.)
									
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Attachment: signature.asc
Description: Digital signature