From 4d1460b2d74cb6b4138faef0cd5742df10ed42e2 Mon Sep 17 00:00:00 2001
From: corvusdeinanis <25402014+corvusdeinanis@users.noreply.github.com>
Date: Wed, 24 Apr 2024 01:19:29 +0530
Subject: [PATCH] merged tags
---
content/30 Basic Human Rights.md | 1 +
content/7 layers of OSI.md | 4 +-
content/A Brief History of Indian Cinema.md | 6 +-
content/Bhasin vs Union of India.md | 2 +-
content/Charles Dickens.md | 2 +-
content/Chimamanda Ngozi Adichie.md | 2 +-
content/Cold War.md | 2 +-
content/Culture Cycle.md | 2 -
content/Dawn At Puri.md | 2 +-
content/Development and Displacement.md | 2 +-
content/Elo Rating.md | 2 +-
content/Emerging Adulthood.md | 9 ++-
content/Festinger & Carlsmith (1959).md | 2 +-
content/Four Ps of Marketing.md | 12 ---
content/French Revolution.md | 2 +-
content/Girish Karnad.md | 2 +-
content/How To Study.md | 2 +-
content/Iliad.md | 3 +-
content/Imagine - John Lennon.md | 51 -------------
content/Jayanta Mahapatra.md | 2 +-
content/Jerry Coyne.md | 2 +-
content/Jurisprudence.md | 2 +-
content/Margaret Atwood.md | 2 +-
content/Media Law and Ethics.md | 33 --------
content/Napoleon.md | 76 +++++++++----------
content/Ngugi wa Thiongo.md | 2 +-
... Adulthood - Man Who Invented Christmas.md | 2 +-
content/Reporting and Editing Media.md | 1 -
content/Russian Revolution.md | 2 +-
content/Social Institutions.md | 2 +-
content/Sociology Mnemonics.md | 48 ++++++------
content/Stages of Grief.md | 2 +-
content/Symbols, Motifs, and Themes.md | 2 +-
content/TS Eliot.md | 2 +-
content/Thinking and Reasoning.md | 2 +-
content/anaphora.md | 4 +-
content/broken windows theory.md | 1 -
content/meta/Interesting Stuff.md | 2 +-
content/meta/blog/Get Started.md | 2 +-
content/meta/blog/act inertia.md | 2 +-
content/navigation.md | 3 +
content/streisand effect.md | 2 +-
content/unjust law is no law at all.md | 2 +-
quartz.config.ts | 4 +-
44 files changed, 109 insertions(+), 205 deletions(-)
delete mode 100644 content/Four Ps of Marketing.md
delete mode 100644 content/Imagine - John Lennon.md
delete mode 100644 content/Media Law and Ethics.md
create mode 100644 content/navigation.md
diff --git a/content/30 Basic Human Rights.md b/content/30 Basic Human Rights.md
index 61d665e86c495..82f04131b6ae1 100644
--- 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
index da8ed69b0f76c..3cf641437fe52 100644
--- 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)
-```
\ No newline at end of file
+```
diff --git a/content/A Brief History of Indian Cinema.md b/content/A Brief History of Indian Cinema.md
index b790fb8a34f9c..14bede8878a3b 100644
--- 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
index cf29418b8a135..bc1a306b8c8ab 100644
--- 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
index 27d0ff8e2ccdc..b0307e06665ca 100644
--- 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
index 028e7f603bbbc..34c810b42dc16 100644
--- 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
index 0e425d12dc713..65a15b7ef900a 100644
--- 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
index 051a7add26006..ee3fada4bf209 100644
--- 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
index 28b66e455d7c3..190caaf718900 100644
--- 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
index d51b53caa106b..98c1e16b2ca1c 100644
--- 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
index e97023e26f11b..79d36d118c7b1 100644
--- 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
index fef6b262f5301..9addb238da4b3 100644
--- 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
index 0306269f30e19..217fe839d84ff 100644
--- 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
deleted file mode 100644
index aa82401e54521..0000000000000
--- a/content/Four Ps of Marketing.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: "Four Ps of Marketing"
-date: 2023-08-12
-tags: ['marketing']
----
-
-# Four Ps of Marketing
-## Price
-## Place
-## Positioning
-## Product
-
diff --git a/content/French Revolution.md b/content/French Revolution.md
index 6034cb5e87502..d9e4896edd7a0 100644
--- 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
index c75e7f42adc1d..4430eac28b445 100644
--- 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
index 837dfd3007f26..769ea9b1f864d 100644
--- 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
index 21a604a28de33..b60c3748f1a12 100644
--- 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
deleted file mode 100644
index c2961cbc3e591..0000000000000
--- a/content/Imagine - John Lennon.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: "Imagine by John Lennon"
-tags: ['english','song','faith','poem','stub']
-author: ['John Lennon']
----
-by [[John Lennon]]
-no countries, no religion, no possessions, no division
-no hunger
-anti-war
-pacifist
-
-John Lennon asks us to imagine a world, a dream world where humanity is free of conflicts and barriers. Of peace and brotherhood.
-
-*we are all one country, one world, one people*
-
-
-"anti-religious, anti-nationalistic, anti-conventional, anti-capitalistic… but because it is sugar-coated, it is accepted."
-
-
-> [!NOTE]- Poem
-Imagine there's no heaven
-It's easy if you try
-No hell below us
-Above us, only sky
-Imagine all the people
-Livin' for today
-Ah
-Imagine there's no countries
-It isn't hard to do
-Nothing to kill or die for
-And no religion, too
-Imagine all the people
-Livin' life in peace
-You may say I'm a dreamer
-But I'm not the only one
-I hope someday you'll join us
-And the world will be as one
-Imagine no possessions
-I wonder if you can
-No need for greed or hunger
-A brotherhood of man
-Imagine all the people
-Sharing all the world
-You may say I'm a dreamer
-But I'm not the only one
-I hope someday you'll join us
-And the world will live as one
-
-
----
-read also: [[Anarchy]]
diff --git a/content/Jayanta Mahapatra.md b/content/Jayanta Mahapatra.md
index 2c1e2a30eace7..14a008ba1846f 100644
--- 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
index 27622ad8537c2..1f3584903870b 100644
--- 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
index e57e5ad4eedc0..9a532996fb457 100644
--- 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
index 6d79ca778435d..dafc798f40339 100644
--- 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
deleted file mode 100644
index bc3647583c3ba..0000000000000
--- a/content/Media Law and Ethics.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Media Law and Ethics
-date: 2024-01-04
-tags:
- - media
- - medialaw
----
-## Relevance of implementing laws for the smooth functioning of the nation.
-
-Rohan P, 21BAR01080, OPJ B
-
-What are "laws"?
-Laws are a form of social control. Along with mores, they form the major form of social control. They are upheld by social institutions and are woven throughout our lives, affecting every facet.
-
-Laws are body of rules and regulations that are **enforced** or **imposed**. They are imposed by an authority body like a government. In theory, laws are for ensuring peace, egalitarianism, and keeping up the social cohesion. The function of law is to ensure the welfare of people. Laws are made on the premise that it helps to run society. People who disobey laws are treated with consequences and are usually punished (though, in most cases, rehabilitation would be a better option).
-
-Laws are as old as human culture
-Laws have evolved but have been present throughout History. We have unearthed ancient rock edicts, scriptures, inscriptions, etc. All of this prove that laws have been ever present in human history.
-
-Why do we need social control?
-We need social control for social cohesion, for moralistic reasons, to deter behaviour that would not benefit society at large. It is to make human behaviour "acceptable". Religion and mores have been important forms of social control imparting moral values.
-
-Without an authoritative body imposing laws, many people believe that society would fall apart and that law is the glue that holds society together. This is untrue because there have been various examples in History. For example, Autonomous Administration of North and East Syria (AANES) formerly called Rojava (There is not forceful implementation of law, there is no death penalty, there is focus on care and rehabilitation) or the Zaptistas.
-
-Why we need to focus on implementation of laws?
-Laws, even the ones that are great on paper, are useless unless they are implemented widely. Implementing and enforcing laws is what makes them **compulsory**.
-
-- We need to focus on equal implementation of laws. There must be equity.
-- Laws must be enforced uniformly.
-
-To put it shortly, laws are guidelines that are prescribed and imposed by authority for the welfare of everyone. This does not always translate to real life well because not all laws are fair and not all of them are implemented well or more often, they are implemented unfairly. The rich and powerful are unscathed while the poor and vulnerable are subject to harsher punishments
-
-It is as important to implement laws fairly as it is to make them.
\ No newline at end of file
diff --git a/content/Napoleon.md b/content/Napoleon.md
index ee226cc61ad91..ad4f1f7559061 100644
--- a/content/Napoleon.md
+++ b/content/Napoleon.md
@@ -9,41 +9,41 @@ tags:
- studynotes
- incomplete
---
-| | |
-|---|---|
-|1799 - 1815|Napoleonic Era|
-|August 15th 1769|Birth of Napoleon|
-|Early Life of Napoleon Bonaparte|Born on August 15th, 1769 in Corsica at Ajeccio. Parents - Count Charles Bonaparte and Countess Leticia Romalina. Studied at Brienne (Austria) and then Military Academy of Paris. Dur childhood, self confidence, hard work, and ambition. He served in the French Army at age 17 as artillery officer. He rose from post to post. He supressed two rebellions against Fr Govt during the Fr Rev|
-|1796|Directory govt appointed Napoleon COMMANDER of French army in Italy. His campaign was success, Defeated Sardinians and Austrians. Treaty of Campo-formio in 1797.|
-|Military Campaigns|1796 - Campaign against Italy. Defeated Sardinians and Austrians. Treaty of Campo-Formio in 1797. Egyptian Campaign. Battle of Pyramids, he won. Battle of Nile he lost because by Admiral Nelson - Navy stronger|
-|1799|Nappy boi overthrows Directory govt. Coup d'etat. Three member govt came into existence|
-|Consulate|Nap - 1st Consul. Abbe Siyas - 2nd Consul. Ducos - 3rd Consul. Napoleon had absolute powers, France was Republic only in name. Napoleon declared himself emperor via plebiscite in 1804|
-|1804|Napoleon becomes Emperor|
-|Reforms of Napoleon Bonaparte|Admin led to effective reconstruction of france. After 10 years of change during Fr Rev, France was exp a period of chaos and confusion. Napoleon brought order through his admin reforms.
i) Administrative ii) Code Napoleon iii) Concordat iv) Education v) Public Works vi) Economic reforms vi) Legion of honor|
-|Administrative reforms of Napoleon Bonaparte|Centralized govt from local govt. France divided into provinces / departments. Subdivided into smaller units - arrondisments and communes. Powers of all bodies were vested in prefects and sub prefects who answered only to Nappy. Efficient police and loyal army helped. Uniform governance.|
-|Arrondisment and Communes|subdivisions of provinces|
-|Napoleon Code|Legal code. One of his most imp contributions. Still forms a large base for French law. Model for rest of Europe. Civil Code, followed by Code of Civil Procedure, Code of Criminal Procedure, Penal Code, and the Commercial Code. Civil equality, religious toleration, emancipation of land were connected with these. Called "Second Justinian"|
-|Concordat (religious treaty)|Improved relationship with Pope. Understanding with Pope Pius VII in 1802. Concordat. Catholicism = State religion of France.|
-|Education|National scheme of edu. 4 grades of schools, all managed by the State. Elementary, Secondary, Higher and Special schools. Special = Technical, Civil service or Military. Intro new Uni system. Established University of France in 1808. Christian Ethics, Loyalty to state = two subjects taught|
-|Public Works|-helped solve unemployment crisis. - various highways, two Trans-Alpine roads (Connected Paris to Rome and Turin) - bridges built, canals and water ways repaired. New streets. Old prison -> Museum called Louvre. Renovated Paris.|
-|Economic Reforms|National Bank in France - Bank of France (1805). Supervised financial setup. Stimulated trade and industry. Careful collection of taxes. Revenue boards. National loan was reduced. Stock exchange regulated, gambling and corruption rooted out.|
-|Legion of Honour|An award to honour people who have rendered civil and military services to the State. Based on equality, w/o distinction of class and rel|
-|Napoleon's Conquests|Battle of Trafalgar. Battle of Austerslitz. Continental System. Russian Campaign. Battle of Leipzig. Battle of Waterloo.|
-|Number of coalitions against Napoleon|7|
-|First coaliton against Napoleon|Prussia, Austria, Russia, Spain et al. Shattered during his conquest of Italy.|
-|First coaliton against Napoleon mnemonic|PARS|
-|Second Coalition against Napoleon|Russia, Austria, Turkey, Naples, England. Russia switched sids, Austria defeated|
-|Second Coalition against Napoleon mnemonic|NARTE|
-|Battle of Trafalgar|1805. Against Eng, Austria, Russia, and Sweden who formed coalition. French were defeated as it was a naval battle.|
-|Battle of Austerlitz|1805. Defeated Austria and Russia. Treaty of Tilsit.|
-|SEAR|Sweden, Eng, Austria, Russia|
-|Treaty of Tilsit|1807 with Tsar of Russia|
-|Continental System|1806. Issued two decrees (1806 Berlin 1807 Milan) to cripple the England trade. Continental system, where British goods were excluded from whole of Europe. European countries faced loss as they were dependent on England. Became weak. Spain and Portugual were attacked for not foll cont sys. Spain - Civil War. Napoleon sent Joseph, his brother. England took the opportunity and under General Arthur Wellesley, defeated French army.|
-|Russian Campaign|1812. Tsar Alexander violated Continental system and imported British goods. Napoleon invaded Moscow. Led huge army hoping Russia would surrender. Burnt Moscow. But suffered from thirst, hunger, and the cold. Napoleon returned with the loss of 3 hundred thou soldiers|
-|Battle of Leipzig|1813. Fourth coalition formed. Austria, Prussia, Eng defeated Napoleon. Arrested and deported him to Island of Elba. Louis XVIII was crowned king of France.|
-|Battle of Waterloo|Napoleon fled Elba and went to France. Louis XVIII took refuge in Belgium. Ruled for 100 days. Allied nations came together. In 1815, at Waterloo, Belgium, Napoleon was defeated by Sir Arthur Wellesley (Wellington) who was the Brit General. Napoleon was exiled to St Helena.|
-|May 5th, 1821|Napoleon died of ulcer|
-|Causes for Napoleon's downfall|Genius, but overambitious and prideful - Army consisted of soldiers from different nations who did not have any attachment to the empire. - Rise of nationalism against Napoleonic empire -Continental System caused huge losses to Eur countries -Russian expedition was a fail -Ill treatment of the Pope. He shifted seat of Papacy to Paris because Pope refused to accept continental system. -Continuous opp. by England. Strong fleet and commanders. -Friend and relatives of Napoleon betrayed him|
-|||
-|TACRLW||
-|The Ancient Cow Roared Like a Whale||
+| | |
+| -------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 1799 - 1815 | Napoleonic Era |
+| August 15th 1769 | Birth of Napoleon |
+| Early Life of Napoleon Bonaparte | Born on August 15th, 1769 in Corsica at Ajeccio. Parents - Count Charles Bonaparte and Countess Leticia Romalina. Studied at Brienne (Austria) and then Military Academy of Paris. Dur childhood, self confidence, hard work, and ambition. He served in the French Army at age 17 as artillery officer. He rose from post to post. He supressed two rebellions against Fr Govt during the Fr Rev |
+| 1796 | Directory govt appointed Napoleon COMMANDER of French army in Italy. His campaign was success, Defeated Sardinians and Austrians. Treaty of Campo-formio in 1797. |
+| Military Campaigns | 1796 - Campaign against Italy. Defeated Sardinians and Austrians. Treaty of Campo-Formio in 1797. Egyptian Campaign. Battle of Pyramids, he won. Battle of Nile he lost because by Admiral Nelson - Navy stronger |
+| 1799 | Nappy boi overthrows Directory govt. Coup d'etat. Three member govt came into existence |
+| Consulate | Nap - 1st Consul. Abbe Siyas - 2nd Consul. Ducos - 3rd Consul. Napoleon had absolute powers, France was Republic only in name. Napoleon declared himself emperor via plebiscite in 1804 |
+| 1804 | Napoleon becomes Emperor |
+| Reforms of Napoleon Bonaparte | Admin led to effective reconstruction of france. After 10 years of change during Fr Rev, France was exp a period of chaos and confusion. Napoleon brought order through his admin reforms.
i) Administrative ii) Code Napoleon iii) Concordat iv) Education v) Public Works vi) Economic reforms vi) Legion of honor |
+| Administrative reforms of Napoleon Bonaparte | Centralized govt from local govt. France divided into provinces / departments. Subdivided into smaller units - arrondisments and communes. Powers of all bodies were vested in prefects and sub prefects who answered only to Nappy. Efficient police and loyal army helped. Uniform governance. |
+| Arrondisment and Communes | subdivisions of provinces |
+| Napoleon Code | Legal code. One of his most imp contributions. Still forms a large base for French law. Model for rest of Europe. Civil Code, followed by Code of Civil Procedure, Code of Criminal Procedure, Penal Code, and the Commercial Code. Civil equality, religious toleration, emancipation of land were connected with these. Called "Second Justinian" |
+| Concordat (religious treaty) | Improved relationship with Pope. Understanding with Pope Pius VII in 1802. Concordat. Catholicism = State religion of France. |
+| Education | National scheme of edu. 4 grades of schools, all managed by the State. Elementary, Secondary, Higher and Special schools. Special = Technical, Civil service or Military. Intro new Uni system. Established University of France in 1808. Christian Ethics, Loyalty to state = two subjects taught |
+| Public Works | -helped solve unemployment crisis. - various highways, two Trans-Alpine roads (Connected Paris to Rome and Turin) - bridges built, canals and water ways repaired. New streets. Old prison -> Museum called Louvre. Renovated Paris. |
+| Economic Reforms | National Bank in France - Bank of France (1805). Supervised financial setup. Stimulated trade and industry. Careful collection of taxes. Revenue boards. National loan was reduced. Stock exchange regulated, gambling and corruption rooted out. |
+| Legion of Honour | An award to honour people who have rendered civil and military services to the State. Based on equality, w/o distinction of class and rel |
+| Napoleon's Conquests | Battle of Trafalgar. Battle of Austerslitz. Continental System. Russian Campaign. Battle of Leipzig. Battle of Waterloo. |
+| Number of coalitions against Napoleon | 7 |
+| First coaliton against Napoleon | Prussia, Austria, Russia, Spain et al. Shattered during his conquest of Italy. |
+| First coaliton against Napoleon mnemonic | PARS |
+| Second Coalition against Napoleon | Russia, Austria, Turkey, Naples, England. Russia switched sids, Austria defeated |
+| Second Coalition against Napoleon mnemonic | NARTE |
+| Battle of Trafalgar | 1805. Against Eng, Austria, Russia, and Sweden who formed coalition. French were defeated as it was a naval battle. |
+| Battle of Austerlitz | 1805. Defeated Austria and Russia. Treaty of Tilsit. |
+| SEAR | Sweden, Eng, Austria, Russia |
+| Treaty of Tilsit | 1807 with Tsar of Russia |
+| Continental System | 1806. Issued two decrees (1806 Berlin 1807 Milan) to cripple the England trade. Continental system, where British goods were excluded from whole of Europe. European countries faced loss as they were dependent on England. Became weak. Spain and Portugual were attacked for not foll cont sys. Spain - Civil War. Napoleon sent Joseph, his brother. England took the opportunity and under General Arthur Wellesley, defeated French army. |
+| Russian Campaign | 1812. Tsar Alexander violated Continental system and imported British goods. Napoleon invaded Moscow. Led huge army hoping Russia would surrender. Burnt Moscow. But suffered from thirst, hunger, and the cold. Napoleon returned with the loss of 3 hundred thou soldiers |
+| Battle of Leipzig | 1813. Fourth coalition formed. Austria, Prussia, Eng defeated Napoleon. Arrested and deported him to Island of Elba. Louis XVIII was crowned king of France. |
+| Battle of Waterloo | Napoleon fled Elba and went to France. Louis XVIII took refuge in Belgium. Ruled for 100 days. Allied nations came together. In 1815, at Waterloo, Belgium, Napoleon was defeated by Sir Arthur Wellesley (Wellington) who was the Brit General. Napoleon was exiled to St Helena. |
+| May 5th, 1821 | Napoleon died of ulcer |
+| Causes for Napoleon's downfall | Genius, but overambitious and prideful - Army consisted of soldiers from different nations who did not have any attachment to the empire. - Rise of nationalism against Napoleonic empire -Continental System caused huge losses to Eur countries -Russian expedition was a fail -Ill treatment of the Pope. He shifted seat of Papacy to Paris because Pope refused to accept continental system. -Continuous opp. by England. Strong fleet and commanders. -Friend and relatives of Napoleon betrayed him |
+| | |
+| TACRLW | |
+| The Ancient Cow Roared Like a Whale | |
diff --git a/content/Ngugi wa Thiongo.md b/content/Ngugi wa Thiongo.md
index f11d7e80e701c..754e2aa031edc 100644
--- a/content/Ngugi wa Thiongo.md
+++ b/content/Ngugi wa Thiongo.md
@@ -4,7 +4,7 @@ date: 2024-03-25
tags:
- writer
- literature
- - african
+ - africa
---
prominent Kenyan writer, academic, and activist
diff --git a/content/Painful Memories of Childhood and Adulthood - Man Who Invented Christmas.md b/content/Painful Memories of Childhood and Adulthood - Man Who Invented Christmas.md
index 411977d1e138f..8d38cfc537064 100644
--- a/content/Painful Memories of Childhood and Adulthood - Man Who Invented Christmas.md
+++ b/content/Painful Memories of Childhood and Adulthood - Man Who Invented Christmas.md
@@ -7,7 +7,7 @@ tags:
- Review
- movie
- legacy
- - old
+ - legacy
- needswork
---
> [!Important] Legacy Note
diff --git a/content/Reporting and Editing Media.md b/content/Reporting and Editing Media.md
index 966af787b3d48..9f527d28d32ca 100644
--- a/content/Reporting and Editing Media.md
+++ b/content/Reporting and Editing Media.md
@@ -3,7 +3,6 @@ title: Reporting and Editing Media
date: 2023-10-14
tags:
- journalism
- - semv
- syllabus
- studynotes
- collection
diff --git a/content/Russian Revolution.md b/content/Russian Revolution.md
index 8a34515545e54..35a9a0db1debf 100644
--- a/content/Russian Revolution.md
+++ b/content/Russian Revolution.md
@@ -3,7 +3,7 @@ title: Russian Revolution
date: 2023-09-28
tags:
- history
- - old
+ - legacy
- studynotes
- incomplete
---
diff --git a/content/Social Institutions.md b/content/Social Institutions.md
index 08bc1f49b0e49..08322f7efbfd2 100644
--- a/content/Social Institutions.md
+++ b/content/Social Institutions.md
@@ -5,7 +5,7 @@ tags:
- legacy
- socialpsych
- society
- - old
+ - legacy
- studynotes
- sociology
---
diff --git a/content/Sociology Mnemonics.md b/content/Sociology Mnemonics.md
index 6b10235fcf2e5..122971be105ac 100644
--- a/content/Sociology Mnemonics.md
+++ b/content/Sociology Mnemonics.md
@@ -5,30 +5,30 @@ tags:
- mnemonic
- sociology
- legacy
- - old
+ - legacy
- studynotes
- needswork
---
-| | |
-|---|---|
-|Characteristics of Culture|DISC STRGL|
-|Characteristics of Social Change|Plan to use C4 on Universe might Vary, but is Inevitable so don't Judge. Sync that thought in|
-|Char of Social Progress|DC Vs Vile Marvel|
-|causes for resistance|stab 7 eyes out of habit, not fear|
-|||
-|Nature of Sociology|ISCAP, GERG|
-|Char of science|FCUP, no V OSM|
-|Elements of Community|Link Should Save Natural Sizzlers Controlled by Nemesis|
-|Char of Association|HICORE|
-|Char of Institution|OASIS CUP|
-|Char of Social Groups|SINS SUDI|
-|Organised Groups|IS ROSS|
-|Unorganised Groups|SOOO|
-|||
-|||
-|Co-operation characteristics|Universally, Psychos are Selfish Cons with Goals and Rewards|
-|Importance of Co-Operation|B PIND|
-|Competition Char|PUC is SAD and CUNning|
-|Functions of Competition|New Status on Social Media on Mobile is Motivational|
-|Characteristics of Conflict|It is Universal fact that a Cultured, Conscious, Normal person is Occassionally Insecure and Frustrated|
-|Causes of Conflict|IC CS|
+| | |
+| -------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| Characteristics of Culture | DISC STRGL |
+| Characteristics of Social Change | Plan to use C4 on Universe might Vary, but is Inevitable so don't Judge. Sync that thought in |
+| Char of Social Progress | DC Vs Vile Marvel |
+| causes for resistance | stab 7 eyes out of habit, not fear |
+| | |
+| Nature of Sociology | ISCAP, GERG |
+| Char of science | FCUP, no V OSM |
+| Elements of Community | Link Should Save Natural Sizzlers Controlled by Nemesis |
+| Char of Association | HICORE |
+| Char of Institution | OASIS CUP |
+| Char of Social Groups | SINS SUDI |
+| Organised Groups | IS ROSS |
+| Unorganised Groups | SOOO |
+| | |
+| | |
+| Co-operation characteristics | Universally, Psychos are Selfish Cons with Goals and Rewards |
+| Importance of Co-Operation | B PIND |
+| Competition Char | PUC is SAD and CUNning |
+| Functions of Competition | New Status on Social Media on Mobile is Motivational |
+| Characteristics of Conflict | It is Universal fact that a Cultured, Conscious, Normal person is Occassionally Insecure and Frustrated |
+| Causes of Conflict | IC CS |
diff --git a/content/Stages of Grief.md b/content/Stages of Grief.md
index 36e3fdcd9efeb..352a7ad6ecf56 100644
--- a/content/Stages of Grief.md
+++ b/content/Stages of Grief.md
@@ -1,6 +1,6 @@
---
title: "Stages of Grief"
-tags: ['psychology', 'notenoughevidence']
+tags: ['psychology', 'insufficientevidence']
date: 2023-03-29
---
diff --git a/content/Symbols, Motifs, and Themes.md b/content/Symbols, Motifs, and Themes.md
index 50a7c94e6285a..bea5f6420c6e1 100644
--- a/content/Symbols, Motifs, and Themes.md
+++ b/content/Symbols, Motifs, and Themes.md
@@ -1,6 +1,6 @@
---
title: "Symbols, Motifs, and Themes"
-tags: ['english','literature','devices']
+tags: ['english','literature','litdevices']
date: 2023-04-10
---
diff --git a/content/TS Eliot.md b/content/TS Eliot.md
index e8a23b4c25f76..346743f0cd2e7 100644
--- a/content/TS Eliot.md
+++ b/content/TS Eliot.md
@@ -1,6 +1,6 @@
---
title: "T.S. Eliot"
-tags: ['english','author', 'person']
+tags: ['english','writer', 'person']
---
diff --git a/content/Thinking and Reasoning.md b/content/Thinking and Reasoning.md
index e1f2713906ff7..795f16e976ddf 100644
--- a/content/Thinking and Reasoning.md
+++ b/content/Thinking and Reasoning.md
@@ -1,6 +1,6 @@
---
title: "Thinking and Reasoning"
-tags: ['psychology','studynotes','needswork','old']
+tags: ['psychology','studynotes','needswork','legacy']
---
(?) (!e)
diff --git a/content/anaphora.md b/content/anaphora.md
index cb29f6d3e8c97..3028a7543a9e9 100644
--- a/content/anaphora.md
+++ b/content/anaphora.md
@@ -1,11 +1,9 @@
---
title: "anaphora"
-tags: ['rhetorical','literature','devices','techniques']
+tags: ['rhetorical','literature','litdevices','techniques']
date: 2023-04-10
---
-
In rhetoric, an anaphora (Greek, "carrying back") is a rhetorical device that **consists of repeating a sequence of words** at the beginnings of neighboring clauses
for emphasis
----
diff --git a/content/broken windows theory.md b/content/broken windows theory.md
index 46bf2c1a7e7a7..d9841a2726d1a 100644
--- a/content/broken windows theory.md
+++ b/content/broken windows theory.md
@@ -3,7 +3,6 @@ title: "Broken windows theory"
date: 2023-05-13
tags: ['adages','social','crime','psychology']
---
-
theory was introduced in a 1982 article by social scientists James Q. Wilson and George L. Kelling
the **broken windows theory** states that **visible signs** of crime, anti-social behaviour and civil disorder create an urban environment that **encourages** further crime and disorder, including serious crimes.
diff --git a/content/meta/Interesting Stuff.md b/content/meta/Interesting Stuff.md
index 98d3ad8ade503..1c26410fda7fc 100644
--- a/content/meta/Interesting Stuff.md
+++ b/content/meta/Interesting Stuff.md
@@ -16,7 +16,7 @@ By James Polchin -> ISBN 9781640093874 -
- [ ] Read Howl (collection of poems)
## Counterculture
- [ ] Add more Sociology notes
-- [ ] More Phil, More #Absurdism
+- [ ] More Phil, More #absurdism
---
## Obsidian Stuff
diff --git a/content/meta/blog/Get Started.md b/content/meta/blog/Get Started.md
index c8ce797c630d0..56c3d60ccc433 100644
--- a/content/meta/blog/Get Started.md
+++ b/content/meta/blog/Get Started.md
@@ -4,7 +4,7 @@ date: 2024-02-17
tags:
- important
- starred
- - life
+ - lifestyle
- wellbeing
---
To finish something, you must first **GET STARTED**.
diff --git a/content/meta/blog/act inertia.md b/content/meta/blog/act inertia.md
index 5c956cbdb628b..fb42b17591dc1 100644
--- a/content/meta/blog/act inertia.md
+++ b/content/meta/blog/act inertia.md
@@ -2,7 +2,7 @@
title: act inertia
date: 2024-02-17
tags:
- - life
+ - lifestyle
- blog
- wellbeing
---
diff --git a/content/navigation.md b/content/navigation.md
new file mode 100644
index 0000000000000..0fbcdcb80b73d
--- /dev/null
+++ b/content/navigation.md
@@ -0,0 +1,3 @@
+---
+Aliases: [ "#navigation" ]
+---
diff --git a/content/streisand effect.md b/content/streisand effect.md
index 1efa2d6b44ddc..13267d8762274 100644
--- a/content/streisand effect.md
+++ b/content/streisand effect.md
@@ -1,7 +1,7 @@
---
title: "streisand effect"
date: 2023-05-12
-tags: ['social','laws','adages']
+tags: ['social','law','adages']
---
The Streisand effect is a phenomenon in which attempts to hide, remove, or censor information can lead to the unintended consequence of increasing awareness of that information.
diff --git a/content/unjust law is no law at all.md b/content/unjust law is no law at all.md
index 5d6b4c81a1694..55d40cf1cdf52 100644
--- a/content/unjust law is no law at all.md
+++ b/content/unjust law is no law at all.md
@@ -3,7 +3,7 @@ title: unjust law is no law
date: 2023-11-16
tags:
- adages
- - laws
+ - law
---
unjust law is no law at all
(in Latin: *lex iniusta non est lex*)
diff --git a/quartz.config.ts b/quartz.config.ts
index 9f58b5e717690..230fb5a701265 100644
--- a/quartz.config.ts
+++ b/quartz.config.ts
@@ -17,7 +17,7 @@ const config: QuartzConfig = {
displayDateType: ["created","modified"],
theme: {
fontOrigin: "googleFonts",
- cdnCaching: true,
+ cdnCaching: false,
typography: {
header: "Schibsted Grotesk",
body: "Source Sans Pro",
@@ -37,7 +37,7 @@ const config: QuartzConfig = {
darkMode: {
light: "#0D0D0F",
lightgray: "#393639",
- gray: "#646464",
+ gray: "#c9c9c9",
darkgray: "#ffffff",
dark: "#ececec",
secondary: "#498bb7",