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

Translations for the debian web site maintained by Norbert Bottlaender-Prier



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/donations.wml
Index: english/donations.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/donations.wml,v
retrieving revision 1.16
retrieving revision 1.29
diff -u -u -r1.16 -r1.29
--- english/donations.wml	1999/07/07 23:40:39	1.16
+++ english/donations.wml	2000/11/13 07:14:00	1.29
@@ -1,14 +1,15 @@
 #use wml::debian::template title="Donations to Software in the Public Interest"
 
 <UL>
-<LI><A href="#money_donations">Donations of money</A><BR>
-<LI><A href="#equipment_donations">Donations of equipment and services</A><BR>
+  <LI><A href="#money_donations">Donations of money</A>
+  <LI><A href="#equipment_donations">Donations of equipment and services</A>
 </UL>
 
 <H2><A name="money_donations">Donations of money</A></H2>
 
-<P>Debian is the name of the distribution we create. In order to
-handle money we set up a non-profit corporation,
+<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>.
 
 <P>Although created by a volunteers throughout the world, Debian
@@ -27,9 +28,9 @@
 it can be.
 
 <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 Debian is a
-non-profit organization we can issue receipts for tax purposes.
+<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.
 
 <H2><A name="equipment_donations">Donations of equipment and services</A></H2>
 
@@ -43,57 +44,133 @@
 Debian. Contact the 
 <A href="mailto:spi-treasurer@debian.org";>SPI treasurer</A> for details.
 
+<HR>
+
 <H3>The following is a list of the organizations that have donated
 equipment to Debian:</H3>
 <UL>
-<LI><A href="http://www.novare.net/";>Novare International</A>
-    donated the master system and the machine used as listserver for Debian.
-<LI><A href="http://www.varesearch.com/";>VA Linux Systems</A>
+  <LI><A href="http://www.novare.net/";>Novare International</A> (nowadays
+    <a href="http://www.brainfood.com/";>Brainfood</a>)
+# master
+    donated the master system (used for BTS, mail, and other things) and
+# murphy
+    the machine used as listserver for Debian.
+  <LI><A href="http://www.valinux.com/";>VA Linux Systems</A>
+# klecker
     donated <A href="http://www.debian.org/";>www.debian.org</A>.
-<LI><A HREF="http://www.linux-hw.com/";>Linux Hardware Solutions</A> provided
-	the server that runs ftp.debian.org.
-<LI>LinuxPPC has donated an 18G hard disk
-<LI>Compaq has donated a Alpha which is being used to port debian to that
-    architecture.
-<LI>The Concorde Group has donated a Sparc Station 10 which is being used
-	to port Debian to the sparc.
+  <LI><A HREF="http://www.linux-hw.com/";>Linux Hardware Solutions</A> provided
+    the server that ran ftp.debian.org.
+  <LI><a href="http://www.linuxppc.org/";>LinuxPPC</a> has donated an 18G hard
+    disk
+  <LI><a href="http://www.compaq.com/";>Compaq</a> has donated an Alpha
+# faure
+    system which is being used to port Debian to that architecture.
+  <LI>The Concorde Group has donated a Sparc Station 10 which is being used
+# kubrick
+    to port Debian to the SPARC architecture.
+  <LI><a href="http://www.kachinatech.com/";>Kachina Technologies, Inc.</a>
+# xia0?.kachinatech.com
+    provided one SPARC machine and two UltraSPARC machines used to port
+    Debian to the SPARC architecture.
+  <LI><a href="http://www.above.net/";>AboveNet Communications, Inc.</a>
+# samosa
+    provided server and bandwidth for
+    <a href="http://archive.debian.org/";>archive.debian.org</a>.
+  <LI><a href="http://www.alpha-processor.com/";>Alpha Processor, Inc.</a>
+# lully
+    provided an Alpha machine used to port Debian to that architecture.
+  <LI><a href="http://www.sun.com";>Sun Microsystems</a> donated the server
+# auric
+    which powers the internal archive system.
+  <LI><a href="http://www.atipa.com";>Atipa Linux Solutions</a> donated the
+# saens
+    server which runs ftp.debian.org.
 </UL>
 
+<p>Please see the list of <a href="http://db.debian.org/machines.cgi";>debian.org
+developer machines</a> for more accurate information.
+
 <H3>The following is a list of organizations that have contributed to Debian by
-hosting mirror services</H3>
+hosting major mirror services:</H3>
 <UL>
