aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas Zoetekouw <bas>2007-08-01 14:13:04 +0000
committerBas Zoetekouw <bas>2007-08-01 14:13:04 +0000
commited532a9496f00e94f12dbc9d03ba44bb8f7c689b (patch)
treed8ce4593e1f4c55a3991bfe0d8a6558065171984
parentd19cfaa161bb44cffeb0cb9452d878ce41fa5946 (diff)
Fix html: close all tags; tags to lowercase
CVS version numbers english/donations.wml: 1.60 -> 1.61 english/index.wml: 1.76 -> 1.77 english/search.wml: 1.12 -> 1.13 english/social_contract.wml: 1.20 -> 1.21
-rw-r--r--english/donations.wml35
-rw-r--r--english/index.wml44
-rw-r--r--english/search.wml4
-rw-r--r--english/social_contract.wml81
4 files changed, 82 insertions, 82 deletions
diff --git a/english/donations.wml b/english/donations.wml
index 68feec34822..2c065b2f711 100644
--- a/english/donations.wml
+++ b/english/donations.wml
@@ -1,41 +1,41 @@
#use wml::debian::template title="Donations to Software in the Public Interest"
-<UL>
- <LI><a href="#money_donations">Donations of money</a></li>
- <LI><a href="#equipment_donations">Donations of equipment and services</a></li>
-</UL>
+<ul>
+ <li><a href="#money_donations">Donations of money</a></li>
+ <li><a href="#equipment_donations">Donations of equipment and services</a></li>
+</ul>
<h2 id="money_donations">Donations of money</h2>
-<P>Debian is the name of the project, and Debian GNU/Linux is how the
+<p>Debian is the name of the project, and Debian GNU/Linux is how the
distribution we create is called. In order to handle money donations,
we set up a non-profit corporation,
-<a href="http://www.spi-inc.org/">Software in the Public Interest</a>.
+<a href="http://www.spi-inc.org/">Software in the Public Interest</a>.</p>
-<P>Although created by a volunteers throughout the world, Debian
+<p>Although created by a volunteers throughout the world, Debian
has expenses that were, for a long time, paid for out of the
pockets of a few of the developers. These expenses include
registering the debian.org domain, cutting CD's for testing new
releases, unreimbursed travel and lodging expenses while appearing
-at conferences, etc.
+at conferences, etc.</p>
-<P>Many of the donations to date have been from appreciative users.
+<p>Many of the donations to date have been from appreciative users.
While all donations are welcome, it is especially hoped that any
businesses that make money through Debian (CD manufacturers,
support companies, or even businesses that rely on Debian
for day to day operations) will contribute a percentage
of their profit to help make Debian GNU/Linux the best OS
-it can be.
+it can be.</p>
<p>If you would like to make a monetary donation to Debian, see the
<a href="http://www.spi-inc.org/donations">SPI donation page</a>.
Make sure to specify that the money is intended for Debian. Since SPI
-is a non-profit organization we can issue receipts for tax purposes.
+is a non-profit organization we can issue receipts for tax purposes.</p>
<p>For some parts of the world it may be easier to make the donation to
one of the partner organizations of Software in the Public Interest
(check the <a href="http://www.spi-inc.org/donations">SPI donation page</a>
-for current information):
+for current information):</p>
<ul>
<li>Europe: <a href="http://www.ffis.de/Verein/spi-en.html">\
@@ -47,19 +47,20 @@ for current information):
<h2 id="equipment_donations">Donations of equipment and services</h2>
-<P>Given the small budget Debian runs on it is not possible, at this time,
+<p>Given the small budget Debian runs on it is not possible, at this time,
for Debian to purchase and maintain its own computers and network connections.
We therefore rely on the donation of equipment and services from companies and
-universities to keep Debian connected to the world.
+universities to keep Debian connected to the world.</p>
-<P>If your company has any idle machines or spare equipment (hard drives, SCSI
+<p>If your company has any idle machines or spare equipment (hard drives, SCSI
controllers, network cards, etc) lying around, please consider donating them to
Debian. Please contact our
<a href="mailto:hardware-donations@debian.org">hardware donations delegate</a>
-for details.
+for details.</p>
<p>Debian maintains a <a href="misc/hardware_wanted">list of hardware that is wanted</a> for various
-services and groups within the project.
+services and groups within the project.</p>
+
<hrline>
<p>The following are lists of organizations that have made donations of
diff --git a/english/index.wml b/english/index.wml
index 8df2e4975b8..b6cd32f5ce3 100644
--- a/english/index.wml
+++ b/english/index.wml
@@ -2,25 +2,25 @@
#use wml::debian::recent_list
#include "$(ENGLISHDIR)/releases/info"
-<H2>What is Debian?</H2>
+<h2>What is Debian?</h2>
-<P><A href="http://www.debian.org/">Debian</A> is a
-<A href="intro/free">free</A> operating system (OS) for your computer.
+<p><a href="http://www.debian.org/">Debian</a> is a
+<a href="intro/free">free</a> operating system (OS) for your computer.
An operating system is the set of basic programs and utilities that make
-your computer run. Debian uses the <A HREF="http://www.kernel.org/">Linux</A>
+your computer run. Debian uses the <a href="http://www.kernel.org/">Linux</a>
kernel (the core of an operating system), but most of the basic OS tools
-come from the <A HREF="http://www.gnu.org/">GNU project</A>; hence the name
-GNU/Linux.
+come from the <a href="http://www.gnu.org/">GNU project</a>; hence the name
+GNU/Linux.</p>
<p>Debian GNU/Linux provides more than a pure OS: it comes with over
-<packages_in_stable> <A HREF="distrib/packages">packages</A>, precompiled software bundled
-up in a nice format for easy installation on your machine.
+<packages_in_stable> <a href="distrib/packages">packages</a>, precompiled software bundled
+up in a nice format for easy installation on your machine.</p>
-<P><A href="intro/about">Read more...</A>
+<p><a href="intro/about">Read more...</a></p>
-<HR>
+<hr>
-<H2>Getting Started</H2>
+<h2>Getting Started</h2>
<p>The <a href="releases/stable/">latest stable release of Debian</a> is
<current_release_short>. The last update to this release was made on
@@ -45,27 +45,27 @@ before proceeding.</p>
<p>People who use systems other than Intel x86 should check the
<a href="ports/">ports</a> section.</p>
-<HR>
+<hr>
-<H2>News</H2>
+<h2>News</h2>
-<P><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :>
+<p><:= get_recent_list('News/$(CUR_YEAR)', '6', '$(ENGLISHDIR)', '', '\d+\w*' ) :></p>
-<P>For older news items see the <A href="$(HOME)/News/">News Page</A>.
+<p>For older news items see the <a href="$(HOME)/News/">News Page</a>.
If you would like to receive mail whenever new Debian news comes out, subscribe to the
-<A href="MailingLists/debian-announce">debian-announce mailing list</A>.
+<a href="MailingLists/debian-announce">debian-announce mailing list</a>.
-<HR>
+<hr>
-<H2>Security Advisories</H2>
+<h2>Security Advisories</h2>
-<P><:= get_recent_list ('security/2w', '10', '$(ENGLISHDIR)', 'bydate', '(2000\d+\w+|dsa-\d+)' ) :>
+<p><:= get_recent_list ('security/2w', '10', '$(ENGLISHDIR)', 'bydate', '(2000\d+\w+|dsa-\d+)' ) :></p>
-<P>For older security advisories see the <A href="$(HOME)/security/">
-Security Page</A>.
+<p>For older security advisories see the <A href="$(HOME)/security/">
+Security Page</a>.
If you would like to receive security advisories as soon as they're announced, subscribe to the
<a href="http://lists.debian.org/debian-security-announce/">debian-security-announce
-mailing list</a>.
+mailing list</a>.</p>
{#rss#:
<link rel="alternate" type="application/rss+xml"
diff --git a/english/search.wml b/english/search.wml
index 5f06e306dbd..123f5aa4d75 100644
--- a/english/search.wml
+++ b/english/search.wml
@@ -1,5 +1,5 @@
#use wml::debian::template title="Search"
-<P>We now have a search engine!! Please go to the
-<A href="http://search.debian.org/">new url</A>.
+<p>We now have a search engine!! Please go to the
+<a href="http://search.debian.org/">new url</a>.</p>
diff --git a/english/social_contract.wml b/english/social_contract.wml
index 95a8ff40e1d..b597b761e1a 100644
--- a/english/social_contract.wml
+++ b/english/social_contract.wml
@@ -4,19 +4,19 @@
# Author : Manoj Srivastava ( srivasta@tiamat.datasync.com )
# Created On : Wed Jul 2 12:47:56 1997
-<P>
+<p>
Version 1.1 ratified on April 26, 2004. Supersedes
<a href="social_contract.1.0">Version 1.0</a> ratified on July 5, 1997.
-</P>
+</p>
-<P>Debian, the producers of the Debian GNU/Linux system, have created the
+<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/docs/definition_plain.html">Open Source Definition</a>.
+<a href="http://www.opensource.org/docs/definition_plain.html">Open Source Definition</a>.</p>
-<HR>
+<hr>
<h2><q>Social Contract</q> with the Free Software Community</h2>
<ol>
@@ -30,7 +30,6 @@ the free software community as the basis of the
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.
-
</p>
</li>
<li><strong>We will give back to the free software community</strong>
@@ -84,25 +83,25 @@ the free software community as the basis of the
</p>
</li>
</ol>
-<HR>
+<hr>
<h2 id="guidelines">The Debian Free Software Guidelines (DFSG)</h2>
-<OL>
- <LI><P><strong>Free Redistribution</strong>
- <P>The license of a Debian component may not restrict any
+<ol>
+ <li><p><strong>Free Redistribution</strong></p>
+ <p>The license of a Debian component may not restrict any
party from selling or giving away the software as a
component of an aggregate software distribution containing
programs from several different sources. The license may not
- require a royalty or other fee for such sale.</P>
- <LI><P><strong>Source Code</strong>
- <P>The program must include source code, and must allow
+ require a royalty or other fee for such sale.</p>
+ <li><p><strong>Source Code</strong></p>
+ <p>The program must include source code, and must allow
distribution in source code as well as compiled
- form.</P>
- <LI><P><strong>Derived Works</strong>
- <P>The license must allow modifications and derived works, and
+ form.</p>
+ <li><p><strong>Derived Works</strong></p>
+ <p>The license must allow modifications and derived works, and
must allow them to be distributed under the same terms as
- the license of the original software.</P>
- <LI><P><strong>Integrity of The Author's Source Code</strong>
- <P>The license may restrict source-code from being distributed
+ the license of the original software.</p>
+ <li><p><strong>Integrity of The Author's Source Code</strong></p>
+ <p>The license may restrict source-code from being distributed
in modified form _<strong>only</strong>_ if the license allows
the distribution of "<tt>patch files</tt>" with the source
code for the purpose of modifying the program at build
@@ -112,40 +111,40 @@ the free software community as the basis of the
number from the original software. (<em>This is a
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>
- <LI><P><strong>No Discrimination Against Fields of Endeavor</strong>
- <P>The license must not restrict anyone from making use of the
+ modified.</em>)</p>
+ <li><p><strong>No Discrimination Against Persons or Groups</strong></p>
+ <p>The license must not discriminate against any person or
+ group of persons.</p>
+ <li><p><strong>No Discrimination Against Fields of Endeavor</strong></p>
+ <p>The license must not restrict anyone from making use of the
program in a specific field of endeavor. For example, it may
not restrict the program from being used in a business, or
- from being used for genetic research.</P>
- <LI><P><strong>Distribution of License</strong>
- <P>The rights attached to the program must apply to all to
+ from being used for genetic research.</p>
+ <li><p><strong>Distribution of License</strong></p>
+ <p>The rights attached to the program must apply to all to
whom the program is redistributed without the need for
execution of an additional license by those
- parties.</P>
- <LI><P><strong>License Must Not Be Specific to Debian</strong>
- <P>The rights attached to the program must not depend on the
+ parties.</p>
+ <li><p><strong>License Must Not Be Specific to Debian</strong></p>
+ <p>The rights attached to the program must not depend on the
program's being part of a Debian system. If the program is
extracted from Debian and used or distributed without Debian
but otherwise within the terms of the program's license, all
parties to whom the program is redistributed should have the
same rights as those that are granted in conjunction with
- the Debian system.</P>
- <LI><P><strong>License Must Not Contaminate Other Software</strong>
- <P>The license must not place restrictions on other software
+ the Debian system.</p>
+ <li><p><strong>License Must Not Contaminate Other Software</strong></p>
+ <p>The license must not place restrictions on other software
that is distributed along with the licensed
software. For example, the license must not insist that all
other programs distributed on the same medium must be free
- software.</P>
- <LI><P><strong>Example Licenses</strong>
- <P>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>",
+ software.</p>
+ <li><p><strong>Example Licenses</strong></p>
+ <p>The "<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</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>
+ licenses are examples of licenses that we consider "<em>free</em>".</p>
+</ol>
<p><em>The concept of stating our "social contract with the free
software community" was suggested by Ean Schuessler. This document
@@ -159,5 +158,5 @@ Debian Free Software Guidelines to create
<a href="http://www.opensource.org/docs/definition.php">&ldquo;The Open
Source Definition&rdquo;</a>.</em></p>
-<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>Other organizations may derive from and build on this document.
+Please give credit to the Debian project if you do.</em></p>

© 2014-2024 Faster IT GmbH | imprint | privacy policy