From 66049a2d4a4851b36021bf603b7d934a153c4ee2 Mon Sep 17 00:00:00 2001 From: sdiehl Date: Thu, 24 Feb 2022 14:10:04 +0000 Subject: [PATCH] Group ideologies --- concepts/central-banks.md | 2 +- concepts/crypto-exchange.md | 1 + concepts/currency.md | 2 +- concepts/defi.md | 3 ++- concepts/gold-standard.md | 2 +- concepts/nft.md | 2 ++ concepts/web3.md | 6 ++++++ {concepts => ideologies}/austrian-economics.md | 0 ideologies/keynsian-economics.md | 2 ++ ideologies/libertarianism.md | 2 ++ ideologies/market-fundamentalism.md | 1 + ideologies/technosolutionism.md | 2 ++ 12 files changed, 21 insertions(+), 4 deletions(-) rename {concepts => ideologies}/austrian-economics.md (100%) create mode 100644 ideologies/keynsian-economics.md create mode 100644 ideologies/libertarianism.md create mode 100644 ideologies/market-fundamentalism.md create mode 100644 ideologies/technosolutionism.md diff --git a/concepts/central-banks.md b/concepts/central-banks.md index 88f87e0..4a92390 100644 --- a/concepts/central-banks.md +++ b/concepts/central-banks.md @@ -1,4 +1,4 @@ # Central Banks -A financial institution that manages the currency and monetary supply of a nation state. +A financial institution that manages the [[currency]] and monetary supply of a nation state. diff --git a/concepts/crypto-exchange.md b/concepts/crypto-exchange.md index ae37282..99ac7a8 100644 --- a/concepts/crypto-exchange.md +++ b/concepts/crypto-exchange.md @@ -1 +1,2 @@ # Crypto Exchanges +A corporate entity that acts as an interemdiary between people to exchange currency for crypto assets. See [[market-manipulation]]. \ No newline at end of file diff --git a/concepts/currency.md b/concepts/currency.md index e7139be..d338021 100644 --- a/concepts/currency.md +++ b/concepts/currency.md @@ -1,6 +1,6 @@ # Currency -Money is any item or verifiable record that is accepted as payment for goods and services and repayment of debts and payment of national obligations, such as taxes, in a particular jurisdiction. +Money is any item or verifiable record that is accepted as payment for goods and services and repayment of debts and payment of national obligations, such as taxes, in a particular jurisdiction. Issued by a [[central-banks]]. ## Properties diff --git a/concepts/defi.md b/concepts/defi.md index 632bb7b..f2f8c9d 100644 --- a/concepts/defi.md +++ b/concepts/defi.md @@ -1 +1,2 @@ -# Decentralized Finance (DeFi) \ No newline at end of file +# Decentralized Finance (DeFi) + diff --git a/concepts/gold-standard.md b/concepts/gold-standard.md index 9578516..4ce6300 100644 --- a/concepts/gold-standard.md +++ b/concepts/gold-standard.md @@ -1,6 +1,6 @@ # Gold Standard -A monetary standard based on precious metals, espoused as [[sound-money]] in [[austrian-economics]]. +A monetary standard for a [[currency]] based on precious metals, espoused as [[sound-money]] in [[austrian-economics]]. ## Criticisms diff --git a/concepts/nft.md b/concepts/nft.md index 8abb402..81f7000 100644 --- a/concepts/nft.md +++ b/concepts/nft.md @@ -1 +1,3 @@ # Non Fungible Token + +A type of [[smart-contracts]] that associates a tradable [[cryptoasset]] with a unique piece of data, often a url to hosted image representing some abstract or percieved notion of ownership in art. \ No newline at end of file diff --git a/concepts/web3.md b/concepts/web3.md index 974d918..972b5db 100644 --- a/concepts/web3.md +++ b/concepts/web3.md @@ -1 +1,7 @@ # Web3 +An umbrella marketing term for a variety of endeveaours to integrate [[cryptoasset]], [[nft]], [[dao]], [[defi]] and [[smart-contracts]] into existing internet infrastructure. + +## Citations + +* [@diehl_web3_nodate] +* [@noauthor_my_nodate] \ No newline at end of file diff --git a/concepts/austrian-economics.md b/ideologies/austrian-economics.md similarity index 100% rename from concepts/austrian-economics.md rename to ideologies/austrian-economics.md diff --git a/ideologies/keynsian-economics.md b/ideologies/keynsian-economics.md new file mode 100644 index 0000000..226b35d --- /dev/null +++ b/ideologies/keynsian-economics.md @@ -0,0 +1,2 @@ +## Keynsian Economics + diff --git a/ideologies/libertarianism.md b/ideologies/libertarianism.md new file mode 100644 index 0000000..a1211fe --- /dev/null +++ b/ideologies/libertarianism.md @@ -0,0 +1,2 @@ +## Libertarianism + diff --git a/ideologies/market-fundamentalism.md b/ideologies/market-fundamentalism.md new file mode 100644 index 0000000..eee7c74 --- /dev/null +++ b/ideologies/market-fundamentalism.md @@ -0,0 +1 @@ +# Market Fundamentalism diff --git a/ideologies/technosolutionism.md b/ideologies/technosolutionism.md new file mode 100644 index 0000000..98670d8 --- /dev/null +++ b/ideologies/technosolutionism.md @@ -0,0 +1,2 @@ +## Technosolutionism +