-<LI><A HREF="http://www.mindspring.net";>MindSpring</A> provides bandwidth for 
-	<A HREF="ftp://ftp.debian.org/";>ftp.debian.org</a>.
-<LI><A href="http://irc.linpeople.org/";>LISC</A> supports Debian by hosting
-    the #debian channel at irc.debian.org .
-<LI><A href="http://www.waw.com/waw/";>Web At Work</A> sponsors
-    <A href="http://www.fr.debian.org/";>http://www.fr.debian.org/</A>.
-<LI>The <A href="http://os.inf.tu-dresden.de/index_e.html";>Operating Systems
+  <LI><A HREF="http://www.lightning.net";>Lightning Internet</A> provides
+    bandwidth for current <a href="ftp://ftp.debian.org/";>ftp.debian.org</a>.
+    <BR>
+    <A HREF="http://www.mindspring.net";>MindSpring</A> and
+    <A HREF="http://www.gigabell.com";>Gigabell AG</A> previously provided
+    bandwidth for that server.
+  <LI><A href="http://irc.linpeople.org/";>LISC</A> (nowadays
+    <a href="http://openprojects.nu/";>Open Projects Network</a>) supports
+    Debian by hosting Debian-related IRC channels at irc.debian.org .
+  <LI><a href="http://www.e-fb2.com/";>efb2.com</a> and
+    <a href="http://www.proxad.net/";>Proxad</a> sponsor
+    <a href="http://www.fr.debian.org/";>www.fr.debian.org</a> and
+    <a href="ftp://ftp.fr.debian.org/";>ftp.fr.debian.org</a>, respectively.
+  <LI>The <A href="http://os.inf.tu-dresden.de/index_e.html";>Operating Systems
     Group</A> at <A href="http://www.tu-dresden.de/";>Dresden University of
     Technology</A> sponsors
