From ef713efa2184ed9960e2a1c0b7d95709a638f9b2 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Wed, 17 Mar 2021 22:42:36 +0100 Subject: [PATCH] Auto: misc. --- gregory-bateson.md | 4 ++++ pleroma.md | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gregory-bateson.md b/gregory-bateson.md index 4b61650e6..968378d07 100644 --- a/gregory-bateson.md +++ b/gregory-bateson.md @@ -8,6 +8,8 @@ - worked with [[margaret mead]] - with others developed the [[double-bind theory of schizophrenia]]. - [[bateson]] defined [[information]] as [[a difference which makes a difference]]. + - [[pleroma]] +- [[armengol]] told me about him. @@ -16,4 +18,6 @@ [go]: go "Go" [wp]: wp "Wp" [information]: information "Information" +[pleroma]: pleroma "Pleroma" +[armengol]: armengol "Armengol" [//end]: # "Autogenerated link references" \ No newline at end of file diff --git a/pleroma.md b/pleroma.md index 8b9595f00..bfc524d10 100644 --- a/pleroma.md +++ b/pleroma.md @@ -1,15 +1,20 @@ # Pleroma -- [[go]] https://pleroma.social - - Uses [[activitypub]] like [[mastodon]]. - - Considered [[lightweight]] in comparison to [[mastodon]]. -- [[github]] https://github.com/Hostdon/pleroma -- [[git]] https://git.pleroma.social/pleroma/pleroma -- Written in [[elixir]]. +- A [[social platform]] + - [[go]] https://pleroma.social + - Uses [[activitypub]] like [[mastodon]]. + - Considered [[lightweight]] in comparison to [[mastodon]]. + - [[github]] https://github.com/Hostdon/pleroma + - [[git]] https://git.pleroma.social/pleroma/pleroma + - Written in [[elixir]]. +- A [[concept]] + - [[wp]] https://en.wikipedia.org/wiki/Pleroma + - "the totality of divine powers" in [[gnosticism]] [//begin]: # "Autogenerated link references for markdown compatibility" [go]: go "Go" [activitypub]: activitypub "ActivityPub" [mastodon]: mastodon "Mastodon" +[wp]: wp "Wp" [//end]: # "Autogenerated link references" \ No newline at end of file