free
/
freedombone
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Mention forms of harassment in code of conduct

Bob Mottram 7 年前
父节点
db15ce22b2
当前提交
9646037a66
共有 4 个文件被更改，包括 5 次插入 和 5 次删除
合并视图 显示文件统计
  1. 1
    1
      code-of-conduct.md
  2. 1
    1
      doc/EN/codeofconduct.org
  3. 2
    2
      website/EN/codeofconduct.html
  4. 1
    1
      website/EN/faq.html

+ 1
- 1
code-of-conduct.md 查看文件

38
38
39 
 ## No hostile communication
 39 
 ## No hostile communication
40
40
41 
-No insults, harassment, condescension, ad hominem, threats, or other intimidation.
41 
+No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation.
42
42
43 
 Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning.
 43 
 Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning.
44
44

+ 1
- 1
doc/EN/codeofconduct.org 查看文件

44
44
45 
 In cases of sincere, good-faith curiosity about someone’s experience or identity, ask politely in a manner such that they will feel free to decline the request.
 45 
 In cases of sincere, good-faith curiosity about someone’s experience or identity, ask politely in a manner such that they will feel free to decline the request.
46 
 * No hostile communication
 46 
 * No hostile communication
47 
-No insults, harassment, condescension, ad hominem, threats, or other intimidation.
47 
+No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation.
48
48
49 
 Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning.
 49 
 Condescension means treating others as inferior. Subtle condescension still violates the Code of Conduct even if not blatantly demeaning.
50
50

+ 2
- 2
website/EN/codeofconduct.html 查看文件

4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
 <title></title>
 6 
 <title></title>
7 
-<!-- 2018-06-19 Tue 15:37 -->
7 
+<!-- 2018-06-19 Tue 16:12 -->
8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 
 <meta  name="generator" content="Org-mode" />
 9 
 <meta  name="generator" content="Org-mode" />
10 
 <meta  name="author" content="Bob Mottram" />
 10 
 <meta  name="author" content="Bob Mottram" />
236 
 <h2 id="sec-9">No hostile communication</h2>
 236 
 <h2 id="sec-9">No hostile communication</h2>
237 
 <div class="outline-text-2" id="text-9">
 237 
 <div class="outline-text-2" id="text-9">
238 
 <p>
 238 
 <p>
239 
-No insults, harassment, condescension, ad hominem, threats, or other intimidation.
239 
+No insults, harassment (sexual or otherwise), condescension, ad hominem, threats, or other intimidation.
240 
 </p>
 240 
 </p>
241
241
242 
 <p>
 242 
 <p>

+ 1
- 1
website/EN/faq.html 查看文件

4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 
 <head>
 5 
 <head>
6 
 <title></title>
 6 
 <title></title>
7 
-<!-- 2018-06-19 Tue 15:17 -->
7 
+<!-- 2018-06-19 Tue 15:38 -->
8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 
 <meta  name="generator" content="Org-mode" />
 9 
 <meta  name="generator" content="Org-mode" />
10 
 <meta  name="author" content="Bob Mottram" />
 10 
 <meta  name="author" content="Bob Mottram" />