Re: GR: Alternative editorial changes to the SC
* Steve Langasek (firstname.lastname@example.org) [040326 21:10]:
> On Fri, Mar 26, 2004 at 08:15:09AM +0100, Andreas Barth wrote:
> > I herby propose the following editorial changes to the SC, as
> > alternative to Andrews proposal:
> Since ballot alternatives start out life as amendments to the current
> proposal, I think it would be helpful if you could provide this as a
> diff (unified diff would be nice, but verbal diff is ok ;) against
> Andrew's proposal, rather than referencing the original SC.
I considered that this list
> > 1.: More or less the current SC, with the second sentence replaced
> > with the first sentence of Andrews proposal and added the word "below"
> > to it.
> > 2.: More or less the current SC; only replaced the word "write" with
> > "create".
> > 3.: keep the word "immediately" instead of "promptly" (as this is, at
> > least in my opinion, easier to understand for non-native speakers).
> > 4.: Same as Andrews proposal
> > 5.: Same as Andrews proposal, except that in the last sentence the
> > words "for non-free packages" have been moved to the end to prevent
> > the mis-interpretation that the BTS is not free.
were a verbose enough diff. (Ok, perhaps you should read the first as
"undo all changes except ...").
But here you are (with case-independent comparison):
@@ -1,26 +1,25 @@
-1. Debian will remain 100% free
+1. Debian Will Remain 100% Free Software
-We provide the guidelines that we use to determine if a work is "free"
-in the document entitled "The Debian Free Software Guidelines". We
-promise that the Debian system and all its components will be free
-according to these guidelines. We will support people who create or
-use both free and non-free works on Debian. We will never make the
-system require the use of a non-free component.
+We promise to keep the Debian system and all its components entirely
+free software. We provide the guidelines that we use to determine if
+a work is "free" in the document entitled "The Debian Free Software
+Guidelines" below. We will support our users who develop and run
+non-free software on Debian, but we will never make the system depend
+on an item of non-free software.
2. We will give back to the free software community
new components of the Debian system, we will license them
-in a manner consistent with the Debian Free Software Guidelines.
+as free software.
We will make the best system we can, so that free works will be widely
distributed and used.
We will communicate
-things such as bug fixes, improvements and user requests
+bug fixes, improvements, user requests etc.
to the "upstream" authors of works included in our system.
3. We will not hide problems
We will keep our entire bug report database open for public view at
all times. Reports that people file online will
become visible to others.
4. Our priorities are our users and free software
@@ -45,5 +44,5 @@
manufacturers to read the licenses of the packages in these areas and
determine if they can distribute the packages on their CDs. Thus,
although non-free works are not a part of Debian, we support their use
and provide infrastructure
-for non-free packages (such as our bug tracking system and mailing lists).
+(such as our bug tracking system and mailing lists) for non-free packages.
PGP 1024/89FB5CE5 DC F1 85 6D A6 45 9C 0F 3B BE F1 D0 C5 D1 D9 0C