From 374ddee8552c908cfced0aa95a364c64ce7d8831 Mon Sep 17 00:00:00 2001 From: Kevin Reed Date: Wed, 23 May 2018 11:00:58 -0500 Subject: [PATCH] repository: Change line endings in code of conduct to unix style and remove custom seteting in .gitattributes. --- .gitattributes | 1 - CODE_OF_CONDUCT.md | 62 +++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/.gitattributes b/.gitattributes index 68e6c3ae0e..e76be3185b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -45,4 +45,3 @@ checkin_notes_2012 text eol=lf *.log text eol=lf *.rtf text eol=lf *.rul text eol=crlf -CODE_OF_CONDUCT.md text eol=crlf diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a438f7e8e8..be5bd94164 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,31 +1,31 @@ -• Be welcoming - -Aim to welcome and support people of all backgrounds and identities, of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. - -• Be respectful and friendly - -Respect each other and each other's point of view. Different people have different perspectives on issues. Frustration cannot turn into a personal attack. It is important to remember that a community where people feel uncomfortable or threatened is not a productive one. Also remember that with a world-wide community, English may not be the native language of everyone and since all communication happens via text, it's impossible to read what mood the other is in. - -• Be collaborative - -BOINC is a complex whole made of many parts. Cooperation between teams, that each have their own goal and vision is essential. For the whole to be more than the sum of its parts, each part must make an effort to understand the whole. - -• Ask for help when unsure - -Nobody is expected to be perfect in this community. Asking questions early avoids many problems later, so questions are encouraged. Those who answer should be responsive and helpful. - -• Be patient - -Not everyone has the same level of expertise in language or coding, so be patient if an explanation needs to be given. - -• Value decisiveness, clarity and consensus - -Social and technical disagreements should not be left to fester, leaving others uncertain of the agreed direction. The strength of the BOINC community comes from its diversity, people from a wide range of backgrounds. Being unable to understand why someone holds a viewpoint doesn't mean that that viewpoint is wrong. - -• Resolve issues - -Don't forget that it is human to err and that blaming each other isn't productive. Instead, focus on helping to resolve issues and learning from mistakes. Participants in the project should try to resolve disagreements constructively. When it is impossible to reach an agreement, follow the [process outlined in the Governance document](https://github.com/BOINC/boinc-policy/blob/master/Governance.md#5-decision-processes) to come to a solution. - - -We also adhere to the Github community guidelines, please see https://help.github.com/articles/github-community-guidelines/ - +• Be welcoming + +Aim to welcome and support people of all backgrounds and identities, of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. + +• Be respectful and friendly + +Respect each other and each other's point of view. Different people have different perspectives on issues. Frustration cannot turn into a personal attack. It is important to remember that a community where people feel uncomfortable or threatened is not a productive one. Also remember that with a world-wide community, English may not be the native language of everyone and since all communication happens via text, it's impossible to read what mood the other is in. + +• Be collaborative + +BOINC is a complex whole made of many parts. Cooperation between teams, that each have their own goal and vision is essential. For the whole to be more than the sum of its parts, each part must make an effort to understand the whole. + +• Ask for help when unsure + +Nobody is expected to be perfect in this community. Asking questions early avoids many problems later, so questions are encouraged. Those who answer should be responsive and helpful. + +• Be patient + +Not everyone has the same level of expertise in language or coding, so be patient if an explanation needs to be given. + +• Value decisiveness, clarity and consensus + +Social and technical disagreements should not be left to fester, leaving others uncertain of the agreed direction. The strength of the BOINC community comes from its diversity, people from a wide range of backgrounds. Being unable to understand why someone holds a viewpoint doesn't mean that that viewpoint is wrong. + +• Resolve issues + +Don't forget that it is human to err and that blaming each other isn't productive. Instead, focus on helping to resolve issues and learning from mistakes. Participants in the project should try to resolve disagreements constructively. When it is impossible to reach an agreement, follow the [process outlined in the Governance document](https://github.com/BOINC/boinc-policy/blob/master/Governance.md#5-decision-processes) to come to a solution. + + +We also adhere to the Github community guidelines, please see https://help.github.com/articles/github-community-guidelines/ +