summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-06-15 04:30:59 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-06-15 04:30:59 -0300
commit7cf947ce5195970e828cd0ef0ab27fd8ce045fc1 (patch)
tree0659f5f96d02a1ce991728411673fc7eb1260cf8
parent4dda2966f88c90737cfc6ee2bb3ea4def0560d4a (diff)
add adhocratic as form of organizationproposals/lukeshu+consensus
-rw-r--r--Parabola_Social_Contract.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md
index 7c94a50..63e2050 100644
--- a/Parabola_Social_Contract.md
+++ b/Parabola_Social_Contract.md
@@ -27,8 +27,9 @@ the [Free Software Movement](https://www.fsf.org/about/what-is-free-software).
can and any information from our project is available for
anybody who needs it.
That includes our packages and repositories.
-4. **Parabola and its community**: Parabola's community is democratic in
- its essence through [consensus democracy](https://en.wikipedia.org/wiki/Consensus_democracy),
+4. **Parabola and its community**: Parabola's community is
+ [democratic in its essence](https://en.wikipedia.org/wiki/Consensus_democracy) and
+ [adhocratic](https://en.wikipedia.org/wiki/Adhocracy) as form of organization,
so the community is to be included whenever there is a need to
make a decision.
We encourage community participation in the development of the project.
@@ -37,8 +38,8 @@ the [Free Software Movement](https://www.fsf.org/about/what-is-free-software).
and possibly other Arch-based systems.
We will provide repositories and installation media without any
non-Free software.
- All Parabola operating systems will be backward compatible with the
- system they are based on,
+ All Parabola operating systems will be backward compatible with
+ the system they are based on,
as to help liberate already working installations.
We will respect the design philosophies of the systems ours are based on,
to reduce friction from both developer and user viewpoints.