[fix] markdown on draft resolution 046

Fixed slight formatting issues, which caused the resolution
to render incorrectly.

docs/abra/install.md

@@ -26,6 +26,32 @@ wget -q -O - https://install.abra.coopcloud.tech | bash
 curl https://install.abra.coopcloud.tech | bash
 ```
 
+### NixOS
+
+The install example is based on the [using nix flakes wiki page](https://nixos.wiki/wiki/flakes#Using_nix_flakes_with_NixOS).
+
+1. Add the flake to your inputs
+```nix
+inputs = {
+  abra = {
+    url = "git+https://git.coopcloud.tech/toolshed/abra.git";
+  };
+};
+```
+2. Add abra package to system packages, replace _x86_64-linux_ with the value according to your system 
+```nix
+{
+  pkgs,
+  abra,
+  ...
+}:
+{
+  environment.systemPackages = with pkgs; [
+    abra.packages.x86_64-linux.default
+  ];
+}
+```
+
 ## Release candidate
 
 ### Wget

docs/federation/funding-applications/user-operated-internet.md

@@ -44,7 +44,7 @@ Beyond our grant funding, and support in terms of time and technical resources f
 
 ### 4. Compare your own project with existing or historical efforts. (eg what is new, more thorough, or otherwise different)
 
-We maintain an ongoing analysis of Co-op Cloud compared to other options in the [Co-op Cloud documentation](https://docs.coopcloud.tech/faq/#what-about-alternative).
+We maintain an ongoing analysis of Co-op Cloud compared to other options in the [Co-op Cloud documentation](https://docs.coopcloud.tech/intro/faq/#what-about-alternative).
 
 Overall, Co-op Cloud has architectural and organisational advantages over existing libre options like Yunohost and [Caprover](https://caprover.com), and our open governance and libre licencing make Co-op Cloud a better long-term, pro-social choice than proprietary platforms like [Cloudron](https://cloudron.io). Versus options like [Ansible](https://ansible.com) or [Kubernetes](https://kubernetes.io), Co-op Cloud aims to be usable by less-technical users, to reduce their reliance on third parties to manage their data and tools.
 

docs/federation/membership.md

@@ -6,21 +6,25 @@ title: Membership
 
 | Name      | Dues Paid | Notes    | Contact |
 | --------- | --------- | -------- |-------- |
-| Agaric    | - | - | `@wolcen:matrix.org` |
-| [Autonomic](https://autonomic.zone) | - | - | `@3wc`, `@cas`, `@knoflook`, `@travvy`, `@aadil` |
+| [Agaric](https://agaric.coop/) | ⭕ | - | `@wolcen:matrix.org` |
+| [Autonomic](https://autonomic.zone) | ⭕ | - | `@3wc`, `@cas`, `@knoflook`, `@travvy`, `@aadil` |
 | [Bonfire](https://bonfirenetworks.org) | ✅ | - | `@mayel:matrix.org` + Ivan (`@cambriale:matrix.org`) |
-| [Doop.coop](https://doop.coop) | - | - | `@yusf:gottsnack.net` |
-| [EOTL](https://eotl.supply) | - | - | `@basebuilder:pub.solar` |
-| [Karrot](https://karrot.world) | - | - | `@nicksellen:matrix.org` |
-| [Klasse & Methode](https://klasse-methode.it) | - | - | `@p4u1_f4u1:matrix.org` |
-| [Local IT](https://local-it.org/)  | - | - | `@moritz:matrix.local-it.org` + `@simon_sth:matrix.org`|
-| Mirsal ™  | - | - | `@mirsal:1312.media` |
-| [UTAW](https://utaw.tech) | -  | - | `@javielico:matrix.org` |
-| `@decentral1se` | Waiver | - | `@decentral1se` |
-| [ruangrupa](https://ruangrupa.id) | - | - | Henry `@babystepper:matrix.org` |
-| [RTM](https://resisttechmonopolies.online) | ✅ | - | `@ammaratef45:matrix.org` + `@linnealovespie:matrix.org`|
+| [Bunk Computer Cooperative](https://bunk.computer) | ✅ | - | `@maren@bunk.computer` + `@sorrel@bunk.computer` |
+| [CoQuest - IT Coop Stuttgart](https://coquest.coop/en) | ✅ | voting rights waived | `hallo@coquest.coop` |
+| [Democratic Tech Fund](https://democratictech.fund/) | ✅ | - | `@wtebbens` + `@mikemh` |
+| [Doop.coop](https://doop.coop) | ⭕ | - | `@yusf:gottsnack.net` |
+| [eCommons](https://ecommons.nl) | ✅ | - | `@dannygroenewegen:matrix.org` |
+| [EOTL](https://eotl.supply) | ✅ | - | `@basebuilder:pub.solar` |
+| [Karrot](https://karrot.world) | ⭕ | - | `@nicksellen:matrix.org` |
+| [Klasse & Methode](https://klasse-methode.it) | Waiver | - | `@p4u1_f4u1:matrix.org` |
+| [Local IT](https://local-it.org/)  | ✅ | - | `@moritz:matrix.local-it.org` + `@simon_sth:matrix.org`|
+| [Merri-bek tech](https://www.merri-bek.tech/) | ✅ | - | `coop-cloud-delegate@merri-bek.tech`|
 | [MIR](https://mirnet.org/) | ✅ | - | `@sixsmith:matrix.org` |
-| [Red Abya Yala](https://abyayala.sutty.nl/) | - | - | `@fauno:sutty.nl` |
-| [Merri-bek tech](https://www.merri-bek.tech/) | - | - | `coop-cloud-delegate@merri-bek.tech`|
-| Amras | - | - | `coop-cloud@joinmeonmy.quest` |
-| [CoQuest](https://coquest.coop/en) | - | voting rights waived | `hallo@coquest.coop` |
+| [Red Abya Yala](https://abyayala.sutty.nl/) | ⭕ | - | `@fauno:sutty.nl` |
+| [RTM](https://resisttechmonopolies.online) | ✅ | - | `@ammaratef45:matrix.org` + `@linnealovespie:matrix.org`|
+| [ruangrupa](https://ruangrupa.id) | ⭕ | - | Henry `@babystepper:matrix.org` |
+| [UTAW](https://utaw.tech) | ⭕  | - | `@javielico:matrix.org` |
+| Amras | Waiver | - | `coop-cloud@joinmeonmy.quest` |
+| `@decentral1se` | Waiver | - | `@decentral1se` |
+| Mirsal ™  | ✅ | - | `@mirsal:1312.media` |
+

docs/federation/resolutions/draft/046.md

@@ -0,0 +1,32 @@
+---
+title: "Resolution 046: Restore servers.coop as a Coop Cloud project"
+---
+
+- Topic: Restore servers.coop as a Coop Cloud project
+- Date: TBD
+- Deadline: 2 weeks after voting starts
+- Size: medium
+
+### History
+
+[servers.coop](https://servers.coop) was launched as a project of Coop Cloud, intended to cooperatise lower down the stack than the abra toolshed. Similarly to how abra gives small cooperatives the tools to easily and collaboratively deploy services on a cloud, servers.coop is meant to support small cooperatives in deploying VPSs on hardware owned or managed by them.
+
+The project was left on the backburner for some years. Recently, we were motivated by rising data center costs and concerns about digital sovereignty to start working on the project again. A working group of four-ish people from the Coop Cloud community is currently working on defining and deploying an MVP.
+
+Servers.coop goals are closely aligned with those of Coop Cloud as a whole, but its usecases and userbase may end up diverging from those of abra. In the long term, servers.coop ought to become an independent collective, with its own governance, membership, budget, and infrastructure - similarly to how Coop Cloud grew from an Autonomic project into a distinct federation. In the short term, servers.coop needs the support of the Coop Cloud federation.
+
+### Proposal
+
+Formally, we treat servers.coop as a project of the Coop cloud federation.
+
+This grants the servers.coop project access to Coop Cloud's resources. For instance:
+
+- Coop Cloud server infrastructure can be used to organize and manage the project, including:
+   - conferencing or notetaking services provided by members for Coop Cloud use
+   - git.coopcloud.tech
+   - docs.coopcloud.tech
+- Grants written on behalf of Coop Cloud can include servers.coop in their goals and budget.
+- Coop Cloud federation members can propose and vote on resolutions regarding servers.coop governance, infrastructure, and budget.
+- Coop Cloud budget can be allocated to servers.coop goals, through resolutions.
+
+This support is intended to be temporary. Over the course of several years, the group working on/with servers.coop ought to move its resources onto dedicated instances and establish its own structure of governance and financing. When this happens, a new resolution should be passed to formally establish the new collective and change how Coop Cloud participates in the project.

docs/intro/kite-flying.md

@@ -8,4 +8,4 @@ Participation in kite-flying can be compensated at €20/hour; see Co-op Cloud F
 
 We take notes and doodle on [this collaboratively editable pad](https://pad.autonomic.zone/VtyrLUl9RWaJGgEDrncQUw?view). If you don't have time to attend, feel free to drop your questions and some contact details also, so we can get in touch. 
 
-To work around Hedgedoc length limits, [we keep past content from the kite-flying pad here](./kite-flying-pad-archive).
+To work around Hedgedoc length limits, [we keep past content from the kite-flying pad here](/federation/kite-flying-pad-archive).

docs/intro/managed.md

@@ -15,3 +15,5 @@ title: Managed hosting
 - [Autonomic Co-op](https://autonomic.zone) (contact: [`helo@autonomic.zone`](mailto:boop@autonomic.zone))
 - [soulhub-IT](https://soulhub-it.de) (managed hosting, see [price calculator](https://soulhub-it.de/produkte/))
 - [Local-IT](https://local-it.org/) ([selfhosting](https://wiki.local-it.org/s/kollicloud-wiki/doc/selfhosting-guide-1xZJt8UIha) & cooperative hosting, contact: [`info@local-it.org`](mailto:info@local-it.org))
+- [eCommons](https://ecommons.nl) (contact: [`info@ecommons.nl`](mailto:info@ecommons.nl))
+- [CoQuest - IT Coop Stuttgart](https://coquest.coop) (managed hosting, contact: [`hello@coquest.coop`](mailto:hello@coquest.coop))

mkdocs.yml

@@ -193,6 +193,7 @@ plugins:
   - redirects:
       redirect_maps:
         "get-involved/support/index.md": intro/support.md
+        "faq.md": intro/faq.md
 
 repo_name: toolshed/docs.coopcloud.tech
 repo_url: https://git.coopcloud.tech/toolshed/docs.coopcloud.tech/