diff options
| author | Manoj Srivastava <srivasta> | 2004-12-01 20:31:16 +0000 |
|---|---|---|
| committer | Manoj Srivastava <srivasta> | 2004-12-01 20:31:16 +0000 |
| commit | fc261b33e28d786c5a7e789a4031342083892660 (patch) | |
| tree | 6e93d2ed3f2fb0593a5072ec13b92cba9ce78cda /english/social_contract.wml | |
| parent | bec1b90cba9c42062a022d8da6d7e758984d90a6 (diff) | |
make the two versions v.10 of the social contract the same.
CVS version numbers
english/social_contract.wml: 1.15 -> 1.16
Diffstat (limited to 'english/social_contract.wml')
| -rw-r--r-- | english/social_contract.wml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/english/social_contract.wml b/english/social_contract.wml index 26ab13978f3..c71b2ee79b3 100644 --- a/english/social_contract.wml +++ b/english/social_contract.wml @@ -1,9 +1,16 @@ -#use wml::debian::template title="Debian Social Contract" BARETITLE=true +#use wml::debian::template title="Debian Social Contract, Version 1.0" BARETITLE=true # Original document: contract.html # Author : Manoj Srivastava ( srivasta@tiamat.datasync.com ) # Created On : Wed Jul 2 12:47:56 1997 +<P> + Version 1.0 ratified on July 5, 1997. + <!-- Superseded by + <a href="social_contract">Version 1.1</a>, ratified on April 26, 2004. + --> +</P> + <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 @@ -118,8 +125,8 @@ the free software community as the basis of the software.</P> <LI><P><strong>Example Licenses</strong> <P>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>", - "<strong>BSD</strong>", and - "<strong><a href="http://www.opensource.org/licenses/artistic-license.php">Artistic</a></strong>" + "<strong><a href="misc/bsd.license">BSD</a></strong>", and + "<strong><a href="http://www.perl.com/pub/a/language/misc/Artistic.html">Artistic</a></strong>" licenses are examples of licenses that we consider "<em>free</em>". </OL> |