Commit dea9d1ae authored by James A. Treacy's avatar James A. Treacy

removed languages lines

CVS version numbers

english/contact.wml: 1.2 -> 1.3 
english/donations.wml: 1.5 -> 1.6 
english/index.wml: 1.13 -> 1.14 
english/license.wml: 1.4 -> 1.5 
english/social_contract.wml: 1.3 -> 1.4 
english/support.wml: 1.2 -> 1.3 
english/todo.wml: 1.4 -> 1.5 
english/template/debian/footer.wml: 1.5 -> 1.6
parent 3604099c
#!wml -o ../../debian.org/%BASE.html.en
#use wml::debian::template title="Debian GNU/Linux — Getting in Contact with Us"
#use wml::debian::template title="Debian GNU/Linux — Getting in Contact with Us" NOCOMMENTS="yes"
<H1>Getting in Contact with Us</H1>
......@@ -49,4 +48,3 @@ problem in a discreet manner, send e-mail to
<P>E-mail regarding the web site should be addressed to
<A href="mailto:webmaster@debian.org">webmaster@debian.org</A>.
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
#!wml -o ../../debian.org/%BASE.html.en
#use wml::debian::template title="Debian GNU/Linux &mdash; Donations to Software in the Public Interest"
<H1>Donations to Software in the Public Interest
......@@ -93,7 +92,3 @@ hosting mirror services</H3>
<P>Debian is grateful to these and all the groups around the world that
provide mirrors. Without them, none of this would have been possible.
<HR>
<P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
#!wml -o ../../debian.org/%BASE.html.en
#use wml::debian::mainpage title="Debian GNU/Linux &mdash; The Universal Operating System"
#use wml::debian::recent_list
......@@ -63,4 +62,3 @@ non-profit umbrella organization that manages Debian's assets, is dedicated to
making sure the hardware on your machine can be used with any operating system.
Please see the <A HREF="http://www.openhardware.org/">Open Hardware Certification Program</A>.
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
#!wml -o ../../debian.org/%BASE.html.en
#use wml::debian::template title="Debian GNU/Linux &mdash; License"
<H1>License</H1>
......@@ -30,7 +29,3 @@ providing:
and the Open Hardware Logo are trademarks of Software in the Public
Interest, Inc.
<HR>
<P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
......@@ -61,7 +61,7 @@ the free software community as the basis of the
<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
......@@ -71,10 +71,10 @@ the free software community as the basis of the
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</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
......@@ -98,9 +98,9 @@ the free software community as the basis of the
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 to not
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>
......@@ -133,19 +133,15 @@ the free software community as the basis of the
"<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>
<P><EM>Other organizations may derive from and build on this document.
Please give credit to the Debian project if you do.</EM>
<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>
<HR>
<P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
<P><EM>Other organizations may derive from and build on this document.
Please give credit to the Debian project if you do.</EM>
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
#!wml -o ../../debian.org/%BASE.html.en
#use wml::debian::template title="Debian GNU/Linux &mdash; Support"
<H1>Support</H1>
......@@ -103,7 +102,3 @@ inhabitants. You can also check out the
<A href="http://www.Infodrom.North.DE/Debian/user.html">list of frequent
users</A>.
<HR>
<P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
#use wml::debian::ctime
#use wml::debian::languages
<P><SMALL>
<HR>
<ifeq "$(NOCOMMENTS)" ""
"<SMALL>
Please send comments or corrections on these pages to
<A href="mailto:webmaster@debian.org">webmaster@debian.org</A>
<A href=\"mailto:webmaster@debian.org\">webmaster@debian.org</A>
</SMALL>
<P>
">
<P><SMALL>Last Modified: <:= ctime () :><BR>
Copyright &copy; 1997-1998 <a href="http://www.spi-inc.org/">SPI</a>;
See <A href="$(HOME)/license">license terms</A>.
<SMALL>Last Modified: <:= ctime () :><BR>
<ifeq "$(NOCOPYRIGHT)" ""
"Copyright &copy; 1997-1998 <a href=\"http://www.spi-inc.org/\">SPI</a>;
See <A href=\"$(HOME)/license\">license terms</A>.
</SMALL>
">
#!wml -o ../../debian.org/%BASE.html
<H3>Webmasters: This is the latest email from Jay plus annotations from me.
I mostly did this for myself to remember where I'm at and to have a common todo
between work and home</H3>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment