From 0eea97b394ea09e51b092c71ef6beb0cf58a35b8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jul 2013 20:22:55 +0000 Subject: Rename to just "Parabola Social Contract" --- Parabola_GNU%2FLinux-libre_Social_Contract.md | 33 --------------------------- Parabola_Social_Contract.md | 33 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 Parabola_GNU%2FLinux-libre_Social_Contract.md create mode 100644 Parabola_Social_Contract.md diff --git a/Parabola_GNU%2FLinux-libre_Social_Contract.md b/Parabola_GNU%2FLinux-libre_Social_Contract.md deleted file mode 100644 index 095abe5..0000000 --- a/Parabola_GNU%2FLinux-libre_Social_Contract.md +++ /dev/null @@ -1,33 +0,0 @@ -The social contract of Parabola GNU/Linux is a commitment of the -distribution with the 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). - -1. **Parabola GNU/Linux is libre software:** it will follow the [GNU - free system distribution - guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html), - so it doesn't include or recommend proprietary software or - documentation and it does not provide any type of support for their - installation or execution. This includes: proprietary software, - binary only firmware or [binary - blobs](http://en.wikipedia.org/wiki/Binary_blob). -2. **Parabola GNU/Linux and other distributions:** Parabola's objective - is to support the free software movement so we only need to compete - against nonfree 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 and repositories. -3. **Parabola GNU/Linux and its community:** our community is - democratic in its essence, so the community is included whenever - there is a need to take a decision. We encourage community - participation in the development of the project. -4. **Parabola GNU/Linux and ArchLinux:** Parabola is the free version - of [ArchLinux](http://www.archlinux.org/). We provide repositories - and installation images without any nonfree software. We respect - Arch's KISS philosophy (Keep It Simple, Stupid) and its - developing process. In that sense, Parabola will always maintain - retro compatibility with Arch so as to help free already - working installations. - diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md new file mode 100644 index 0000000..095abe5 --- /dev/null +++ b/Parabola_Social_Contract.md @@ -0,0 +1,33 @@ +The social contract of Parabola GNU/Linux is a commitment of the +distribution with the 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). + +1. **Parabola GNU/Linux is libre software:** it will follow the [GNU + free system distribution + guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html), + so it doesn't include or recommend proprietary software or + documentation and it does not provide any type of support for their + installation or execution. This includes: proprietary software, + binary only firmware or [binary + blobs](http://en.wikipedia.org/wiki/Binary_blob). +2. **Parabola GNU/Linux and other distributions:** Parabola's objective + is to support the free software movement so we only need to compete + against nonfree 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 and repositories. +3. **Parabola GNU/Linux and its community:** our community is + democratic in its essence, so the community is included whenever + there is a need to take a decision. We encourage community + participation in the development of the project. +4. **Parabola GNU/Linux and ArchLinux:** Parabola is the free version + of [ArchLinux](http://www.archlinux.org/). We provide repositories + and installation images without any nonfree software. We respect + Arch's KISS philosophy (Keep It Simple, Stupid) and its + developing process. In that sense, Parabola will always maintain + retro compatibility with Arch so as to help free already + working installations. + -- cgit v1.2.3 From 8bf80e584232fe67db59a4fedcdbdfe945c2ec78 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jul 2013 20:22:56 +0000 Subject: [Dev] [RFC] rewording the Social Contract So last night/this morning, I threw up a "Nomenclature" page on the wiki[0]. The page is mostly meant to be descriptive, not prescriptive, but part of its purpose is to standardize. Then I looked at our Social Contract[1], and noticed that it is not consistent with our nomenclature. Following is my proposal for a new version of the Social Contract. The format is Markdown. MediaWiki's wiki-text sucks for email. I've made it about the "Parabola project", not "Parabola GNU/Linux", and done some copy-editing type bits. Notes: * I use "Free Software", not "free software", and "Free" instead of "free" when appropriate. * The exception to the above is the phrase "non-free". Other changes I think we should consider: * I think that for the purpose of this document, we should normalize between "Free" and "libre". * We should add a bit about the Free Culture movement, which we sort-of also support, to formalize our stance on that. [0] https://wiki.parabolagnulinux.org/Nomenclature [1] https://wiki.parabolagnulinux.org/Parabola/GNU_Linux_Social_Contract Happy hacking, ~ Luke Shumaker --- Parabola_Social_Contract.md | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 095abe5..4ba70ee 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,33 +1,34 @@ -The social contract of Parabola GNU/Linux is a commitment of the -distribution with the 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). +The social contract of Parabola is a commitment of the project with the +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) -1. **Parabola GNU/Linux is libre software:** it will follow the [GNU - free system distribution - guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html), +1. **Parabola is libre software**: Products of the Parabola project + will follow the [GNU Free System Distribution + Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html) so it doesn't include or recommend proprietary software or documentation and it does not provide any type of support for their installation or execution. This includes: proprietary software, binary only firmware or [binary blobs](http://en.wikipedia.org/wiki/Binary_blob). -2. **Parabola GNU/Linux and other distributions:** Parabola's objective - is to support the free software movement so we only need to compete - against nonfree software. Parabola will strive to support other free - software projects as best it can and any information from our +2. **Parabola and other distributions**: Parabola's objective is to + support the Free Software movement so we only need to compete + 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 and repositories. -3. **Parabola GNU/Linux and its community:** our community is - democratic in its essence, so the community is included whenever - there is a need to take a decision. We encourage community - participation in the development of the project. -4. **Parabola GNU/Linux and ArchLinux:** Parabola is the free version - of [ArchLinux](http://www.archlinux.org/). We provide repositories - and installation images without any nonfree software. We respect - Arch's KISS philosophy (Keep It Simple, Stupid) and its - developing process. In that sense, Parabola will always maintain - retro compatibility with Arch so as to help free already +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**: Parabola will produce an operating + system that is a Free version of [Arch + Linux](http://www.archlinux.org/). We provide repositories and + installation images without any non-free software. We respect Arch's + KISS philosophy (Keep It Simple, Stupid) and its + development process. In that sense, Parabola will always maintain + retro compatibility with Arch Linux so as to help Free already working installations. -- cgit v1.2.3 From e3baf0883ec38c4a16a6dbe3c6b01c43b683e740 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 28 Jul 2013 18:54:03 +0000 Subject: Re: [Dev] [RFC] rewording the Social Contract MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sorry it took so long for me to reply, my heuristic mail filters mis-categorized your reply, so I didn't see it. At Sun, 07 Jul 2013 17:23:34 -0300, Nicolás Reynolds wrote: > "Luke T. Shumaker" writes: > > > So last night/this morning, I threw up a "Nomenclature" page on the > > wiki[0]. The page is mostly meant to be descriptive, not > > prescriptive, but part of its purpose is to standardize. > > > > Then I looked at our Social Contract[1], and noticed that it is not > > consistent with our nomenclature. > > > > Following is my proposal for a new version of the Social Contract. > > The format is Markdown. MediaWiki's wiki-text sucks for email. > > +1 item 2 should also include documentation and other projects alongside > repositories and packages. - it. That includes our packages and repositories. + it. That includes our packages, repositories, documentation and + other efforts. > should we specify "arch and derivatives" on item 4? I'm not sure what you want it to say. --- Parabola_Social_Contract.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 4ba70ee..3ae9f77 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -18,7 +18,7 @@ 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 and repositories. + our packages, repositories, documentation and other efforts. 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 -- cgit v1.2.3 From ddcafbdbfe97f61ba57b739f5b3b630e9922f96c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 28 Jul 2013 23:06:00 +0000 Subject: Re: [Dev] [RFC] rewording the Social Contract MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At Sun, 28 Jul 2013 18:24:26 -0300, Nicolás Reynolds wrote: > "Luke T. Shumaker" writes: > > > should we specify "arch and derivatives" on item 4? > > > > I'm not sure what you want it to say. > > i mean if we produce libre repositories for arch and it's derivatives, > like making a libre version of archmobile (arm* architecture), shouldn't > the contract also expand onto the derivatives (promise to follow > development process, etc). Oh, ok. I agree with that. I think. Now I'm actually questioning how much I agree with item 4. To break it down: 4. **Parabola and Arch Linux**: a. Parabola will produce an operating system that is a Free version of [Arch Linux][3]. b. We provide repositories and installation images without any non-free software. c. We respect Arch's KISS philosophy (Keep It Simple, Stupid) d. and its development process. e. In that sense, Parabola will always maintain retro compatibility with Arch Linux so as to help Free already working installations. I'm concerned with items d and e. I'm confused what "In that sense," means in item e. I'm also confused by item d--how much do we follow their development process now? * We use libretools' libremakepkg instead of devtools' archbuild * We have almost none of the workflow integration between the repos and the PKGBUILD tracker. (though I'm working on that) * We have none of the access control, wrt which hackers can publish where. * We have none of the review process before packages end up in the main repos. And honestly, I think that all but the first of these are things we could work on. And all of this differs for the derivatives. Arch Hurd seems pretty similar to Parabola GNU/Linux in that regard, but Arch Linux ARM has a fairly different process. If we ended up with an ARM port, would we have to adopt the Plug distributed build system? Not that that would necessarily be a bad idea, but should that really be part of the social contract? I think we should ditch mentioning the development process, and instead focus on the resulting software. Perhaps: 4. We will produce an operating system that is a Free version of [Arch Linux][3], 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. Happy hacking, ~ Luke Shumaker --- Parabola_Social_Contract.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 3ae9f77..e5456f1 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -23,12 +23,12 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement) 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**: Parabola will produce an operating - system that is a Free version of [Arch - Linux](http://www.archlinux.org/). We provide repositories and - installation images without any non-free software. We respect Arch's - KISS philosophy (Keep It Simple, Stupid) and its - development process. In that sense, Parabola will always maintain - retro compatibility with Arch Linux so as to help Free already - working installations. +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. -- cgit v1.2.3 From bb87496afd444eff1daadedfcbcfbb6a498130b6 Mon Sep 17 00:00:00 2001 From: Lukeshu Date: Sat, 9 Nov 2013 15:17:25 +0000 Subject: Add proposed changes from back in July --- Parabola_Social_Contract.md | 21 +++++++++++---------- 1 file 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. -- cgit v1.2.3 From 0544b72efa33245bf9f621748d3505b8457adaeb Mon Sep 17 00:00:00 2001 From: Lukeshu Date: Sat, 9 Nov 2013 16:01:12 +0000 Subject: /* New version */ After all these months, a minor grammar fix :-/ --- Parabola_Social_Contract.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 84afcd8..e933d5a 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,4 +1,4 @@ -The social contract of Parabola is a commitment of the project with the +The social contract of Parabola is a commitment of the project to the 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 -- cgit v1.2.3 From 3cf7528464761bf025b43c1563fca01806e8a7b7 Mon Sep 17 00:00:00 2001 From: Lukeshu Date: Sat, 9 Nov 2013 16:06:35 +0000 Subject: /* New version */ Add a comma in the second point. --- Parabola_Social_Contract.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index e933d5a..4964d24 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -14,7 +14,7 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement). binary only firmware or [binary blobs](http://en.wikipedia.org/wiki/Binary_blob). 2. **Parabola and other distributions**: Parabola's objective is to - support the Free Software movement so we only need to compete + support the Free Software movement, so we only need to compete 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 -- cgit v1.2.3 From 9bf21b2fc9178f11926fa503597ee306bf792d54 Mon Sep 17 00:00:00 2001 From: Lukeshu Date: Sat, 9 Nov 2013 16:08:01 +0000 Subject: /* New version */ I changed the wording of item 4 from the email when posting it here ("Parabola; change it back. --- Parabola_Social_Contract.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 4964d24..18d761d 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -23,13 +23,12 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement). 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**: 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. +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. -- cgit v1.2.3 From d6f85040e84aeef3931bb76e3150f6376979728d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:24:59 -0400 Subject: Normalize on "libre" instead of "Free" --- Parabola_Social_Contract.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 18d761d..84ffef0 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,8 +1,8 @@ The social contract of Parabola is a commitment of the project to the 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 +philosophy of libre 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). 1. **Parabola is libre software**: Products of the Parabola project @@ -15,8 +15,8 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement). blobs](http://en.wikipedia.org/wiki/Binary_blob). 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software movement, so we only need to compete - against non-free software. Parabola will strive to support other - Free Software projects as best it can and any information from our + against non-libre software. Parabola will strive to support other + libre software projects as best it can and any information from our project will be available for anybody who needs it. That includes our packages and repositories. 3. **Parabola and its community**: Our community is democratic in its @@ -24,11 +24,11 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement). 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/), + that is a libre 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 + and installation media without any non-libre 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. + 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. -- cgit v1.2.3 From 526cb522c78f6fe03c0fd66d3b15d9dc74d969b4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:22:26 -0400 Subject: Revise external links. https://lists.parabola.nu/pipermail/dev/2016-June/004060.html --- Parabola_Social_Contract.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 84ffef0..3aa959b 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 libre 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](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project will follow the [GNU Free System Distribution @@ -11,8 +11,7 @@ movement](http://en.wikipedia.org/wiki/Free_software_movement). so it doesn't include or recommend proprietary software or documentation and it does not provide any type of support for their installation or execution. This includes: proprietary software, - binary only firmware or [binary - blobs](http://en.wikipedia.org/wiki/Binary_blob). + binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software movement, so we only need to compete against non-libre software. Parabola will strive to support other -- cgit v1.2.3 From 91545f8fbb2c62947f94dea1d6a0f2d9ed58fd49 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:23:56 -0400 Subject: Fix a grammar mistake. --- Parabola_Social_Contract.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 3aa959b..093a83d 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,8 +1,8 @@ The social contract of Parabola is a commitment of the project to the 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 libre knowledge. All the amendments to this social -contract must be faithful to the spirit of the [Free Software +philosophy of libre knowledge. All amendments to this social contract +must be faithful to the spirit of the [Free Software movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project -- cgit v1.2.3 From 8fd6875958d6903aed1e8e7a00026a293a8745c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:25:49 -0400 Subject: Capitalize the M in "Free Software Movement" --- Parabola_Social_Contract.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 093a83d..ad24e06 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 libre knowledge. All amendments to this social contract must be faithful to the spirit of the [Free Software -movement](https://www.fsf.org/about/what-is-free-software). +Movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project will follow the [GNU Free System Distribution @@ -13,7 +13,7 @@ movement](https://www.fsf.org/about/what-is-free-software). installation or execution. This includes: proprietary software, binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to - support the Free Software movement, so we only need to compete + support the Free Software Movement, so we only need to compete against non-libre software. Parabola will strive to support other libre software projects as best it can and any information from our project will be available for anybody who needs it. That includes -- cgit v1.2.3 From 914408a33189cbf9ff23bf18fe0df1f0d213d862 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:29:40 -0400 Subject: Insert a clause into the sentence about only cometing with non-free SW. I think it reads more clearly this way. The inserted bit is against non-libre software{+; other libre software projects are to be cooperated with, not competed with+}. Parabola will strive to support --- Parabola_Social_Contract.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index ad24e06..d1719f8 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -14,10 +14,11 @@ Movement](https://www.fsf.org/about/what-is-free-software). binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete - against non-libre software. Parabola will strive to support other - libre software projects as best it can and any information from our - project will be available for anybody who needs it. That includes - our packages and repositories. + against non-libre software; other libre software projects are to be + cooperated with, not competed with. Parabola will strive to support + other libre software projects as best it can and any information + from our project will be available for anybody who needs it. That + includes 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 -- cgit v1.2.3 From c17d6cd548b16139b04d4901e9e6693178042f92 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:32:30 -0400 Subject: In the body of item 4, replace ``Arch Linux'' with ``the GNU/Linux system "Arch Linux"'' --- Parabola_Social_Contract.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index d1719f8..2e149f5 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -24,11 +24,12 @@ Movement](https://www.fsf.org/about/what-is-free-software). 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 libre version of [Arch Linux](http://www.archlinux.org/), - and possibly other Arch-based systems. We will provide repositories - and installation media without any non-libre software. 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. + that is a libre version of the GNU/Linux system "[Arch + Linux](http://www.archlinux.org/)" and possibly other + Arch-based systems. We will provide repositories and installation + media without any non-libre software. 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. -- cgit v1.2.3 From c223911ca7777356e40d15f38b449395c4786df6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:44:12 -0400 Subject: Reword the opening sentence to discus Parabola in the first person. --- Parabola_Social_Contract.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 2e149f5..d0e0297 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,8 +1,8 @@ -The social contract of Parabola is a commitment of the project to the -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 libre knowledge. All amendments to this social contract -must be faithful to the spirit of the [Free Software +The Parabola Social Contract is the commitment that we, the Parabola +project, make to the libre software community in general and our users +in particular. It is because of this that our social contract will +always follow the philosophy of libre knowledge. All amendments to this +social contract must be faithful to the spirit of the [Free Software Movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project -- cgit v1.2.3 From e5596221b27468ed33c1813e6632e96b0b041447 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:48:42 -0400 Subject: Item 2: speak of parabola in the first person, not third. --- Parabola_Social_Contract.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index d0e0297..20c12e6 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -16,7 +16,7 @@ Movement](https://www.fsf.org/about/what-is-free-software). support the Free Software Movement, so we only need to compete against non-libre software; other libre software projects are to be cooperated with, not competed with. Parabola will strive to support - other libre software projects as best it can and any information + other libre software projects as best we can and any information from our project will be available for anybody who needs it. That includes our packages and repositories. 3. **Parabola and its community**: Our community is democratic in its -- cgit v1.2.3 From bf0f5fec80aedd318afd413f8679acf4ab54c869 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:51:58 -0400 Subject: Reword item 1 to use a consistent tense and plurality. It flip-flopped between future and present tense. It flip-flopped between speaking of a single product and speaking of several products. --- Parabola_Social_Contract.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 20c12e6..28ea2ac 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -6,10 +6,10 @@ social contract must be faithful to the spirit of the [Free Software Movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project - will follow the [GNU Free System Distribution - Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html) - so it doesn't include or recommend proprietary software or - documentation and it does not provide any type of support for their + follow the [GNU Free System Distribution + Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). + They don't include or recommend proprietary software or + documentation and do not provide any type of support for their installation or execution. This includes: proprietary software, binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to -- cgit v1.2.3 From 0781d2003b811b9b347a10e9b403b6620f779aec Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:56:14 -0400 Subject: Have the first words of items 3&4 be Parabola['s] instead of Our/We. --- Parabola_Social_Contract.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 28ea2ac..70f8183 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -19,12 +19,12 @@ Movement](https://www.fsf.org/about/what-is-free-software). other libre software projects as best we can and any information from our project will be available for anybody who needs it. That includes 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 +3. **Parabola and its community**: Parabola's 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 libre version of the GNU/Linux system "[Arch +4. **Parabola and Arch Linux**: Parabola will produce an operating + system that is a libre version of the GNU/Linux system "[Arch Linux](http://www.archlinux.org/)" and possibly other Arch-based systems. We will provide repositories and installation media without any non-libre software. All Parabola operating systems -- cgit v1.2.3 From 816b8654ecb5b2fcf683f35104e0c11f34a64403 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 10:58:02 -0400 Subject: Use the present tense for items 2 & 3. This brings it to using the present tense for everything but item 4. Item 4 just doesn't read right (IMO) except in the future tense. --- Parabola_Social_Contract.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 70f8183..7b1144e 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -15,14 +15,14 @@ Movement](https://www.fsf.org/about/what-is-free-software). 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete against non-libre software; other libre software projects are to be - cooperated with, not competed with. Parabola will strive to support + cooperated with, not competed with. Parabola strives to support other libre software projects as best we can and any information - from our project will be available for anybody who needs it. That + from our project is available for anybody who needs it. That includes our packages and repositories. 3. **Parabola and its community**: Parabola's 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. + in its essence, 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. 4. **Parabola and Arch Linux**: Parabola will produce an operating system that is a libre version of the GNU/Linux system "[Arch Linux](http://www.archlinux.org/)" and possibly other -- cgit v1.2.3 From b13072adff707660da1d20fc3e8ffc1d3d4342d3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 11:01:39 -0400 Subject: reword item 1 a bit; say "non-libre" instead of "proprietary" the first time. Fix an ambiguity in the word "their" in the support sentence. --- Parabola_Social_Contract.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 7b1144e..7a4074f 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -8,9 +8,9 @@ Movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project follow the [GNU Free System Distribution Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). - They don't include or recommend proprietary software or - documentation and do not provide any type of support for their - installation or execution. This includes: proprietary software, + They don't include or recommend non-libre software or documentation + and do not provide any type of support for the installation or + execution of non-libre software. This includes: proprietary software, binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete -- cgit v1.2.3 From c5a93461565fff61b4c6a280a89983b2d6dca6d4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 10 Jun 2016 11:04:24 -0400 Subject: Item 1: "don't" -> "do not". I think it reads better this way. --- Parabola_Social_Contract.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 7a4074f..ff56e52 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -8,10 +8,10 @@ Movement](https://www.fsf.org/about/what-is-free-software). 1. **Parabola is libre software**: Products of the Parabola project follow the [GNU Free System Distribution Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). - They don't include or recommend non-libre software or documentation + They do not include or recommend non-libre software or documentation and do not provide any type of support for the installation or - execution of non-libre software. This includes: proprietary software, - binary only firmware or binary blobs. + execution of non-libre software. This includes: proprietary + software, binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete against non-libre software; other libre software projects are to be -- cgit v1.2.3 From 4bff3eb91bbd883ae584401fd660855f16a1e055 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 11 Jun 2016 20:10:04 -0400 Subject: Go back to saying "Free" instead of "libre" --- Parabola_Social_Contract.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index ff56e52..ce0ec1b 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,33 +1,33 @@ The Parabola Social Contract is the commitment that we, the Parabola -project, make to the libre software community in general and our users -in particular. It is because of this that our social contract will -always follow the philosophy of libre knowledge. All amendments to this -social contract must be faithful to the spirit of the [Free Software +project, make to the Free Software community in general and our users in +particular. It is because of this that our social contract will always +follow the philosophy of Free knowledge. All amendments to this social +contract must be faithful to the spirit of the [Free Software Movement](https://www.fsf.org/about/what-is-free-software). -1. **Parabola is libre software**: Products of the Parabola project +1. **Parabola is Free Software**: Products of the Parabola project follow the [GNU Free System Distribution Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). - They do not include or recommend non-libre software or documentation + They do not include or recommend non-Free software or documentation and do not provide any type of support for the installation or - execution of non-libre software. This includes: proprietary - software, binary only firmware or binary blobs. + execution of non-Free software. This includes: proprietary software, + binary only firmware or binary blobs. 2. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete - against non-libre software; other libre software projects are to be + against non-Free software; other Free Software projects are to be cooperated with, not competed with. Parabola strives to support - other libre software projects as best we can and any information - from our project is available for anybody who needs it. That - includes our packages and repositories. + other Free Software projects as best we can and any information from + our project is available for anybody who needs it. That includes our + packages and repositories. 3. **Parabola and its community**: Parabola's community is democratic in its essence, 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. 4. **Parabola and Arch Linux**: Parabola will produce an operating - system that is a libre version of the GNU/Linux system "[Arch + system that is a Free version of the GNU/Linux system "[Arch Linux](http://www.archlinux.org/)" and possibly other Arch-based systems. We will provide repositories and installation - media without any non-libre software. All Parabola operating systems + media without any non-Free software. 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 -- cgit v1.2.3 From 89181428abb804ec94ed17b8732ff71540b01bdb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 11 Jun 2016 23:23:00 -0400 Subject: Add an item about Free Culture. Make it item 2, bumping other items up. --- Parabola_Social_Contract.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index ce0ec1b..81a5c09 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -12,18 +12,25 @@ Movement](https://www.fsf.org/about/what-is-free-software). and do not provide any type of support for the installation or execution of non-Free software. This includes: proprietary software, binary only firmware or binary blobs. -2. **Parabola and other distributions**: Parabola's objective is to +2. **Parabola is Free Culture**: All documentation and cultural works + included in products of the Parabola project are [Free + Culture](http://freedomdefined.org/Definition), with the exceptions + of: non-modifiable license texts, works under the GNU Free + Documentation License with invariant sections, and works of opinion. + All documentation and cultural works created by or for Parabola are + Free Culture, with no exceptions. +3. **Parabola and other distributions**: Parabola's objective is to support the Free Software Movement, so we only need to compete against non-Free software; other Free Software projects are to be cooperated with, not competed with. Parabola strives to support other Free Software projects as best we can and any information from our project is available for anybody who needs it. That includes our packages and repositories. -3. **Parabola and its community**: Parabola's community is democratic +4. **Parabola and its community**: Parabola's community is democratic in its essence, 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. -4. **Parabola and Arch Linux**: Parabola will produce an operating +5. **Parabola and Arch Linux**: Parabola will produce an operating system that is a Free version of the GNU/Linux system "[Arch Linux](http://www.archlinux.org/)" and possibly other Arch-based systems. We will provide repositories and installation -- cgit v1.2.3 From 1e4484a83d30ecbfa8592b336a7de27028425bcf Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 12 Jun 2016 23:17:17 -0400 Subject: Say "Arch (the GNU/Linux distribution)" per consensus --- Parabola_Social_Contract.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 81a5c09..9524193 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -30,13 +30,13 @@ Movement](https://www.fsf.org/about/what-is-free-software). in its essence, 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. -5. **Parabola and Arch Linux**: Parabola will produce an operating - system that is a Free version of the GNU/Linux system "[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 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. +5. **Parabola and Arch**: Parabola will produce an operating system + that is a Free version of [Arch (the + GNU/Linux distribution)](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 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. -- cgit v1.2.3 From 4dda2966f88c90737cfc6ee2bb3ea4def0560d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 15 Jun 2016 03:58:29 -0300 Subject: fix democracy to consensus democracy, works of opinion to works stating a viewpoint, non-modifiable license texts to invariant sections, adding cover texts and sorting text --- Parabola_Social_Contract.md | 75 +++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/Parabola_Social_Contract.md b/Parabola_Social_Contract.md index 9524193..7c94a50 100644 --- a/Parabola_Social_Contract.md +++ b/Parabola_Social_Contract.md @@ -1,42 +1,45 @@ -The Parabola Social Contract is the commitment that we, the Parabola -project, make to the Free Software community in general and our users in -particular. It is because of this that our social contract will always -follow the philosophy of Free knowledge. All amendments to this social -contract must be faithful to the spirit of the [Free Software -Movement](https://www.fsf.org/about/what-is-free-software). +The Parabola Social Contract is the commitment that we, the Parabola project, +make to the Free Software community in general and our users in particular. +It is because of this that our social contract will always follow +the philosophy of Free knowledge. +All amendments to this social contract must be faithful to the spirit of +the [Free Software Movement](https://www.fsf.org/about/what-is-free-software). -1. **Parabola is Free Software**: Products of the Parabola project - follow the [GNU Free System Distribution - Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). - They do not include or recommend non-Free software or documentation - and do not provide any type of support for the installation or - execution of non-Free software. This includes: proprietary software, - binary only firmware or binary blobs. +1. **Parabola is Free Software**: Products of the Parabola project follow + the [GNU Free System Distribution Guidelines](http://www.gnu.org/distros/free-system-distribution-guidelines.html). + They do not include or recommend non-Free software or documentation and + do not provide any type of support for the installation or + execution of non-Free software. This includes: + proprietary software, binary only firmware or binary blobs. 2. **Parabola is Free Culture**: All documentation and cultural works - included in products of the Parabola project are [Free - Culture](http://freedomdefined.org/Definition), with the exceptions - of: non-modifiable license texts, works under the GNU Free - Documentation License with invariant sections, and works of opinion. + included in products of the Parabola project are [Free Culture](http://freedomdefined.org/Definition), + with the exceptions of: + [licenses for works stating a viewpoint](http://www.gnu.org/licenses/license-list.html#OpinionLicenses), + [invariant sections](https://www.gnu.org/licenses/fdl-howto-opt#SEC1) and + [cover texts](https://www.gnu.org/licenses/fdl-howto-opt#SEC2). All documentation and cultural works created by or for Parabola are Free Culture, with no exceptions. 3. **Parabola and other distributions**: Parabola's objective is to - support the Free Software Movement, so we only need to compete - against non-Free software; other Free Software projects are to be - cooperated with, not competed with. Parabola strives to support - other Free Software projects as best we 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, 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. -5. **Parabola and Arch**: Parabola will produce an operating system - that is a Free version of [Arch (the - GNU/Linux distribution)](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 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. + support the Free Software Movement, + so we only need to compete against non-Free software; + other Free Software projects are to be cooperated with, not competed with. + Parabola strives to support other Free Software projects as best we + 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), + 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. +5. **Parabola and Arch**: Parabola will produce an operating system that + is a Free version of [Arch (the GNU/Linux distribution)](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 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. -- cgit v1.2.3 From 7cf947ce5195970e828cd0ef0ab27fd8ce045fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 15 Jun 2016 04:30:59 -0300 Subject: add adhocratic as form of organization --- Parabola_Social_Contract.md | 9 +++++---- 1 file 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. -- cgit v1.2.3