merged tags

corvusdeinanis · Apr 23, 2024 · 4d1460b · 4d1460b
1 parent 75358ae
commit 4d1460b
Show file tree

Hide file tree

Showing 44 changed files with 109 additions and 205 deletions.
diff --git a/content/30 Basic Human Rights.md b/content/30 Basic Human Rights.md
@@ -3,6 +3,7 @@ title: 30 Basic Human Rights
 date: 2023-11-16
 tags:
   - humanrights
+  - law
 ---
 [[UDHR]] has 30 articles that outline 30 basic rights. They are: 
 

diff --git a/content/7 layers of OSI.md b/content/7 layers of OSI.md
@@ -11,8 +11,6 @@ tags: ['cloudcomputing','stub']
 6. Presentation 
 7. Application
 
-> example of calculator
-
 ```mermaid
 flowchart 
 A-->B-->C-->D-->E-->F-->G
@@ -23,4 +21,4 @@ D(Transport)
 E(Session)
 F(Presentation)
 G(Application)
-```
+```
diff --git a/content/A Brief History of Indian Cinema.md b/content/A Brief History of Indian Cinema.md
@@ -1,7 +1,9 @@
 ---
-title: "A Brief History of Indian Cinema"
+title: A Brief History of Indian Cinema
 date: 2023-08-17
-tags: ['movies','cinema']
+tags:
+  - movies
+  - cinema
 ---
 
 most viewed films

diff --git a/content/Bhasin vs Union of India.md b/content/Bhasin vs Union of India.md
@@ -2,7 +2,7 @@
 title: Bhasin vs Union of India
 date: 2024-01-09
 tags:
-  - laws
+  - law
   - medialaw
   - casestudy
 ---

diff --git a/content/Charles Dickens.md b/content/Charles Dickens.md
@@ -3,7 +3,7 @@ title: Charles Dickens
 date: 2023-10-02
 tags:
   - person
-  - author
+  - writer
   - literature
   - english
 ---

diff --git a/content/Chimamanda Ngozi Adichie.md b/content/Chimamanda Ngozi Adichie.md
@@ -2,7 +2,7 @@
 title: Chimamanda Ngozi Adichie
 date: 2024-03-17
 tags:
-  - author
+  - writer
   - english
   - literature
 ---

diff --git a/content/Cold War.md b/content/Cold War.md
@@ -4,7 +4,7 @@ date: 2023-09-28
 tags:
   - history
   - studynotes
-  - old
+  - legacy
   - legacy
   - needswork
 ---

diff --git a/content/Culture Cycle.md b/content/Culture Cycle.md
@@ -6,11 +6,9 @@ tags:
   - sociology
   - todo
 ---
-
 Culture 
 Counter-culture -> Dominant Culture
 
-
 Counter-culture arises 
 Becomes dominant
 

diff --git a/content/Dawn At Puri.md b/content/Dawn At Puri.md
@@ -62,7 +62,7 @@ The image of ‘skull in the holy sands’ = irony; opposite contrasting images.
 
 White-clad widowed Women past the centres of their lives are badly treated and disrespected. 
 After the death of their husbands they are forced to wear white saris and live a simple life. It is thought that once their husbands are dead their lives are insignificant. They are believed to have passed the ‘centre of their lives’
-(refers to the husband, or to the time when their husband was alive; #patriarchy)
+(refers to the husband, or to the time when their husband was alive; 
 
 
 The women are like helpless fish caught in the net where they are anxiously

diff --git a/content/Development and Displacement.md b/content/Development and Displacement.md
@@ -2,7 +2,7 @@
 title: Development and Displacement
 date: 2021-09-28
 tags:
-  - old
+  - legacy
   - legacy
 ---
 

diff --git a/content/Elo Rating.md b/content/Elo Rating.md
@@ -3,9 +3,9 @@ title: Elo Rating
 date: 2023-10-24
 tags:
   - statistics
-  - rating
   - rework
   - todo
+  - rewrite
 ---
 !e 
 needs rewrite 

diff --git a/content/Emerging Adulthood.md b/content/Emerging Adulthood.md
@@ -1,9 +1,10 @@
 ---
-title: "Emerging Adulthood"
-tags: ['psychology','development','lifespan']
+title: Emerging Adulthood
+tags:
+  - psychology
+  - lifespan
+date: 2023-01-12
 ---
-
-
 # Emerging Adulthood
 transition from adolescence to adulthood 
 **18 - 25** 

diff --git a/content/Festinger & Carlsmith (1959).md b/content/Festinger & Carlsmith (1959).md
@@ -1,7 +1,7 @@
 ---
 title: "Festinger & Carlsmith (1959)"
 date: 2023-08-10
-tags: ['psychology','socialpsych','experiments']
+tags: ['psychology','socialpsych','experiment']
 ---
 
 Participants were tasked with boring tasks  - turning pegs in a board full of holes

diff --git a/content/Four Ps of Marketing.md b/content/Four Ps of Marketing.md
diff --git a/content/French Revolution.md b/content/French Revolution.md
@@ -3,7 +3,7 @@ title: French Revolution
 date: 2023-07-10
 tags:
   - history
-  - old
+  - legacy
   - studynotes
   - incomplete
 ---

diff --git a/content/Girish Karnad.md b/content/Girish Karnad.md
@@ -1,7 +1,7 @@
 ---
 title: "Girish Karnad"
 date: 2023-04-26
-tags: ['literature','english','author']
+tags: ['literature','english','writer']
 ---
 
 renowned playwright, activist, director, and actor

diff --git a/content/How To Study.md b/content/How To Study.md
@@ -1,6 +1,6 @@
 ---
 title: "How to Study"
-tags: ['psychology','philosophy','life']
+tags: ['psychology','philosophy','lifestyle']
 ---
 
 # Learning Methods

diff --git a/content/Iliad.md b/content/Iliad.md
@@ -2,13 +2,14 @@
 title: Iliad
 date: 2023-09-28
 tags:
-  - old
+  - legacy
   - studynotes
   - english
   - literature
   - greek
   - epic
   - rough
+  - mythology
 ---
 CHARACTER DISCUSSION
 Greeks vs Trojans

diff --git a/content/Imagine - John Lennon.md b/content/Imagine - John Lennon.md
diff --git a/content/Jayanta Mahapatra.md b/content/Jayanta Mahapatra.md
@@ -1,7 +1,7 @@
 ---
 title: "Jayanta Mahapatra"
 date: 2023-04-24
-tags: ['literature','english','author']
+tags: ['literature','english','writer']
 ---
 
 is an Indian poet 

diff --git a/content/Jerry Coyne.md b/content/Jerry Coyne.md
@@ -4,7 +4,7 @@ date: 2023-10-25
 tags:
   - person
   - religion
-  - atheists
+  - atheist
 ---
 Coyne considers himself a secular Jew, and an outspoken anti-theist
 claims that religion and science are fundamentally incompatible

diff --git a/content/Jurisprudence.md b/content/Jurisprudence.md
@@ -2,7 +2,7 @@
 title: Jurisprudence
 date: 2024-01-05
 tags:
-  - laws
+  - law
   - medialaw
   - philosophy
 ---

diff --git a/content/Margaret Atwood.md b/content/Margaret Atwood.md
@@ -3,7 +3,7 @@ title: Margaret Atwood
 date: 2024-02-20
 tags:
   - writer
-  - author
+  - writer
   - poet
   - literature
   - english

diff --git a/content/Media Law and Ethics.md b/content/Media Law and Ethics.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ title: 30 Basic Human Rights @@
     date: 2023-11-16
     tags:
       - humanrights
+      - law
     ---
     [[UDHR]] has 30 articles that outline 30 basic rights. They are:
@@ Expand Down @@