-    <A href="http://www.de.debian.org/";>http://www.de.debian.org/</A>.
-<LI><SPAN lang=es><A href="http://www.es.debian.org/sponsor.html";>El Departamento de Física Fundamental y Experimental</A></SPAN>
-    at
-    <SPAN lang=es><A href="http://www.dfis.ull.es/laguna.html";>la Universidad de La Laguna</A></SPAN>
-    sponsors
-    <A href="http://www.es.debian.org/";>http://www.es.debian.org/</A>
+    <A href="http://www.de.debian.org/";>www.de.debian.org</A>.
+  <LI><SPAN lang=es><A href="http://www.es.debian.org/sponsor.html";>El
+    Departamento de Física Fundamental y Experimental</A></SPAN> at
+    <SPAN lang=es><A href="http://www.dfis.ull.es/laguna.html";>la Universidad
+    de La Laguna</A></SPAN> sponsors
+    <A href="http://www.es.debian.org/";>www.es.debian.org</A>
     (don't you wish you lived in the Canary Islands!).
-<LI><A href="http://www.netvillage.co.jp/";>NetVillage Co.,Ltd.</A> sponsors
-    <A href="http://www.jp.debian.org/";>http://www.jp.debian.org/</A> and
-    <A href="ftp://ftp.jp.debian.org/pub/Linux/debian/";>ftp://ftp.jp.debian.org/pub/Linux/debian/</A>.
-<LI><A href="http://www.atnet.at/";>AT-nctt</A> sponsors
-    <A href="http://www.at.debian.org/";>http://www.at.debian.org/</A> and
-    <A href="ftp://ftp.at.debian.org/";>ftp://ftp.at.debian.org/</A>
-<LI><a href="http://www.hands.com/";>Philip Hands</a> and
+  <LI><A href="http://www.netvillage.co.jp/";>NetVillage Co., Ltd.</A> sponsors
+    <A href="http://www.jp.debian.org/";>www.jp.debian.org</A> and
+    <A href="ftp://ftp.jp.debian.org/";>ftp.jp.debian.org</A>.
+  <LI><A href="http://www.atnet.at/";>at-net</A> sponsors
+    <A href="http://www.at.debian.org/";>www.at.debian.org</A> and
+    <A href="ftp://ftp.at.debian.org/";>ftp.at.debian.org</A>
+  <LI><a href="http://www.hands.com/";>Philip Hands</a> and
     <a href="http://www.netcom.net.uk/";>Netcom UK</a>, who provide
     <a href="http://www.uk.debian.org/";>www.uk.debian.org</a>'s hardware and 
     bandwidth respectively.
+  <LI><a href="http://www.tenet.pl";>Centrum Edukacji Komputerowej TECHTRONIC</a>
+    sponsors <a href="http://www.pl.debian.org";>www.pl.debian.org</a>.
+  <LI><a href="http://www.msu.edu";>Michigan State University</a> sponsors
+    <a href="ftp://ftp.us.debian.org/";>ftp.us.debian.org</a>.
+  <LI>The <a href="http://www.eecg.toronto.edu";>Department of Electrical
+    and Computer Engineering</a> at the <a href="http://www.toronto.edu";>
+    University of Toronto</a> and <A href="http://www.stormix.com/";>Stormix
+    Technologies</A>, respectively, provide
+    <a href="http://www.ca.debian.org/";>www.ca.debian.org</a> and
+    <a href="ftp://ftp.ca.debian.org/";>ftp.ca.debian.org</a>.
+  <LI>University of Queensland, Australia with Sun Microsystems, and
+    <a href="http://www.it.net.au";>Informed Technology</a> sponsor
+    <a href="http://www.au.debian.org";>www.au.debian.org</a> and
+    <a href="ftp://ftp.au.debian.org";>ftp.au.debian.org</a>, respectively.
+  <LI>University of Genova, Italy sponsors
+    <a href="ftp://ftp.it.debian.org";>ftp.it.debian.org</a>.
+  <LI><a href="http://www.uunet.nl/";>UUNET Nederland</a> and
+    <a href="http://www.cistron.nl/";>Cistron Internet</a> host
+    <a href="ftp://ftp.nl.debian.org";>ftp.nl.debian.org</a> and
+    <a href="http://www.nl.debian.org";>www.nl.debian.org</a>, respectively.
+  <LI><a href="http://borsen.dk/";>Dagbladet Børsen A/S</a> sponsors
+    <a href="http://www.dk.debian.org";>www.dk.debian.org</a>.
+  <LI><a href="http://spnet.net";>Spectrum NET</a> sponsors
+    <a href="http://www.bg.debian.org";>www.bg.debian.org</a>.
+  <LI><a href="http://www.kr.psi.net/";>PSINet Korea Inc.</a> sponsors
+    <a href="http://www.kr.debian.org";>www.kr.debian.org</a> and
+    <a href="ftp://ftp.kr.debian.org";>ftp.kr.debian.org</a>.
+  <LI><a href="http://www.acc.umu.se/";>Academic Computer Club at Umeå
+    University</a> sponsors
+    <a href="ftp://ftp.se.debian.org";>ftp.se.debian.org</a>.
+  <LI><a href="http://www.uio.no/";>University of Oslo</a>,
+    <a href="http://www.uninett.no/";>Uninett</a>,
+    <a href="http://www.nuug.no/";>NUUG</a>, and
+    <a href="http://www.sun.no/";>Sun Microsystems Norway</a> sponsor
+    <a href="ftp://ftp.no.debian.org";>ftp.no.debian.org</a>.
+  <LI><a href="http://www.cs.tut.fi/";>Tampere University of Technology</a>
+    sponsors <a href="ftp://ftp.fi.debian.org";>ftp.fi.debian.org</a>.
+  <LI><a href="http://www.pvtnet.cz";>PVT.NET</a> sponsors
+    <a href="ftp://ftp.cz.debian.org";>ftp.cz.debian.org</a>.
+  <LI><a href="http://www.camtp.uni-mb.si";>CAMTP, Univ. Maribor</a> sponsors
+    <a href="ftp://ftp.si.debian.org";>ftp.si.debian.org</a>.
 </UL>
 
 <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.
 
-<H3>The following is a list of the organizations that have made other donations to Debian:</H3>
-<UL>
-	<LI><A HREF="http://www.linuxcentral.com/";>LinuxCentral</A> has supported Debian at events including Atlanta Linux Showcase and LinuxWorld Expo.
-</UL>  
+<P>Our <A HREF="partners/">Partners page</A> contains a list of the
+organizations that have made other donations to Debian.
+++++++++++++++++++++++++++++ END OF english/donations.wml



+++++++++++++++++++++++++++++ CHANGES IN english/support.wml
Index: english/support.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/support.wml,v
retrieving revision 1.1
retrieving revision 1.17
diff -u -u -r1.1 -r1.17
--- english/support.wml	1998/07/01 04:32:18	1.1
+++ english/support.wml	2000/11/17 15:18:02	1.17
@@ -1,49 +1,31 @@
-#!wml -o ../../debian.org/%BASE.html.en
-#use wml::debian::template title="Debian GNU/Linux &mdash; Support"
+#use wml::debian::template title="Support"
 
-<H1>Support</H1>
+<UL>
+ <LI><A href="#mail_lists">Mailing lists</A>
+ <LI><A href="#maintainers">Reaching Package Maintainers</A>
+ <LI><A href="#bts">The Bug Tracking System</A>
+ <LI><A href="#consultants">Consultants</A>
+ <LI><A href="#irc">On-line Real Time Help Using IRC</A>
+</UL>
+ 
+<HR>
+
+<H2><A name="mail_lists" href="MailingLists/">Mailing lists</A></H2>
+
+<P>Debian GNU/Linux is developed through distributed development all around
+the world. Therefore e-mail is a preferred way to discuss various items.
+Much of the the conversation between Debian developers and users is managed
+through several mailing lists.
 
-<HR>
-
-<H2><A name="mail_lists">Mailing lists</A></H2>
-
-<P>Much of the the conversation between Debian developers and users is
-managed through several mailing lists.  Debian GNU/Linux is
-developed through distributed development all around the world.
-Therefore email is a preferred way to discuss various items.
-       
-<P>There are several publicly available mailing lists while there are also some
-lists which are only open to active developers.  Please don't
-interpret this as closed development. Everyone is encouraged to help
-development of Debian and to spread the word of free software.
-On the other hand it doesn't make much sense discussing internal
-topics with non-developers.
-       
-<P>All original Debian mailing lists run on a special server with a
-mail transport agent that is optimized for lists.  This host is
-called lists.debian.org.  All submission, subscription and
-unsubscription messages have to go to this host.
-       
-<P>The language used on all lists is English unless stated otherwise.
-There are also some user lists for other languages available.
-
-<P>For information on the mailing lists and how to subscribe to them, see the
-<A href="MailingLists/subscribe">Subscription Page</A>.
-For information on unsubscribing, see the
-<A href="MailingLists/unsubscribe">Unsubscription Page</A>.
-
-<P>You can also view old posts to the mailing lists using the
-<A href="Lists-Archives/">mailing list archives</A>.
+<P>There are several publicly available mailing lists. For more information,
+see <a href="MailingLists/">Debian mailing lists</a> page.
 
-<P>To contact the list maintainer, send E-Mail to
-<A href="mailto:listmaster@lists.debian.org";>listmaster@lists.debian.org</A>.
-
 <P>There are many other Linux mailing lists, which are not Debian-specific.
-Please refer to this <A href="http://www.li.org/Resources/mail-lists.html";>
-index</A>.
+Please refer to
+<A HREF="http://oslab.snu.ac.kr/~djshin/linux/mail-list/";>this index</A>.
 
 <HR>
-<H2>Reaching Package Maintainers</H2>
+<H2><A name="maintainers">Reaching Package Maintainers</A></H2>
 
 <P>There are two ways of reaching package maintainers. If you need to
 contact the maintainer because of a bug, simply file a bug report (see the
@@ -52,58 +34,65 @@
 
 <P>If you simply want to communicate with the maintainer, then you can use
 the special mail aliases set up for each package. Any mail sent to
-&lt;package name&gt;@packages.debian.org will be forwarded to the maintainer
-responsible for that package.
+&lt;<EM>package name</EM>&gt;@packages.debian.org will be forwarded to the
+maintainer responsible for that package.
 
 <HR>
-<H2>The Bug Tracking System</H2>
+<H2><A name="bts" href="Bugs/">The Bug Tracking System</A></H2>
 
-<P>The Debian Linux distribution has a bug tracking system which
+<P>The Debian GNU/Linux distribution has a bug tracking system which
 details bugs reported by users and developers.  Each bug is given a
 number, and is kept on file until it is marked as having been dealt
 with.
 
 <P>To report a bug, you can use one of the bug pages listed below, or you
 can use the Debian package 'bug' to automatically file a bug report.
-
-<P>Information on submitting bugs, viewing the currently active bugs, and the bug tracking
-system in general can be retrieved from the <A href="Bugs/">current web site</A> or from one of
-these mirrors:
-
-<P align="center">
-[ <A href="http://www.infodrom.north.de/Debian/Bugs/";>Germany</A>
-| <A href="http://www.chiark.greenend.org.uk/debian/Bugs/";>United Kingdom</A>
-| <A href="http://www.debian.org/Bugs/";>United States</A> ]
 
+<P>Information on submitting bugs, viewing the currently active bugs, and
+the bug tracking system in general can be found at the
+<A HREF="Bugs/">bug tracking system web pages</A>.
 
 <HR>
-<H2><A href="consultants.html">Consultants</A></H2>
+<H2><A name="consultants" href="consultants/">Consultants</A></H2>
 
 <P>Debian is free software and offers free help through mailing lists. Some
 people either don't have the time or have specialized needs and are willing
 to hire someone to maintain or add additional functionality to their Debian
-system.  See the <A href="consultants.html">consultants page</A> for a list
+system.  See the <A href="consultants/">consultants page</A> for a list
 of people/companies.
 
 <HR>
 <H2><A name="irc">On-line Real Time Help Using IRC</A></H2>
 
-<P>IRC (Internet Relay Chat) is a way to chat with people from all over the world in real time.
-An IRC channel dedicated to Debian can be found on irc.debian.org.
-To connect, you need an IRC client.
-Some of the most popular clients are ircII, BitchX, tkirc and Zircon,
-all of which have been packaged for Debian.
-Once you have the client installed, you need to tell it
-to connect to server irc.debian.org by typing "<KBD>/server&nbsp;irc.debian.org</KBD>";
-and when connected, join channel #debian
-by typing "<KBD>/join&nbsp;#debian</KBD>" (Zircon is different. It uses an intuitive
-graphical interface).
-At this point you will find yourself among the friendly crowd of #debian
-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>.
+<P><a href="http://www.irchelp.org/";>IRC (Internet Relay Chat)</a> is a way
+to chat with people from all over the world in real time. An IRC channel
+dedicated to Debian can be found on the
+<a href="http://openprojects.nu/services/irc.html";>Open Projects IRC
+network</a>.
+
+<p>To connect, you need an IRC client. Some of the most popular clients are
+ircII, BitchX, tkirc, X-Chat and Zircon, all of which have been packaged for
+Debian. Once you have the client installed, you need to tell it to connect
+to our server, which is called <code>irc.debian.org</code>. In most clients,
+you can do that by typing:
+
+<pre>
+/server irc.debian.org
+</pre>
+
+<p>Once you are connected, join channel <code>#debian</code> by typing
+
+<pre>
+/join #debian
+</pre>
+
+<p>Note: X-Chat, Zircon and other GUI-based clients are different. They use
+an intuitive graphical interface for joining servers/channels.
+
+<p>At this point you will find yourself among the friendly crowd of
+<code>#debian</code> inhabitants. You're welcome to ask questions about
+Debian there. For a list of channel rules, see the
+<a href="http://www.linpeople.org/rules.html";>LinPeople rules</a> page.
 
-<:= languages ("$(HOME)", ".", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
+<p>If you can't find an answer to your problem in #Debian, try channels
+like #LinPeople, #LinuxHelp, or #help.
+++++++++++++++++++++++++++++ END OF english/support.wml



+++++++++++++++++++++++++++++ CHANGES IN english/license.wml
Index: english/license.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/license.wml,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -u -r1.6 -r1.8
--- english/license.wml	1998/11/04 06:36:06	1.6
+++ english/license.wml	2000/06/29 17:04:57	1.8
@@ -1,29 +1,19 @@
 #use wml::debian::template title="License"
 
 <BLOCKQUOTE>
-<P>Copyright &copy; 1997-1998 
+<P>Copyright &copy; 1997-2000 
 <a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
 P.O. Box 1326<BR>
 Boston, MA 02117.
 </BLOCKQUOTE>
 
-<P>Verbatim copying and distribution is permitted in any medium, provided
-this notice is preserved.
+<P>
+This material may be distributed only subject to the terms and conditions set 
+forth in the Open Publication License, Draft v1.0 or later (the latest version 
+is presently available at
+<A href="http://www.opencontent.org/openpub/";>http://www.opencontent.org/openpub/</A>).
 
-<P>You may translate these documents and their license into another language
-providing:
-<UL>
-<LI> You do not deliberately change their meaning beyond changes meant
-     to achieve a colloquial rendering in another language
-<LI> Translations of the license must be clearly marked as translations,
-     and the license in its original language shall continue to apply to
-     all translations
-<LI> In the case of hypertext pages, you must maintain a copy of the
-     original page on the same site, and must provide a link from the
-     translated page to its original.
-</UL>
-
-<P>&ldquo;Debian&rdquo;, The Debian Penguin Logo, &ldquo;Open Hardware&rdquo;,
+<P>&ldquo;Debian&rdquo;, The Debian Logo, &ldquo;Open Hardware&rdquo;,
 and the Open Hardware Logo are trademarks of Software in the Public
 Interest, Inc.
 
+++++++++++++++++++++++++++++ END OF english/license.wml



+++++++++++++++++++++++++++++ CHANGES IN english/contact.wml
Index: english/contact.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/contact.wml,v
retrieving revision 1.8
retrieving revision 1.15
diff -u -u -r1.8 -r1.15
--- english/contact.wml	1999/03/23 18:49:38	1.8
+++ english/contact.wml	2000/11/26 19:10:30	1.15
@@ -1,39 +1,47 @@
 #use wml::debian::template title="Getting in Contact with Us" NOCOMMENTS="yes"
 
 <H2>General Information</H2>
+
 <p>For general information on Debian, please see our web site,
-<a href="http://www.debian.org/";>http://www.debian.org/</a>, and our ftp site,
+<a href="$(HOME)">http://www.debian.org/</a>, and our FTP site,
 <a href="ftp://ftp.debian.org/debian/";>ftp://ftp.debian.org/debian/</a>.
 
 <p>Our FAQ will answer many of your questions.  You can view it at
-<a href="http://www.debian.org/doc/FAQ/";>http://www.debian.org/doc/FAQ/</a>
+<a href="$(HOME)/doc/FAQ/">http://www.debian.org/doc/FAQ/</a>
 or
 <a href="ftp://ftp.debian.org/debian/doc/FAQ/";>ftp://ftp.debian.org/debian/doc/FAQ/</a>.
-Postscript, text, html, and info versions are on the ftp site.
+You can also get the PostScript, text and packed-up HTML versions from the
+FTP site.
+
+<p>You may find the <a href="http://www.debian.org/cgi-bin/fom";>Debian
+FAQ-O-Matic</a> useful. It can be used to look up answers to common questions.
 
-<p>You may find the <a href="http://www.debian.org/cgi-bin/fom";>Debian faqomatic</a> useful.
-It can be used to look up answers to common questions.
 
 <H2>Installing and Using Debian</H2>
-<p>We have a very active user mailing list where Debian users and developers can answer your questions.
-Simply
-<a href="http://www.debian.org/MailingLists/subscribe";>subscribe</a> to <EM>debian-user</EM>
-and send your question to
+
+<p>We have a very active user mailing list where Debian users and developers
+can answer your questions. Simply
+<a href="$(HOME)/MailingLists/subscribe#debian-user">subscribe to
+<em>debian-user</em></a> and send your question to
 <a href="mailto:debian-user@lists.debian.org";>debian-user@lists.debian.org</a>.
-Additionally, there are  user mailing lists for speakers of various
-languages. See the <a href="http://www.debian.org/MailingLists/subscribe";>mailing
-list subscription page</a> for a list and subscription information.
 All questions regarding
 <UL>
-<LI>installation
-<LI>configuration
-<LI>supported hardware
-<LI>machine administration
-<LI>using debian
+  <LI>installation
+  <LI>configuration
+  <LI>supported hardware
+  <LI>machine administration
+  <LI>using Debian
 </UL>
 should be sent to a user mailing list.
 
+<p>Additionally, there are user mailing lists for speakers of various
+languages. See the
+<a href="$(HOME)/MailingLists/subscribe">mailing list
+subscription page</a> for a list and subscription information.
+
+
 <H2>Debian Development</H2>
+
 <p>Please note that although many developers are not native speakers of English, it is
 the common language for all development work. We therefore ask that initial enquiries
 to developers be made in English. If this is not possible, go through the user mailing
@@ -41,41 +49,49 @@
 
 <p>If you have a more development related question, there is a mailing list the developers
 use to communicate with each other.
-Simply <a href="http://www.debian.org/MailingLists/subscribe";>subscribe</a> to
-<EM>debian-devel</EM> and then send e-mail to
+Simply <a href="$(HOME)/MailingLists/subscribe">subscribe</a> to
+<em>debian-devel</em> and then send e-mail to
 <a href="mailto:debian-devel@lists.debian.org";>debian-devel@lists.debian.org</a>.
 
-<p>If you would like to file a bug against a Debian
-package, see
-<a href="http://www.debian.org/Bugs/";>http://www.debian.org/Bugs/</a> or
+<p>If you would like to file a bug against a Debian package, see
+<a href="$(HOME)/Bugs/Reporting">http://www.debian.org/Bugs/Reporting</a> or
 <a href="ftp://ftp.debian.org/debian/doc/bug-reporting.txt";>ftp://ftp.debian.org/debian/doc/bug-reporting.txt</a>
-for instructions. Submitting bugs can be made easier by installing the Debian package, <em>bug</em>.
+for instructions.  Submitting bugs can be made easier by installing the
+Debian package <em>bug</em> or <em>reportbug</em>.
 
 <p>If you would like to make the developers aware of a Debian security
 problem in a discreet manner, send e-mail to
 <a href="mailto:security@debian.org";>security@debian.org</a>.
 
+
 <H2>Publicity</H2>
-<p>Those requesting information for articles or submitting news for our news page should contact our
-<a href="mailto:press@debian.org";>publicity department</a>.
 
+<p>Those requesting information for articles or submitting news for our news
+page should contact our <a href="mailto:press@debian.org";>publicity
+department</a>.
+
+
 <H2>Commonly Requested Addresses</H2>
+
 <dl>
 <dt>Mailing List Administrators
-<dd><a href="mailto:listmaster@lists.debian.org";>listmaster@lists.debian.org</a>
+  <dd><a href="mailto:listmaster@lists.debian.org";>listmaster@lists.debian.org</a>
 <dt>Mailing List Archives
-<dd><a href="mailto:listarchives@packages.debian.org";>listarchives@packages.debian.org</a>
-<dt>Bug Tracking System or the Bug Tracking web pages
-<dd><a href="mailto:owner@bugs.debian.org";>owner@bugs.debian.org</a>
+  <dd><a href="mailto:listarchives@packages.debian.org";>listarchives@packages.debian.org</a>
+<dt>Bug Tracking System (and its web pages)
+  <dd><a href="mailto:owner@bugs.debian.org";>owner@bugs.debian.org</a>
 <dt>Web Pages
-<dd><a href="mailto:webmaster@debian.org";>webmaster@debian.org</a>
+  <dd><a href="mailto:webmaster@debian.org";>webmaster@debian.org</a>
+<dt>Developers' Database Web Pages
+  <dd><a href="mailto:admin@db.debian.org";>admin@db.debian.org</a>
 <dt>Mirroring Debian
-<dd>See the <a href="mirror/">mirroring Debian web pages</a> or contact the
-	<a href="mailto:mirrors@debian.org";>mirror list administrators</a>
+  <dd>See the <a href="mirror/">mirroring Debian web pages</a> or contact the
+  <a href="mailto:mirrors@debian.org";>mirror list administrators</a>.
 <dt>Selling Debian CDs
-<dd>See the <a href="distrib/cdinfo">information for CD vendors</a>. Information regarding new
-vendors is sent to <a href="mailto:webmaster@debian.org";>webmaster@debian.org</a>
+  <dd>See the <a href="distrib/cdinfo">information for CD vendors</a>.
+  Information regarding new vendors is sent to
+  <a href="mailto:webmaster@debian.org";>webmaster@debian.org</a>.
 </dl>
-We also maintain a <a href="devel/maintainer_contacts">complete list of maintainer contacts</a>
-that covers the various administrative roles in Debian.
 
+<p>We also have a complete list of different <a href="intro/organization">
+jobs and e-mails to use</a> to contact various parts of the organization.
+++++++++++++++++++++++++++++ END OF english/contact.wml



+++++++++++++++++++++++++++++ CHANGES IN english/devel/incoming_mirrors.wml
Index: english/devel/incoming_mirrors.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/incoming_mirrors.wml,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -u -r1.5 -r1.10
--- english/devel/incoming_mirrors.wml	1998/12/09 04:05:55	1.5
+++ english/devel/incoming_mirrors.wml	2000/06/28 15:25:11	1.10
@@ -1,25 +1,18 @@
-#use wml::debian::template title="Mirrors of Incoming"
+#use wml::debian::template title="Notes on Incoming"
 
-This is a list of mirrors of the Incoming directory for new packages to
-Debian. If you are not familiar with what this is, then you do not want
-to get packages from one of these sites. Packages on these sites are totally
-untested (except possibly by the person who packaged it) so it is possible
-that they contain packaging errors or bugs in executables that could render
-your machine unusable. 
+<p>Incoming is the directory new packages are uploaded to before being
+added to the Debian distribution.
 
-<p>In addition, the files in this directory have <em>not</em> been checked by md5sum
-or pgp to verify that they are intact or were uploaded by a registered debian
-developer.
+<p>Packages in Incoming are totally untested (except possibly by the
+package maintainer) so it is possible that they contain packaging errors
+or bugs in executables that could render your machine unusable. In
+addition, the files in this directory have <em>not</em> been checked by
+md5sum or pgp to verify that they are intact or were uploaded by a
+registered Debian developer. You can, however, get the <tt>devscripts</tt>
+package and use the <em>dscverify</em> script to check the basic validity of
+a package.
 
-<p>You have been warned.
-
-<p>
-<a href="ftp://llug.sep.bnl.gov/pub/debian/Incoming/";>ftp://llug.sep.bnl.gov/pub/debian/Incoming/</a>
-(US)<br>
-<a href="ftp://debian.midco.net/debian/Incoming/";>ftp://debian.midco.net/debian/Incoming/</a>
-(US)<br>
-<a href="ftp://ftp.lh.umu.se/pub/linux/debian-Incoming/";>ftp://ftp.lh.umu.se/pub/linux/debian-Incoming/</a>
-(Sweden)<br>
-<a href="ftp://ftp.de.debian.org:/pub/debian-incoming/";>ftp://ftp.de.debian.org:/pub/debian-incoming/</a>
-(Germany)<br>
+<p>We recommend that Incoming NOT be mirrored. For access to
+the Incoming directory, use <a href="http://incoming.debian.org/";>http://incoming.debian.org/</a>
 
+<p>You have been warned.
+++++++++++++++++++++++++++++ END OF english/devel/incoming_mirrors.wml



+++++++++++++++++++++++++++++ CHANGES IN english/releases/hamm/errata.wml
Index: english/releases/hamm/errata.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/releases/hamm/errata.wml,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -u -r1.1 -r1.7
--- english/releases/hamm/errata.wml	1998/07/23 22:16:14	1.1
+++ english/releases/hamm/errata.wml	1998/11/04 06:36:14	1.7
@@ -1,12 +1,27 @@
-#!wml -o ../../../debian.org/2.0/%BASE.html.en
-#use wml::debian::template title="Debian GNU/Linux &mdash; Errata for Debian 2.0 on x86 machines"
+#use wml::debian::template title="Errata for Debian 2.0 on x86 machines"
 
-<H1>Errata for Debian 2.0 on x86 machines</H1>
+<h3>Installation</h3>
+<p>There are no reported errata in the installation process.
 
-<P>There are no reported errata in the installation or upgrade process
-at this time.
+<h3>Upgrade</h3>
+<p>The Debian 2.0 CD images included a version of cd_autoup.sh that has a few
+   bugs.  The bugs are relatively harmless, and simply
+   result in a few of the packages that were meant to be installed by cd_autoup.sh
+   not being installed. The next dselect run should sort it out.
+   <p>Even so, upgrades should be done using the
+   <a href="ftp://ftp.debian.org/debian/dists/stable/main/upgrade-i386/cd_autoup.sh";>fixed
+   version of autoup.sh</a>. The 2.0 r1 CDs don't have this problem.
 
-<HR>
-<P>Back to the <A href="$(HOME)/">Debian GNU/Linux homepage</A>.
+<h3>Packages</h3>
+<p>The following are problems with software upgrades that you should be careful of:                   
+<ul>                                                                                                  
+   <li>(Jul 24) There is a Y2K problem in the version of CVS in 2.0. A fixed version
+       will be released to slink as soon as the author releases a new version.
+   <li>(Jul 24) A security bug in svgalib was discovered too late to allow the fix
+       into 2.0. If you use svgalib you should upgrade to the version in unstable.
+       It should be available in a few days.
+   <li>(Jul 24) There is a security hole in cfingerd, though Debian is not vulnerable as
+       shipped. You need to turn on certain options in the config file to allow
+       the vulnerability. To be safe, upgrade to the version in slink.
+</ul>
 
-<:= languages ("$(HOME)", "tmp", "$(WML_SRC_BASENAME)", "$(CUR_LANG)") :>
+++++++++++++++++++++++++++++ END OF english/releases/hamm/errata.wml




Reply to: