summaryrefslogtreecommitdiff
path: root/Parabola_Social_Contract.md
diff options
context:
space:
mode:
authorLukeshu <Lukeshu@wiki.parabola.nu/>2013-11-09 15:17:25 +0000
committerLukeshu <Lukeshu@wiki.parabola.nu/>2013-11-09 15:17:25 +0000
commitbb87496afd444eff1daadedfcbcfbb6a498130b6 (patch)
tree83f7f49f3d3a32ce8b055c85bb3a55d09490c63b /Parabola_Social_Contract.md
parentddcafbdbfe97f61ba57b739f5b3b630e9922f96c (diff)
Add proposed changes from back in July
Diffstat (limited to 'Parabola_Social_Contract.md')
-rw-r--r--Parabola_Social_Contract.md21
1 files changed, 11 insertions, 10 deletions
diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md
index e5456f1..84afcd8 100644
--- a/Parabola_Social_Contract.md
+++ b/Parabola_Social_Contract.md
@@ -3,7 +3,7 @@ libre software community in general and its users in particular. It is
because of this that our social contract will always follow the
philosophy of free knowledge. All the amendments to this social contract
must be faithful to the spirit of the [Free Software
-movement](http://en.wikipedia.org/wiki/Free_software_movement)
+movement](http://en.wikipedia.org/wiki/Free_software_movement).
1. **Parabola is libre software**: Products of the Parabola project
will follow the [GNU Free System Distribution
@@ -18,17 +18,18 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement)
against non-free software. Parabola will strive to support other
Free Software projects as best it can and any information from our
project will be available for anybody who needs it. That includes
- our packages, repositories, documentation and other efforts.
+ our packages and repositories.
3. **Parabola and its community**: Our community is democratic in its
essence, so the community is included whenever there is a need to
make a decision. We encourage community participation in the
development of the project.
-4. **Parabola and Arch Linux**: We will produce an operating system
- that is a Free version of [Arch Linux](http://www.archlinux.org/),
- 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, as to help Free 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.
+4. **Parabola and Arch Linux**: Parabola will produce an operating
+ system that is a Free version of [Arch
+ Linux](http://www.archlinux.org/), 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, as to
+ help Free 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.