Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates #61

Merged
merged 7 commits into from
Oct 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ Knowing that there are problems isn’t enough. Pick an organization that helps

- **[She#](https://www.shesharp.co.nz/)**

Are you a meetup or conference organizer looking to make your event more inclusive? Or do you have some rad tips to help other organizers out? Check out [Let's Do Better](https://github.com/sublimemarch/lets-do-better): a guide to radical inclusion in both physical and digital spaces in the tech industry.

# Step 3: Keep Educating Yourself

Keep up with current events and developments.
Expand Down
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ Maintainers of the repo will [review](#pull-request-submission-and-review-proces

## Maintainers

- [stephmarx](https://github.com/stephmarx)
- [sublimemarch](https://github.com/sublimemarch)
- [cmho](https://github.com/cmho)
- [thejessleigh](https://github.com/thejessleigh)
86 changes: 69 additions & 17 deletions glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,66 +9,118 @@ Here's a quick reference to terms you may have seen as you progress through the

### A

#### [Ally](https://everydayfeminism.com/2013/11/things-allies-need-to-know/): *A member of an advantaged social group that enjoys some privilege, that is _actively_ working to end oppression and understand their own privilege, and eliminate oppressive beliefs in themselves and their communities.*
#### [Ally](https://everydayfeminism.com/2013/11/things-allies-need-to-know/)

*A member of an advantaged social group that enjoys some privilege, that is _actively_ working to end oppression and understand their own privilege, and eliminate oppressive beliefs in themselves and their communities.*

### B

#### [Bias](https://en.wikipedia.org/wiki/Bias): *The tendency to have an opinion, or view, that is often without considering evidence and other information. Bias can come in many forms and is related to prejudice and intuition*
#### [Bias](https://en.wikipedia.org/wiki/Bias)

*The tendency to have an opinion, or view, that is often without considering evidence and other information. Bias can come in many forms and is related to prejudice and intuition*

### C

#### [Cis](http://itspronouncedmetrosexual.com/2011/11/list-of-cisgender-privileges/): *Individuals whose gender identity and expression line up with their birth-assigned sex.*
#### [Cis](http://itspronouncedmetrosexual.com/2011/11/list-of-cisgender-privileges/)

*Individuals whose gender identity and expression line up with their birth-assigned sex.*

### D
### E

#### [Emotional Labor](http://geekfeminism.wikia.com/wiki/Emotional_labor): *Tasks that require a high degree of understanding or management of one's own emotions as well as other people's emotions. The tasks are also commonly "extra" or undervalued for the amount of actual labor or time spent on them, and left out of official job descriptions or task assignments even when the function is vital to the organization (emotional labor is related to, but distinct from the [Second Shift](#second-shift--the-workload-women-have-over-and-above-what-men-have-in-mainstream-society-womens-second-shift-mostly-consists-of-childcare-eldercare-and-domestic-labour)).*
#### [Emotional Labor](http://geekfeminism.wikia.com/wiki/Emotional_labor)

*Tasks that require a high degree of understanding or management of one's own emotions as well as other people's emotions. The tasks are also commonly "extra" or undervalued for the amount of actual labor or time spent on them, and left out of official job descriptions or task assignments even when the function is vital to the organization (emotional labor is related to, but distinct from the [Second Shift](#second-shift--the-workload-women-have-over-and-above-what-men-have-in-mainstream-society-womens-second-shift-mostly-consists-of-childcare-eldercare-and-domestic-labour)).*

*Common emotional labor tasks might include teaching skills while managing the student's expectations and emotional responses, or staying calm and collected in a heated customer service situation.*
Common emotional labor tasks might include teaching skills while managing the student's expectations and emotional responses, or staying calm and collected in a heated customer service situation.

### F
### G

#### [Gaslighting](http://www.thehotline.org/2014/05/29/what-is-gaslighting/): *A form of manipulation that seeks to sow seeds of doubt in a targeted individual or in members of a targeted group, hoping to make them question their own memory, perception, and sanity.*
#### [Gaslighting](http://www.thehotline.org/2014/05/29/what-is-gaslighting/)

*A form of manipulation that seeks to sow seeds of doubt in a targeted individual or in members of a targeted group, hoping to make them question their own memory, perception, and sanity.*

### H
### I

#### [Intersectional](http://geekfeminism.wikia.com/wiki/Intersectionality): *A concept to describe the ways in which oppressive institutions are interconnected and cannot be examined separately from one another.*
#### [Intersectional](http://geekfeminism.wikia.com/wiki/Intersectionality)

*A concept to describe the ways in which oppressive institutions are interconnected and cannot be examined separately from one another.*

### J
### K
### L
### M

#### [Marginalized](https://en.wikipedia.org/wiki/Social_exclusion): *To put or keep (someone) in a powerless or unimportant position within a society or group.*
#### [Mansplaining](https://en.wikipedia.org/wiki/Mansplaining): *A blend of the word man and the informal form splaining of the verb explaining and means "to explain something to someone, characteristically by a man to woman, in a manner regarded as condescending or patronizing"*

#### [Marginalized](https://en.wikipedia.org/wiki/Social_exclusion)

*To put or keep (someone) in a powerless or unimportant position within a society or group.*

#### [Mansplaining](https://en.wikipedia.org/wiki/Mansplaining)

*A blend of the word man and the informal form splaining of the verb explaining and means "to explain something to someone, characteristically by a man to woman, in a manner regarded as condescending or patronizing"*

#### [Missing Stair](https://en.wikipedia.org/wiki/Missing_stair): *A term used to describe a sexual predator whom many people know cannot be trusted, but who, rather than shunning, they work around by trying to quietly warn others. The term was coined by the blog* [The Pervocracy](http://pervocracy.blogspot.com/2012/06/missing-stair.html) *in 2012.*


### N

#### [Neopronoun](https://nonbinary.miraheze.org/wiki/List_of_neopronouns)

*Neopronouns are gender-neutral pronouns used in place of the singular "they." Example: The presenter is from Brazil and ey will be demonstrating a new web framwork written in LOLCODE.* For a guide on how to use many English language [pronouns](#pronouns) and neopronouns, visit [Pronoun Island](https://pronoun.is/).

#### [Nonbinary](https://transequality.org/issues/resources/understanding-non-binary-people-how-to-be-respectful-and-supportive)

*An individual whose gender blends elements of being a man or a woman, or whose gender is different than either male or female.* People whose gender is not male or female use many differnt terms to describe themselves, with nonbinary being the most common. Other terms include **genderqueer**, **agender**, **bigender**, **genderfluid**, and more.

### O

#### [Oppression](https://www.huffingtonpost.com/chris-boeskool/when-youre-accustomed-to-privilege_b_9460662.html): *Systemic, pervasive inequality present throughout society that benefits people with more privilege and harms those with fewer privileges.*
#### [Oppression](https://www.huffingtonpost.com/chris-boeskool/when-youre-accustomed-to-privilege_b_9460662.html)

*Systemic, pervasive inequality present throughout society that benefits people with more privilege and harms those with fewer privileges.*

### P

#### [Privilege](https://everydayfeminism.com/2014/09/what-is-privilege/): *An unearned advantage given to some people but not all. Individuals with privilege are considered to be the normative group, leaving those without access to this privilege invisible, unnatural, deviant, or just plain wrong. Most of the time, these privileges are automatic and most individuals in the privileged group are unaware of them. Some people who can “pass” as members of the privileged group might have access to some levels of privilege.*
#### [Privilege](https://everydayfeminism.com/2014/09/what-is-privilege/)

*An unearned advantage given to some people but not all. Individuals with privilege are considered to be the normative group, leaving those without access to this privilege invisible, unnatural, deviant, or just plain wrong. Most of the time, these privileges are automatic and most individuals in the privileged group are unaware of them. Some people who can “pass” as members of the privileged group might have access to some levels of privilege.*

#### [Pronouns](https://uwm.edu/lgbtrc/support/gender-pronouns/)

*A pronoun is a part of speech that refers to either the people talking (I or you) or something that is being talked about (she/them/ver/faer/it/this etc.) Gender pronouns (they/she/ze/he/ve/fae etc.) specifically refer to people that you are talking about.* For a detailed guide on how many different English language pronouns, visit [Pronoun Island](https://pronoun.is/). See also [Neopronouns](#neopronouns).

### Q
### R

#### [Rape Culture](https://en.wikipedia.org/wiki/Rape_culture): *A sociological concept used to describe a setting in which rape is pervasive and normalized due to societal attitudes about gender and sexuality.*
#### [Rape Culture](https://en.wikipedia.org/wiki/Rape_culture)

*A sociological concept used to describe a setting in which rape is pervasive and normalized due to societal attitudes about gender and sexuality.*
### S


#### [Sealioning](http://simplikation.com/why-sealioning-is-bad/): *The act of jumping into a discussion with demands for evidence and answers to questions.*
#### [Second Shift](http://geekfeminism.wikia.com/wiki/Second_shift): *The workload women have over and above what men have. In mainstream society, women's second shift mostly consists of childcare, eldercare, and domestic labour.*
#### [Sexual Harrassment](https://www.merriam-webster.com/dictionary/sexual%20harassment): *The uninvited and unwelcome verbal or physical behavior of a sexual nature especially by a person in authority toward a subordinate (such as an employee or student)*
#### [Stereotype Threat](https://en.wikipedia.org/wiki/Stereotype_threat): *A situational predicament in which people are or feel themselves to be at risk of conforming to stereotypes about their social group.*
#### [Sealioning](http://simplikation.com/why-sealioning-is-bad/)

*The act of jumping into a discussion with demands for evidence and answers to questions.*

#### [Second Shift](http://geekfeminism.wikia.com/wiki/Second_shift)

*The workload women have over and above what men have. In mainstream society, women's second shift mostly consists of childcare, eldercare, and domestic labour.*

#### [Sexual Harrassment](https://www.merriam-webster.com/dictionary/sexual%20harassment)

*The uninvited and unwelcome verbal or physical behavior of a sexual nature especially by a person in authority toward a subordinate (such as an employee or student)*

#### [Stereotype Threat](https://en.wikipedia.org/wiki/Stereotype_threat)*A situational predicament in which people are or feel themselves to be at r

isk of conforming to stereotypes about their social group.*

### T

#### [Trans](http://www.glaad.org/reference/transgender): *Individuals whose gender identity is different than the gender that was assigned at birth.*
#### [Trans](http://www.glaad.org/reference/transgender)

*Individuals whose gender identity is different than the gender that was assigned at birth.*

### U
### V
Expand Down
1 change: 1 addition & 0 deletions pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- [ ] I have read the [Code of Conduct](code_of_conduct.md) and understand it. By submitting this pull request I agree to follow the Code of Conduct.