free
/
freedombone
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

Mention forms of harassment in code of conduct

Bob Mottram hace 6 años
padre
db15ce22b2
commit
9646037a66
Se han modificado 4 ficheros con 5 adiciones y 5 borrados
Dividir vista Mostrar estadísticas de diff
  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 Ver fichero 

@@ -38,7 +38,7 @@ In cases of sincere, good-faith curiosity about someone’s experience or identi
38 38
39 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 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 Ver fichero 

@@ -44,7 +44,7 @@ No stalking, unwanted personal attention, or unwelcome revealing or speculating
44 44
45 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 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 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 Ver fichero 

@@ -4,7 +4,7 @@
4 4 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5 
 <head>
6 6 
 <title></title>
7 
-<!-- 2018-06-19 Tue 15:37 -->
7 
+<!-- 2018-06-19 Tue 16:12 -->
8 8 
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
9 9 
 <meta  name="generator" content="Org-mode" />
10 10 
 <meta  name="author" content="Bob Mottram" />
 
@@ -236,7 +236,7 @@ In cases of sincere, good-faith curiosity about someone’s experience or identi
236 236 
 <h2 id="sec-9">No hostile communication</h2>
237 237 
 <div class="outline-text-2" id="text-9">
238 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 240 
 </p>
241 241
242 242 
 <p>

+ 1
- 1
website/EN/faq.html Ver fichero 

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