From 892e358d4083962049b67b21320884c8f78aeace Mon Sep 17 00:00:00 2001 From: tatianamac Date: Mon, 4 Nov 2019 12:09:16 -0800 Subject: [PATCH] merge conflict --- _site/index.html | 486 +++++++++++++---------------------------------- 1 file changed, 134 insertions(+), 352 deletions(-) diff --git a/_site/index.html b/_site/index.html index 0cc01830..e6c388c5 100644 --- a/_site/index.html +++ b/_site/index.html @@ -7,7 +7,6 @@ Self-Defined · A modern dictionary about us. We define our words, but they don't define us. -<<<<<<< HEAD
@@ -28,13 +27,13 @@

Ways to help

    -
  1. Submit words and definitions through pull requests.
    2. -
  2. Sponsor this work through GitHub Sponsors.
    3. -
  3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
    4. +
  4. Submit words and definitions through pull requests.
    5. +
  5. Sponsor this work through GitHub Sponsors.
    6. +
  6. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
- +

A-E

@@ -150,267 +149,127 @@
  • Latinx
    • -======= - - -
    -
    -

    Self-Defined

    -
    ->>>>>>> 19b6dcb9cd3f4d660043fa171b091a3af0db5247 - -
    -

    - A modern dictionary about us. We define our words, but they don't define us.
    Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the modern world.
    -

    -
    - Ways to help -
      -
    1. Submit words and definitions through pull requests.
      2. -
    2. Sponsor this work through GitHub Sponsors.
      3. -
    3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
      4. -
    -
    -
    - -
    -
    -

    A-E

    -
      -
    • Ablelism
      • -
    • American
      • -
    • African
      • -
    • Asian
      • -
    • Black
      • -
    • Indigenous
      • -
    • Ambulatory Wheelchair
      • -
    • Ancestors
      • -
    • Anti-blackness
      • -
    • Anxiety disorders
      • -
    • aromantic
      • -
    • Asian
      • -
    • East
      • -
    • South
      • -
    • Southeast
      • -
    • asexual
      • -
    • Acquired Immune Deficiency Syndrome (AIDS)
      • -
    • assigned at birth
      • -
    • Attraction
      • -
    • Aesthetic
      • -
    • Platonic
      • -
    • Sexual
      • -
    • Autism spectrum
      • -
    • Bias
      • -
    • bierasure
      • -
    • bipolar
      • -
    • Bisexual
      • -
    • Black Asian Minority Ethnic (BAME)
      • -
    • Black Indigenous People of Color (BIPOC)
      • -
    • Black
      • -
    • men (BM)
      • -
    • people (BP)
      • -
    • women (BW)
      • -
    • Brown
      • -
    • Bropropriating
      • -
    • Burka
      • -
    • Child of a Deaf Adult (CODA)
      • -
    • cisgender
      • -
    • Climate change
      • -
    • Colonial narrative
      • -
    • Colonialism
      • -
    • colorism
      • -
    • Complex Post-Traumatic Stress Disorder (PTSD)
      • -
    • cultural appropriation
      • -
    • crazy
      • -
    • Demi
      • -
    • -boy
      • -
    • -girl
      • -
    • -romantic
      • -
    • -sexual
      • -
    • deaf and Deaf
      • -
    • Disability
      • -
    • disabled
      • -
    • discordant couples
      • -
    • Discrimination
      • -
    • Dominant culture
      • -
    • Dominant culture habits
      • -
    • Ehlers-Danlos Syndromes (EDS)
      • -
    • Egalitarian
      • -
    • Empathy
      • -
    • enby
      • -
    • English as a Second Language (ESL)
      • -
    • Entitlement
      • -
    • Equality
      • -
    • Equity
      • -
    • Ethnicity
      • -
    -
    - -
    -

    F-L

    -
      -
    • Fem
      • -
    • Femme
      • -
    • Gaslighting
      • -
    • Gender
      • -
    • Cis
      • -
    • -Fluid
      • -
    • Non-conforming
      • -
    • Trans
      • -
    • Queer
      • -
    • Gender confirmation surgery (GCS)
      • -
    • Genocide
      • -
    • Governmentality
      • -
    • gray ace
      • -
    • Gray asexuality
      • -
    • Hard of Hearing (HOH)
      • -
    • hegemonic
      • -
    • Hermaphrodite
      • -
    • pseudo, male and female
      • -
    • High-Functioning
      • -
    • Hijab
      • -
    • Hispanic
      • -
    • Human Immunodeficiency Virus (HIV)
      • -
    • Homophobia
      • -
    • hormone Replacement therapy (HRT)
      • -
    • Illness
      • -
    • Chronic
      • -
    • Immigrant
      • -
    • Impact
      • -
    • Implicit bias
      • -
    • Indigenous
      • -
    • Inherent
      • -
    • Intent
      • -
    • internalized oppression
      • -
    • Intersectionality
      • -
    • intersex
      • -
    • invisible disabilities
      • -
    • Jihad
      • -
    • Latinx
      • -
    -
    - -
    -

    M-S

    -
      -
    • Marginalized
      • -
    • Matriarchy
      • -
    • Medication sensitive
      • -
    • Militarization
      • -
    • Minorities
      • -
    • Minoritised
      • -
    • Misogynoir
      • -
    • Neurodivergent
      • -
    • Neurotypical
      • -
    • non binary
      • -
    • -Normative
      • -
    • cis
      • -
    • hetero
      • -
    • Obsessive Compulsive Disorder (OCD)
      • -
    • Oppression
      • -
    • Internalized
      • -
    • Other specified feeding or eating disorders (OSFED)
      • -
    • Panic attacks
      • -
    • Pansexual
      • -
    • -passing
      • -
    • female-
      • -
    • male-
      • -
    • white-
      • -
    • Parachuting
      • -
    • Patriarchy
      • -
    • Performative allyship
      • -
    • People of Color (PoC)
      • -
    • People with disabilities
      • -
    • -phile
      • -
    • andro
      • -
    • gyne
      • -
    • Platonic
      • -
    • Queer
      • -
    • Polyamory
      • -
    • Positivism
      • -
    • Post-Traumatic Stress Disorder
      • -
    • power
      • -
    • Poz
      • -
    • Prejudice
      • -
    • Pride
      • -
    • Pride, First (Anti-Police Riots)
      • -
    • Prophylaxis
      • -
    • Pre-exposure (PreEP)
      • -
    • Post-exposure (PEP)
      • -
    • Privilege
      • -
    • Cis
      • -
    • Monosexual
      • -
    • White
      • -
    • Race
      • -
    • Racial
      • -
    • Contract
      • -
    • Formation
      • -
    • State
      • -
    • Raciology
      • -
    • Racism
      • -
    • Racist
      • -
    • Savage
      • -
    • Savior
      • -
    • White
      • -
    • Semitic
      • -
    • Serodiscordant
      • -
    • settler
      • -
    • colonial mentality
      • -
    • Sexual
      • -
    • assault of a minor
      • -
    • orientation
      • -
    • Socially constructed
      • -
    • Solidarity
      • -
    • -Splaining
      • -
    • cis
      • -
    • man
      • -
    • white
      • -
    • Spirit animal
      • -
    • Systematic
      • -
    • Systemic
      • -
    -
    - -
    -

    T-Z

    -
      -
    • Top-down approach
      • -
    • Totemic animal
      • -
    • Tawhid
      • -
    • Trans Exclusionary Radical Feminist (TERF)
      • -
    • Trans
      • -
    • gender
      • -
    • man
      • -
    • masculine
      • -
    • phobia
      • -
    • woman
      • -
    • Tribe
      • -
    • Triggers
      • -
    • Two-spirited
      • -
    • Undetectable=Untransmittable (U=U)
      • -
    • Undetectable
      • -
    • Unqueer
      • -
    • Indigenous
      • -
    • Vertigo
      • -
    • Visual
      • -
    • Vestibular migraine
      • -
    • Violence against women and girls (VAWG)
      • -
    • Viral Load
      • -
    • White
      • -
    • feminism
      • -
    • fragility
      • -
    • -ness
      • -
    • supremacy
      • -
    • woman tears
      • -
    • people (WP)
      • -
    • women (WW)
      • -
    • White supremacist capitalist patriarchy
      • -
    • womanism
      • -
    • Women and people of colour
      • -
    -
    -
    +
    +

    M-S

    +
      +
    • Marginalized
      • +
    • Matriarchy
      • +
    • Medication sensitive
      • +
    • Militarization
      • +
    • Minorities
      • +
    • Minoritised
      • +
    • Misogynoir
      • +
    • Neurodivergent
      • +
    • Neurotypical
      • +
    • non binary
      • +
    • -Normative
      • +
    • cis
      • +
    • hetero
      • +
    • Obsessive Compulsive Disorder (OCD)
      • +
    • Oppression
      • +
    • Internalized
      • +
    • Other specified feeding or eating disorders (OSFED)
      • +
    • Panic attacks
      • +
    • Pansexual
      • +
    • -passing
      • +
    • female-
      • +
    • male-
      • +
    • white-
      • +
    • Parachuting
      • +
    • Patriarchy
      • +
    • Performative allyship
      • +
    • People of Color (PoC)
      • +
    • People with disabilities
      • +
    • -phile
      • +
    • andro
      • +
    • gyne
      • +
    • Platonic
      • +
    • Queer
      • +
    • Polyamory
      • +
    • Positivism
      • +
    • Post-Traumatic Stress Disorder
      • +
    • power
      • +
    • Poz
      • +
    • Prejudice
      • +
    • Pride
      • +
    • Pride, First (Anti-Police Riots)
      • +
    • Prophylaxis
      • +
    • Pre-exposure (PreEP)
      • +
    • Post-exposure (PEP)
      • +
    • Privilege
      • +
    • Cis
      • +
    • Monosexual
      • +
    • White
      • +
    • Race
      • +
    • Racial
      • +
    • Contract
      • +
    • Formation
      • +
    • State
      • +
    • Raciology
      • +
    • Racism
      • +
    • Racist
      • +
    • Savage
      • +
    • Savior
      • +
    • White
      • +
    • Semitic
      • +
    • Serodiscordant
      • +
    • settler
      • +
    • colonial mentality
      • +
    • Sexual
      • +
    • assault of a minor
      • +
    • orientation
      • +
    • Socially constructed
      • +
    • Solidarity
      • +
    • -Splaining
      • +
    • cis
      • +
    • man
      • +
    • white
      • +
    • Spirit animal
      • +
    • Systematic
      • +
    • Systemic
      • +
    +
    + +
    +

    T-Z

    +
      +
    • Top-down approach
      • +
    • Totemic animal
      • +
    • Tawhid
      • +
    • Trans Exclusionary Radical Feminist (TERF)
      • +
    • Trans
      • +
    • gender
      • +
    • man
      • +
    • masculine
      • +
    • phobia
      • +
    • woman
      • +
    • Tribe
      • +
    • Triggers
      • +
    • Two-spirited
      • +
    • Undetectable=Untransmittable (U=U)
      • +
    • Undetectable
      • +
    • Unqueer
      • +
    • Indigenous
      • +
    • Vertigo
      • +
    • Visual
      • +
    • Vestibular migraine
      • +
    • Violence against women and girls (VAWG)
      • +
    • Viral Load
      • +
    • White
      • +
    • feminism
      • +
    • fragility
      • +
    • -ness
      • +
    • supremacy
      • +
    • woman tears
      • +
    • people (WP)
      • +
    • women (WW)
      • +
    • White supremacist capitalist patriarchy
      • +
    • womanism
      • +
    • Women and people of colour
      • +
    +
    +
    @@ -493,18 +352,16 @@

    - -<<<<<<< HEAD -
    -

    - Further Reading -

    - -
    +
    +

    + Further Reading +

    + +
    @@ -549,84 +406,9 @@

    - minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women; or omit

    + minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women; or omit

    -======= -
    -

    - avoid -

    -

    - minorities - - noun - -

    -

    - the smaller in number of two groups constituting a whole -

    -
    -

    - Issues -

    -

    Minorities is not always accurate. As it deals with numbers, often the insinuation of racial minorities is inaccurate, as communities of colour often outnumber white communities.

    -
    -
    -

    - Impact -

    -

    By repeatedly referring to groups as "minorities," they are being infantised and made to feel minor.

    -
    -
    -

    - Alt Words -

    -

    - - minoritised, or omit - -

    -
    -
    - -
    -

    - Better Alternate -

    -

    - minoritised - - adj - -

    -

    - groups resulting from social constructs have grant less power or representation compared to other members or groups in society -

    -
    -

    - Benefits -

    -

    Minoritised places the emphasis on the power struggle, and on the systemic issues at play. It's also an adjective, which requires you to add "group" or "people" so it's people-first language

    -
    -
    -

    - Impact -

    -

    It removes the pejorative nature of "minorities".

    -
    -
    -

    - Alt Words -

    -

    - - minorities, or omit - -

    -
    -
    ->>>>>>> 19b6dcb9cd3f4d660043fa171b091a3af0db5247