diff --git a/journals/2024_12_25.md b/journals/2024_12_25.md new file mode 100644 index 0000000..6c19c55 --- /dev/null +++ b/journals/2024_12_25.md @@ -0,0 +1 @@ +- [[倦怠社会]] \ No newline at end of file diff --git a/pages/倦怠社会.md b/pages/倦怠社会.md new file mode 100644 index 0000000..44b223c --- /dev/null +++ b/pages/倦怠社会.md @@ -0,0 +1,5 @@ +- [[规训社会]] + - Disziplinargesellschaft + - 由医院、疯人院、监狱、营房和工厂构成 +- [[功绩社会]] + - 由健身房、办公楼、银行、机场、购物中心和基因实验室建构的社会。 \ No newline at end of file diff --git a/pages/规训社会.md b/pages/规训社会.md new file mode 100644 index 0000000..0223efc --- /dev/null +++ b/pages/规训社会.md @@ -0,0 +1,2 @@ +- Disziplinargesellschaft +- \ No newline at end of file