[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/sites/www/code-of-conduct
From:       Ingo Malchow <imalchow () kde ! org>
Date:       2012-08-02 22:30:22
Message-ID: 20120802223022.7DF8DAC7A9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1309067 by imalchow:

small adjustments, patch thanks to PovAddict

 M  +2 -2      index.php  


--- trunk/www/sites/www/code-of-conduct/index.php #1309066:1309067
@@ -59,7 +59,7 @@
 
 <h2>Be collaborative</h2>
 
-<p>The Free Software Movement depends on collaboration: it helps limit duplication \
of effort while improving the quality of the software produced. In order to avoid \
misunderstanding, try to be clear and concise when requesting help or giving it. \
Remember it is easy to misunderstand emails (especially when they are not written in \
your mother tongue). Ask for clarifications if unsure how something is meant; \
remember the first rule - assume in the first instance that people mean well.</p> \
+<p>The Free Software Movement depends on collaboration: it helps limit duplication \
of effort while improving the quality of the software produced. In order to avoid \
misunderstanding, try to be clear and concise when requesting help or giving it. \
Remember it is easy to misunderstand emails (especially when they are not written in \
your mother tongue). Ask for clarifications if unsure how something is meant; \
remember the first rule &mdash; assume in the first instance that people mean \
well.</p>  
 <p>As a contributor, you should aim to collaborate with other community members, as \
well as with other communities that are interested in or depend on the work you do. \
Your work should be transparent and be fed back into the community when available, \
not just when KDE releases. If you wish to work on something new in existing \
projects, keep those projects informed of your ideas and progress.</p>  
@@ -88,7 +88,7 @@
 
 <p>Disagreements, both political and technical, happen all the time. Our community \
is no exception to the rule. The goal is not to avoid disagreements or differing \
views but to resolve them constructively. You should turn to the community to seek \
advice and to resolve disagreements and where possible consult the team most directly \
involved.</p>  
-<p>Think deeply before turning a disagreement into a public dispute. If necessary \
request mediation, trying to resolve differences in a less highly-emotional medium. \
If you do feel that you or your work is being attacked, take your time to breathe \
through before writing heated replies. Consider a 24 hour moratorium if emotional \
language is being used - a cooling off period is sometimes all that is needed. If you \
really want to go a different way, then we encourage you to publish your ideas and \
your work, so that it can be tried and tested.</p> +<p>Think deeply before turning a \
disagreement into a public dispute. If necessary request mediation, trying to resolve \
differences in a less highly-emotional medium. If you do feel that you or your work \
is being attacked, take your time to breathe through before writing heated replies. \
Consider a 24-hour moratorium if emotional language is being used &mdash; a cooling \
off period is sometimes all that is needed. If you really want to go a different way, \
then we encourage you to publish your ideas and your work, so that it can be tried \
and tested.</p>  
 
 <p><em>This document is licensed under the Creative Commons Attribution - Share \
Alike 3.0 License.</em></p>


[prev in list] [next in list] [prev in thread] [next in thread]