[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Translations for the debian web site maintained by Antoine Martin



Hello, 
This is a automatically generated mail sent to you
because you are the official translator of some pages
in french of the Debian web site.

I send you the diff between the version you translated and
the current version to allow you to update your work.

For more informations, contact your team coordinator, or
the Debian web-masters (debian-www@lists.debian.org).

Thanks, and sorry for the annoyance.

+++++++++++++++++++++++++++++ CHANGES IN english/social_contract.wml
Index: english/social_contract.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/social_contract.wml,v
retrieving revision 1.1
retrieving revision 1.9
diff -u -u -r1.1 -r1.9
--- english/social_contract.wml	1998/07/01 04:32:18	1.1
+++ english/social_contract.wml	2000/10/29 01:09:35	1.9
@@ -1,27 +1,16 @@
-#!wml -o ../../debian.org/%BASE.html.en
-#use wml::debian::template title="Debian GNU/Linux — A Social Contract"
+#use wml::debian::template title="A Social Contract"
 
-  <!--                             -*- Mode: Sgml -*- 
-  contract.html  
-  Author           : Manoj Srivastava ( srivasta@tiamat.datasync.com ) 
-  Created On       : Wed Jul  2 12:47:56 1997
-  Created On Node  : tiamat.datasync.com
-  Last Modified By : Manoj Srivastava
-  Last Modified On : Wed Jul  2 13:35:07 1997
-  Last Machine Used: tiamat.datasync.com
-  Update Count     : 21
-  Status           : Unknown, Use with caution!
-  HISTORY          : 
-  Description      : 
-  $Id: social_contract.wml,v 1.1 1998/07/01 04:32:18 treacy Exp $
-  -->
+#  Original document: contract.html
+#  Author           : Manoj Srivastava ( srivasta@tiamat.datasync.com )
+#  Created On       : Wed Jul  2 12:47:56 1997
+
+<P>Debian, the producers of the Debian GNU/Linux system, have created the
+<strong>Debian Social Contract</strong>. The <a href="#guidelines">Debian Free Software
+Guidelines (DFSG)</a> part of the contract, initially designed
+as a set of commitments that we agree to abide by, has been adopted by
+the free software community as the basis of the
+<a href="http://www.opensource.org/osd.html";>Open Source Definition</a>.
 
-<H1>Debian Social Contract</H1>
-
-<P>We are Software In The Public Interest, producers of the Debian GNU/Linux
-system. This is the &ldquo;<strong>social contract</strong>&rdquo; we offer
-to the free software community.
-
 <HR>
 <H2>"Social Contract" with the Free Software Community</H2>
 <OL>
@@ -60,7 +49,7 @@
      <P>We acknowledge that some of our users require the use of
      programs that don't conform to the 
      <a href="#guidelines">Debian Free Software Guidelines</a>.
-          We have created "<tt>contrib</tt>" and "<tt>non-free</tt>"
+     We have created "<tt>contrib</tt>" and "<tt>non-free</tt>"
      areas in our FTP archive for this software. The software in
      these directories is not part of the Debian system, although
      it has been configured for use with Debian.  We encourage CD
@@ -70,10 +59,10 @@
      isn't a part of Debian, we support its use, and we provide
      infrastructure (such as our bug-tracking system and mailing
      lists) for non-free software packages.
-   </OL>
-    <HR>
-    <H2><a name="guidelines">The Debian Free Software Guidelines</a></H2>
-    <OL>
+</OL>
+<HR>
+<H2><a name="guidelines">The Debian Free Software Guidelines (DFSG)</a></H2>
+<OL>
    <LI><P><strong>Free Redistribution</strong>
      <P>The license of a Debian component may not restrict any
      party from selling or giving away the software as a
@@ -97,9 +86,9 @@
      software built from modified source code. The license may
      require derived works to carry a different name or version
      number from the original software.  (<em>This is a
-       compromise. The Debian group encourages all authors to not
-       restrict any files, source or binary, from being
-       modified.</em>)</P>
+     compromise. The Debian group encourages all authors not to
+     restrict any files, source or binary, from being
+     modified.</em>)</P>
    <LI><P><strong>No Discrimination Against Persons or Groups</strong>
      <P>The license must not discriminate against any person or
      group of persons.</P>
@@ -132,16 +121,14 @@
      "<strong><a href="misc/bsd.license">BSD</a></strong>", and
      "<strong><a href="http://language.perl.com/misc/Artistic.html";>Artistic</a></strong>"
      licenses are examples of licenses that we consider "<em>free</em>".
-   </OL>
-
-   <P><EM>Bruce Perens wrote the first draft of this document
-   and refined it using the comments of the Debian developers
-   during a month-long e-mail conference in June 1997.  He
-   later removed the Debian-specific references from the
-   Debian Free Software Guidelines to create &ldquo;The Open
-   Source Definition&rdquo;.</EM>
+</OL>
 
-    <HR>
-    <P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
+<P><EM>Bruce Perens wrote the first draft of this document
+and refined it using the comments of the Debian developers
+during a month-long e-mail conference in June 1997.  He
+later removed the Debian-specific references from the
+Debian Free Software Guidelines to create &ldquo;The Open
+Source Definition&rdquo;.</EM>
 
-<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
+<P><EM>Other organizations may derive from and build on this document.
+Please give credit to the Debian project if you do.</EM>
+++++++++++++++++++++++++++++ END OF english/social_contract.wml




Reply to: