permacomputing

commit 2e24a725b57addf09f3c5cfd8c2b4f76ab21dc01
parent 815bc715121041fde16b23dc7bf978591ac195f5
Author: ugrnm <ultrageranium@bleu255.com>
Date:   Fri, 15 Dec 2023 12:47:32 +0100

Merge branch 'master' of borok:/var/www/git.bleu255.com/repos/permacomputing

Diffstat:
M
Communities.mdwn
 | 
33
+++++++++++++++++++++++----------
M
about.mdwn
 | 
12
++++++------

2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/Communities.mdwn b/Communities.mdwn
@@ -1,32 +1,45 @@
 Communities
 ===========
 
-This is a list of communities that may share some goals, practices or ideas with permacomputing. For ideas and ideologies that don't have communities around themselves, see [[concepts]].
+It's difficult to speak of [[Permacomputing]] as one single community. We want to welcome and include as many people as possible in the discussion.
 
-Practice
---------
+Discussion
+----------
+
+At the moment several groups use the following means to exchange and stay in touch with each other to discuss permacomputing and related topics:
+
+* **IRC:** #permacomputing channel on [libera.chat](https://libera.chat);
+* **XMPP:** [lowtech/permacomputing](xmpp:lowtech@chat.disroot.org?join) MUC;
+* **Email discussion list:** [permacomputing /at/ we \dot\ lurk /dot/ org](https://we.lurk.org/mailman3/lists/permacomputing.we.lurk.org/);
+* **#permacomputing**: obvious hashtag that we use on socials (mainstream and alt);
+
+Note: the IRC channel, XMPP chatroom, and the list are moderated and you must agree to our [[terms]].
+
+List of communities
+-------------------
+
+The following includes communities that may share some goals, practices or ideas with permacomputing. For ideas and ideologies that don't have communities around themselves, see [[concepts]].
+
+**Practical**:
 
   * [[Appropriate technology]]
   * [[Collapse computing]]
   * [[FLOSS]]
-  * [[Gemini]]
   * [[Smallnet]]
+  * See also: [[projects]]
 
-Academic
---------
+**Academic**:
 
   * [[Computing within Limits]]
   * [[Sustainable ICT]]
 
-Activism, Policy Making and Legislation
-----------------------------------------
+**Activism, Policy Making and Legislation**:
 
   * [[offline first]]
   * [[right to repair]]
   * [[Green software engineering]]
 
-Artistic
---------
+**Artistic**:
 
   * [[Small File Media Festival]]
   * [[Algorave]]
diff --git a/about.mdwn b/about.mdwn
@@ -1,13 +1,13 @@
-About
-=====
-
 This website is a [[wiki]] dedicated to [[permacomputing]].
 
+Contact us!
+-----------
+
+The Permacomputing wiki is facilitated by [[ugrnm]] and [[viznut]]. Its content is written by (in order of registration): [[neau]], [[thgie]], [[akkartik]], [[aw]], [[orx]], [[dusan]], [[katía]], [[luen]], [[suj]], [[cmos4040]], [[giz]], [[pixouls]], [[wakame]], [[decentral1se]], [[clwil]]
 
-Contributing
-------------
+You can reach all of us at once by sending an email to:
 
-If you want to contribute to the permacomputing wiki, read the page about [[editing]].
+ **permacomputing / a t / bleu255 \ dot \ c o m**
 
 
 HTTP vs HTTPS