commit 8c356f0d99138819f2e206569173e4c63a3cd01a
parent 177439675cdfed7b5ede6c96640cb87aa1b6d326
Author: Ville-Matias Heikkila <viznut@low.fi>
Date: Wed, 15 Jun 2022 12:20:42 +0300
Merge branch 'master' of bleu255.com:/var/www/git.bleu255.com/repos/permacomputing
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Technological_diversity.mdwn b/Technological_diversity.mdwn
@@ -1,6 +1,6 @@
# Technological diversity
-**Technological diversity** is the opposite of technological [[monoculture]]. It refers to the diversity of arteficts ([[software]] and [[hardware]]) as well as that of ideas, philosophies, paradigms, techniques, languages, mental models, etc.
+**Technological diversity** is the opposite of technological [[monoculture]]. It refers to the diversity of artifacts ([[software]] and [[hardware]]) as well as that of ideas, philosophies, paradigms, techniques, languages, mental models, etc.
Diversity comes from the mutually strengthening co-existence of different kinds of things, including ones that are generally considered "obsolete", "useless" or "fringe".
diff --git a/permacomputing.mdwn b/permacomputing.mdwn
@@ -23,3 +23,4 @@ Ideas and movements that have some similarities but are not as closely related:
* [[Heirloom computing]]
* [[Permatech]]
* [[Convivial computing]]
+* [[Green software engineering]]
