Translations for the debian web site maintained by Frederic Pascal
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/related_links.wml
Index: english/related_links.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/related_links.wml,v
retrieving revision 1.10
retrieving revision 1.32
diff -u -u -r1.10 -r1.32
--- english/related_links.wml 1999/03/06 20:25:54 1.10
+++ english/related_links.wml 2000/11/26 18:10:36 1.32
@@ -3,141 +3,138 @@
<P>The following is a list of information on the net that may be of interest
to Debian users.
-<HR>
-
-<H2>Linux releases based upon Debian</H2>
-
<UL>
-<LI>Debian JP,
-<a href="http://www.debian.or.jp/";>http://www.debian.or.jp/</a> [in Japanese]
-
-<LI>Eagle Linux m68k,
-<a href="http://www.eagle-cp.com/www/m68k.html";>http://www.eagle-cp.com/www/m68k.html</a> [in German]
-
-<LI>PingOO,
-<a href="http://www.linuxedu.org/";>http://www.linuxedu.org/</a>
+ <LI><A HREF="#dfsgsw">Software that is DFSG compliant</A>
+ <LI><A HREF="#basedon">Linux releases based upon Debian</A>
+ <LI><A HREF="#misclinux">Miscellaneous Linux links</A>
+ <LI><A href="#lugs">Linux User Groups</A>
+ <LI><A href="#usenet">Newsgroups</A>
+ <LI><A href="#unix">General Unix Information</A>
+ <LI><A href="#otherfreeos">Other Free Operating System Projects</A>
+</UL>
-<LI>Linux-YeS,
-<a href="http://eugene.mplik.ru/doc/lys/";>http://eugene.mplik.ru/doc/lys/</a>
-<LI>MNIS,
-<a href="http://www.mnis.fr/";>http://www.mnis.fr/</a>
-</UL>
+<HR>
-<H2>Software that is <A href="social_contract#guidelines">DFSG</A> Compliant</H2>
+<H2><a name="dfsgsw">Software</a> that is
+ <A HREF="social_contract#guidelines">DFSG</A> compliant</H2>
<DL>
-<DT><A href="http://www.linux.org/";>Linux</A>
-<DD>The kernel behind Debian.
+<DT><A href="http://www.kernel.org/";>Linux</A>
+ <DD>The kernel behind Debian GNU/Linux.
<DT><A href="http://www.gnu.org/";>GNU</A>
-<DD>Most of the utility programs on Debian are from GNU.
+ <DD>Most of the utility programs on Debian are from the GNU project.
-<DT>X Window System
-<DD><A href="http://www.xfree86.org/";>XFree86, Inc.</A> maintains a very
- good implementation of the
+<DT><A HREF="http://www.X.org/";>X Window System</A>
+ <DD><A href="http://www.xfree86.org/";>XFree86, Inc.</A> maintains a very
+ good free implementation of the
<A href="http://www.opengroup.org/tech/desktop/x";>X Window System</A>
for several Unix variants.
-<DT><A href="http://www.gnome.org/";>GNU Network Object Model Environment (GNOME)</A>
-<DD>GNOME intends to build a complete, user-friendly desktop based entirely
- on free software.
-
<DT><A href="http://www.apache.org/";>Apache</A>
-<DD>The most widely used web server in the entire world.
+ <DD>The most widely used web server in the entire world.
<DT><A href="http://www.perl.org/";>Perl</A>
-<DD>Formally, the Practical Extraction and Report Language, Perl is a widely
+ <DD>Formally, the Practical Extraction and Report Language, Perl is a widely
used scripting language.
+
+<DT><A href="http://www.gnome.org/";>GNU Network Object Model Environment (GNOME)</A>
+ <DD>GNOME intends to build a complete, user-friendly desktop based entirely
+ on free software.
</DL>
<HR>
-<H2><A href="http://www.linux.org/help/howto.html";>Linux HOWTO's</A></H2>
+<H2><a name="basedon">Linux releases based upon Debian</a></H2>
-<P>As there are so many configurations possible for the setup and
-maintenance of a Linux systems, knowledgeable people have provided
-comprehensive instructions on how to do many specific tasks. For good reason
-they are called HOWTOs. If you need your Debian system to do something that
-isn't covered by the normal Debian setup, this is a good resource to check.
+<UL>
+ <LI>Debian JP,
+ <a href="http://www.debian.or.jp/";>http://www.debian.or.jp/</a> [in Japanese]
-<P>The HOWTO's are actually part of the Linux Documentation Project. They
-are also available for installation on your machine in the doc-linux-text
-package.
+# <LI>Eagle Linux m68k,
+# <a href="http://www.eagle-cp.com/www/m68k.html";>http://www.eagle-cp.com/www/m68k.html</a> [in German]
+ <LI>PingOO,
+ <a href="http://www.linuxedu.org/";>http://www.linuxedu.org/</a>
-<HR>
+ <LI>Linux-YeS,
+ <a href="http://eugene.mplik.ru/doc/lys/";>http://eugene.mplik.ru/doc/lys/</a>
-<H2><A href="http://metalab.unc.edu/LDP/";>Linux Documentation Project</A></H2>
+ <LI>M.N.I.S. Linux,
+ <a href="http://www.mnis.fr/";>http://www.mnis.fr/</a>
-<P><EM>(Please note: The following description of the LDP has been copied from
- the Linux International web site:
- <A href="http://www.li.org/resources/doclists/index.shtml";>http://www.li.org/resources/doclists/index.shtml</A>)</EM>
+ <LI>Linux Router Project,
+ <a href="http://www.linuxrouter.org/";>http://www.linuxrouter.org/</a>
-<P>Linux documentation is coordinated through the efforts of the
-<STRONG><A href="http://metalab.unc.edu/LDP/";>Linux Documentation Project</A></STRONG>.
-The overall goal of the LDP is to collaborate in taking care of all of
-the issues of Linux documentation, ranging from online docs (man
-pages, texinfo docs, and so on) to printed manuals covering topics
-such as installing, using, and running Linux. The LDP is essentially a
-loose team of volunteers with no real central organization; anyone who
-is interested in helping is welcome to join in the effort. We feel
-that working together and agreeing on the direction and scope of Linux
-documentation is the best way to go, to reduce problems with
-conflicting efforts—e.g. two people writing two books on the same
-aspect of Linux wastes someone's time along the way.
+ <LI>Stormix Technologies' Storm Linux,
+ <a href="http://www.stormix.com/";>http://www.stormix.com/</a>
-<P>The LDP is set out to produce the canonical set of Linux online and
-printed documentation. Because our docs will be freely available (as per
-the GNU GPL) and distributed on the net, we are able to easily update the
-documentation to stay on top of the many changes in the Linux world.
+ <LI>Corel Linux,
+ <a href="http://linux.corel.com/";>http://linux.corel.com/</a>
-<P>For more info on the <A href="http://metalab.unc.edu/LDP/";>Linux
-Documentation Project</A>.
+ <LI>Floppix,
+ <a href="http://floppix.ccai.com/";>http://floppix.ccai.com/</a>
-<P>The LDP has so far produced a number of Linux documents and manuals:
+ <LI>Dlite,
+ <a href="http://opensrc.org/dlite/dlite.html";>http://opensrc.org/dlite/dlite.html</a>
-<UL>
-<LI>The full set of Linux Documentation Project manuals is
- <A href="ftp://tsx-11.mit.edu/pub/linux/docs/LDP";>available</A>.
-<LI>Here is the <A href="http://metalab.unc.edu/LDP/LDP/gs/gs.html";>Linux
- Installation and Getting Started</a>, by Matt Welsh.
-<LI>Here is the
- <A href="http://www.redhat.com:8080/HyperNews/get/khg.html";>Linux
- Kernel Hacker's Guide</A>, by Michael K. Johnson.
-<LI>Here is the
- <A href="http://metalab.unc.edu/pub/Linux/docs/linux-doc-project/users-guide/";>Linux
- User's Guide</A>, by Larry Greenfield.
-<LI>Here is the
- <A href="http://metalab.unc.edu/LDP/LDP/nag/nag.html";>Network
- Administrator's Guide</A>, by Olaf Kirch
-<LI>Here is the <A href="http://metalab.unc.edu/LDP/LDP/sag/";>System
- Administrator's Guide</A>, by Lars Wirzenius.
+ <LI>Libranet,
+ <a href="http://www.libranet.com/";>http://www.libranet.com/</a>
+
+ <LI>Progeny Linux,
+ <a href="http://www.progeny.com/";>http://www.progeny.com/</a>
</UL>
+
<HR>
+
+<H2><a name="misclinux">Miscellaneous Linux links</a></H2>
+
+<dl>
+<dt><A HREF="http://www.linux.com/";>Linux.com</A>, <A HREF="http://www.linux.org/";>Linux.org</A>
+ <dd>The community behind the Linux kernel.</dd>
-<H2><A href="http://www.ssc.com/glue";>Linux User Groups</A></H2>
+# <dt><A HREF="http://kernelnotes.org/";>KernelNotes.org</A>
+# <dd>Lots of useful kernel-related resources.</dd>
-<P>The Groups of Linux User Groups Everywhere (GLUE) web site contains
-information on all known Linux user groups around the globe. It also
-contains information on how to form a new group and a list of benefits that
-some commercial firms bestow on group members. This is a great resource for
-those new to Linux as many groups do installation workshops.
+<dt><A HREF="http://freshmeat.net/";>Freshmeat</A>,
+ <A HREF="http://sourceforge.net/";>SourceForge</A>
+ <dd>Repositories of Free Software.</dd>
+<dt><A HREF="http://www.debianplanet.org/";>Debian Planet</A>
+ <dd>A Debian-oriented news site.</dd>
+<dt><A HREF="http://www.debianhelp.org/";>debianHELP</A>
+ <dd>A help site for everything about Debian.</dd>
+</dl>
+
+
<HR>
+
+<H2><a name="lugs">Linux User Groups</a></H2>
-<H2><A href="http://www.kernel.org/";>The Linux Kernel Archives</A></H2>
+<P>The <A href="http://www.ssc.com/glue";>Groups of Linux Users
+Everywhere</A> (GLUE) web site contains information on Linux user groups
+around the globe. It also contains information on how to form a new group
+and a list of benefits that some commercial firms bestow on group members.
-<P>This is a repository for source code and information on the Linux
-kernel.
+<P><A href="http://lugww.counter.li.org/";>Linux User Groups WorldWide</A>
+has a similar goal to GLUE, but is more open.
+There are no costs involved to join and entries can be added using
+a convenient web interface.
+<P>The Linux User Groups are a great resource for both new and
+experienced Linux users. New users benefit from the free
+help and installation workshops. More experienced users can
+meet others with similar interests and join in the more
+technical tutorials offered.
+
<HR>
-<H2>Newsgroups</H2>
+<H2><a name="usenet">Newsgroups</a></H2>
<P>There are a couple of Linux related newsgroups available. Even so they are
not Debian-specific, they can provide Debian users with a lot of information.
@@ -174,32 +171,37 @@
<DD>Networking related topics.</DD>
<DT><A href="news:comp.os.linux.setup";>comp.os.linux.setup</A></DT>
-<DD>Setup and Configuration of Linux systems</DD>
+<DD>Setup and configuration of Linux systems</DD>
<DT><A href="news:comp.os.linux.x";>comp.os.linux.x</A></DT>
-<DD>Using the X windows system on Linux computers</DD>
+<DD>Using the X window system on Linux computers</DD>
</DL>
<HR>
-<H2>General UNIX Information</H2>
+<H2><a name="unix">General Unix Information</a></H2>
<UL>
-<LI><A href="http://www.polaris.net/ugu/";>Unix Guru Universe</A>
-<LI><A href="http://www.usenix.org/";>The Usenix Association</A>
+ <LI><A HREF="http://www.usenix.org/";>The Usenix Association</A>
+ <LI><A HREF="http://www.unixpower.org/";>UnixPower.org</A>
+ <LI><A HREF="http://www.ugu.com/";>Unix Guru Universe</A>
+ <LI><A HREF="http://www.geek-girl.com/Unixhelp/";>UNIXhelp for users</A>
+ <LI><A HREF="http://attila.stevens-tech.edu/~khockenb/comp-unix-admin.html";>
+ comp.unix.admin FAQ</A>
</UL>
+
<HR>
+
+<H2><a name="otherfreeos">Other Free Operating System Projects</a></H2>
-<H2>Other Free Operating System Projects</H2>
<UL>
-<LI><A href="http://www.freebsd.org/";>FreeBSD</A>
-<LI><A href="http://www.netbsd.org/";>NetBSD</A>
-<LI><A href="http://www.openbsd.org/";>OpenBSD</A>
-<LI><A href="http://www.cs.hut.fi/~jvh/lites.html";>Lites</A> a 4.4bsd server on
-top of a <EM>Mach</EM> kernel.
-<LI><A href="http://www.gnu.ai.mit.edu/software/hurd/hurd.html";>GNU Hurd</A>
-<LI><A href="http://www.freedos.org/";>FreeDOS</A>
+ <LI><A HREF="http://www.freebsd.org/";>FreeBSD</A>
+ <LI><A HREF="http://www.netbsd.org/";>NetBSD</A>
+ <LI><A HREF="http://www.openbsd.org/";>OpenBSD</A>
+ <LI><A HREF="http://www.cs.hut.fi/~jvh/lites.html";>Lites</A>
+ <LI><A HREF="http://www.gnu.org/software/hurd/";>GNU Hurd</A>
+ <LI><A HREF="http://www.freedos.org/";>FreeDOS</A>
</UL>
+++++++++++++++++++++++++++++ END OF english/related_links.wml
+++++++++++++++++++++++++++++ CHANGES IN english/News/index.wml
Index: english/News/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/News/index.wml,v
retrieving revision 1.7
retrieving revision 1.13
diff -u -u -r1.7 -r1.13
--- english/News/index.wml 1999/02/22 18:02:24 1.7
+++ english/News/index.wml 2000/11/19 22:32:25 1.13
@@ -1,11 +1,26 @@
-#use wml::debian::template title="Latest News"
+#use wml::debian::template title="Latest News" NOHEADER="true"
#use wml::debian::recent_list
-<:= get_recent_list ('1999', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :>
+<h1><a href="$(CUR_YEAR)/">Latest News</a></h1>
-<hr>
-News items from previous years can be viewed using the following pages:<br>
+<p><:= get_recent_list ('$(CUR_YEAR)', '0', '$(ENGLISHDIR)/News', '', '\d+\w*') :>
+
+<hrline>
+
+<p>You can get the latest Debian news by
+<a href="$(HOME)/MailingLists/subscribe">subscribing</a> to or browsing the
+archives for our <a href="http://lists.debian.org/debian-announce-$(mlyear)/">
+<strong>debian-announce</strong></a> and
+<a href="http://lists.debian.org/debian-news-$(mlyear)/">
+<strong>debian-news</strong></a> mailing lists.
+
+<p>Those seeking information about current events in Debian development
+may be interested in the <a href="weekly/">Debian Weekly News</A>
+
+<p>News items from previous years can be viewed using the following pages:
+<br>
+<div align="center">
<a href="1999/">1999</a>
<a href="1998/">1998</a>
<a href="1997/">1997</a>
-
+</div>
+++++++++++++++++++++++++++++ END OF english/News/index.wml
+++++++++++++++++++++++++++++ CHANGES IN english/distrib/index.wml
Index: english/distrib/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/index.wml,v
retrieving revision 1.4
retrieving revision 1.19
diff -u -u -r1.4 -r1.19
--- english/distrib/index.wml 1999/04/01 04:49:44 1.4
+++ english/distrib/index.wml 2000/11/16 23:00:52 1.19
@@ -1,25 +1,71 @@
#use wml::debian::template title="Distribution"
+<H2>Intro</H2>
+
<P>You probably entered this page because you would like to install Debian.
-There are two methods of getting Debian: you can download the distribution
-off the net (using FTP) or you can buy a set of CDs.
+There are two methods of getting Debian:
+<UL>
+ <LI>download the distribution <A HREF="ftplist">off the net</A>
+ (using HTTP, FTP or rsync) from one of our mirrors
+ <LI>buy <A HREF="vendors">a set of CDs</A> from one of the vendors selling
+ Debian CDs.
+</UL>
<P>It is recommended that first time installers buy the CD set as the
installation is more straightforward. Many of the vendors sell the
distribution for less than US$5 plus shipping (check their web page to
see if they ship internationally).
+
+<P>The <A HREF="../releases/stable/">Debian stable release</A> area contains
+Release Notes and the Installation Manual for the current stable release.
+The Installation Manual for your target architecture contains instructions
+and links for all the files you need to install.
+
+<H2>Manpower</H2>
+
+<P>The release cycles are guided by the hand of Anthony Towns.
+The main FTP archives are managed by Guy Maor, James Troup, Richard
+Braakman, Antti-Juhani Kaijanaho and Gergely Madarasz.
+
+<P>Each package has its own maintainer, full list of which you can find
+<A HREF="../devel/people">here</A>.
-<P>The installation instructions for Debian can be found at
-<a href="ftp://ftp.debian.org/debian/dists/stable/main/disks-i386/current/install.html";>
-ftp://ftp.debian.org/debian/dists/stable/main/disks-i386/current/install.html</a>.
-<BR><STRONG>The list of files you need for installation using the net can
-be found in the installation instructions</STRONG>.
+<H2>Install System Team</H2>
+<P>A very important part of any distribution are the boot floppies, because
+without these, getting an initial install is nigh impossible. The e-mail
+address for contacting the Debian install system team is
+debian-boot@lists.debian.org.
+
+<P>The current team is coordinated by Adam Di Carlo, and members are:
<UL>
-<LI><A HREF="packages">On-line list of Packages in Debian</A> - what software
-does Debian include
-<LI><A HREF="ftplist">Download via FTP</A> - getting Debian off the net
-<LI><A HREF="vendors">Debian on CD</A> - list of CD vendors
-<LI><A HREF="books">Debian Books</A> - list of books about Debian, some that come with CDs
+ <LI>i386: Enrique Zanardi, Marcel Harkema, Karl M. Hegbloom
+ <LI>m68k: Michael Schmitz, Christian T. Steiges, Nick Holgate
+ <LI>alpha: Loic Prylli, David Huggins-Daines, Andrew D Lenharth
+ <LI>sparc: Eric Delaunay, Ben Collins
+ <LI>powerpc: Hartmut Koptein, Matt Porter, Daniel Jacobowitz
+ <LI>arm: Jim Pick, Jim Studt
+ <LI>various other things: Martin Bialasinski, Randolph Chung,
+ Erik Andersen, Joey Hess, Stefan Gybas
</UL>
+<H2>Quality Assurance</H2>
+
+<P>The goal of our Quality Assurance ("QA") is to improve Debian wherever
+it can be improved, and to keep the quality of the distribution as
+high as it should be.
+
+<P>Currently, the Quality Assurance group is still in the process of
+creation, although the idea exists for quite some time. Visit the
+<A HREF="http://qa.debian.org/";>Quality Assurance</A> web pages to find
+out more information about the effort.
+
+<H2>Helpful resources</H2>
+
+<P>People often wonder what exact software does Debian GNU/Linux include, so
+we have provided a <A HREF="packages">list of all packages</A> in Debian,
+which includes links to pages with more detailed information about each
+package, and search engines for packages and their contents.
+
+<P>We have compiled a list of <A HREF="books">books about Debian</A>, some
+of which come with CDs.
+++++++++++++++++++++++++++++ END OF english/distrib/index.wml
+++++++++++++++++++++++++++++ CHANGES IN english/doc/index.wml
Index: english/doc/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/doc/index.wml,v
retrieving revision 1.12
retrieving revision 1.24
diff -u -u -r1.12 -r1.24
--- english/doc/index.wml 1999/03/10 16:03:28 1.12
+++ english/doc/index.wml 2000/11/13 15:44:04 1.24
@@ -1,55 +1,89 @@
#use wml::debian::template title="User Documentation"
-<H2>Frequently Asked Questions</H2>
+<P>An important part of any operating system is documentation, as there is
+no way to make use of something you can't operate. Debian is making every
+effort to provide all of its users with proper documentation, in an easily
+accessible form.
+
+<P>The <A HREF="ddp">Debian Documentation Project</A> pages contain
+general information about the status of most Debian-related documentation
+in our distribution, and links to most of the documents.
-If you have a question that you can't figure out on your own, it is most
+<HR>
+
+<H2>Finding answers</H2>
+
+<P>Information on installing Debian GNU/Linux can be found on the
+<A HREF="../releases/stable/#new-inst">stable release</a> page. Before
+installation, you should check the
+<A HREF="http://metalab.unc.edu/mdw/HOWTO/Hardware-HOWTO.html";>Linux Hardware
+Compatibility HOWTO</A>.
+
+<P>There is a user-oriented manual for Debian GNU/Linux, titled
+<A HREF="http://www.newriders.com/debian/html/noframes/";>Debian GNU/Linux: Guide to Installation and Usage</A>. Mark Stone of Linux.com has written a nice
+<A href="../releases/potato/installguide/">installation guide</A> for
+Debian 2.2.
+
+<P>If you have a question that you can't figure out on your own, it is most
likely that others had the same question in the past. The answers of
-frequently asked questions are kept in so-called FAQs. There
-is one specially for Debian and another one for Linux in general.
-<UL>
-<LI><A HREF="FAQ/">The Debian FAQ</A>
-<LI><A HREF="http://metalab.unc.edu/LDP/FAQ/Linux-FAQ-1.html";>The Linux FAQ</A>
-</UL>
+frequently asked questions are kept in so-called FAQs.
+<P>The <A HREF="http://www.linuxdoc.org/FAQ/Linux-FAQ/index.html";>Linux
+FAQ</A> contains information regarding Linux in general. Questions
+specifically related to Debian are answered in the <A HREF="FAQ/">Debian
+GNU/Linux FAQ</A>.
+
+<P>In addition to the traditional FAQ, Debian has set up a
+<A HREF="http://www.debian.org/cgi-bin/fom";>FAQ-O-Matic</A>, a FAQ where
+users can submit and answer questions. It is becoming an invaluable resource,
+as the large number of people, Debian developers and users, are helping to
+keep this current.
+
<HR>
-<H2>Debian also has a user run FAQ</H2>
-In addition to the traditional FAQ,
-Debian has set up a <A HREF="http://www.debian.org/cgi-bin/fom";>FAQOMATIC</A>.
-It is a FAQ, where users can submit and answer
-questions. With a large number of people helping to keep this current
-(the entire Debian user base), this is becoming an invaluable resource.
-Please check it before asking questions on debian-user.
-<P>We are still looking for people to help administer this. If interested,
-please contact Igor Grobman <<A HREF="mailto:igor@debian.org";>igor@debian.org</A>>.
+<H2><A HREF="http://www.linuxdoc.org/docs.html#howto";>Linux HOWTO's</A></H2>
-<HR>
-<H2>Installing Debian</H2>
+<P>As there are so many configurations possible for the setup and
+maintenance of a Linux systems, knowledgeable people have provided
+comprehensive instructions on how to do many specific tasks. For good reason
+they are called HOWTOs. If you need your Debian system to do something that
+isn't covered by the normal Debian setup, this is a good resource to check.
+
+<P>The HOWTO's are actually part of the Linux Documentation Project. They
+are also available for installation on your machine in the doc-linux-text
+package.
+
+<H2><A HREF="http://www.linuxdoc.org/";>Linux Documentation Project</A></H2>
+
+<P>Linux documentation is coordinated through the efforts of the
+<A HREF="http://www.linuxdoc.org/";>Linux Documentation Project</A>.
+The overall goal of the LDP is to collaborate in taking care of all of
+the issues of Linux documentation, ranging from online docs (man
+pages, texinfo docs, and so on) to printed manuals covering topics
+such as installing, using, and running Linux. For more information about
+LDP, please visit their <A HREF="http://www.linuxdoc.org/";>web pages</A>.
-Information on installating Debian can be found on the
-<a href="../releases/stable/">Debian Installation Page</a>.
-Debian is available by <A HREF="../distrib/ftplist">FTP</A> or by buying a CD from a
-<A HREF="$(DISTRIB)/vendors">vendor</A>. It is recommended that a CD be used for
-initial installations.
-
-<P>Before installation, you should check the
-<A HREF="http://metalab.unc.edu/mdw/HOWTO/Hardware-HOWTO.html";>Linux Hardware Compatibility
-HOWTO</A>.
+<P>The LDP has so far produced a number of Linux documents and manuals, and
+some of the most popular ones are:
-<HR>
-<H2>Debian User's Manual</H2>
+<UL>
+ <LI>The <A HREF="http://www.linuxdoc.org/LDP/gs/gs.html";>Linux
+ Installation and Getting Started</a>, by Matt Welsh and others.
+ <LI>The <A HREF="http://www.linuxdoc.org/LDP/khg/HyperNews/get/";>Linux
+ Kernel Hacker's Guide</A>, by Michael K. Johnson.
+ <LI>The <A HREF="http://metalab.unc.edu/pub/Linux/docs/linux-doc-project/users-guide/";>Linux
+ User's Guide</A>, by Larry Greenfield.
+ <LI>The <A HREF="http://www.linuxdoc.org/LDP/nag/nag.html";>Network
+ Administrator's Guide</A>, by Olaf Kirch.
+ <LI>The <A HREF="http://www.linuxdoc.org/LDP/sag/";>System Administrator's
+ Guide</A>, by Lars Wirzenius and others.
+</UL>
-*This is a work on progress *<BR>
-Work is under way to create a
-<A HREF="http://www.debian.org/~hp/debian-tutorial.html";>user tutorial</A>
-for Debian. It is incomplete, but should still be useful.
+<P>The full set of Linux Documentation Project manuals is
+<A HREF="ftp://tsx-11.mit.edu/pub/linux/docs/LDP";>available</A>.
<HR>
-<H2>The Debian Documentation Project</H2>
-
-The Debian Documentation Project was formed to coordinate the effort
-of several Debian developers to write more and better documentation
-for the Debian system. If you are interested, you can have a look at
-the <a href="http://www.debian.org/~elphick/ddp/";>DDP home page</a>.
-<P>
+<P>If you have checked the above resources and still can't find answers to
+your questions or solutions to your problems regarding Debian, take a look
+at our <A HREF="../support">support page</A>.
+++++++++++++++++++++++++++++ END OF english/doc/index.wml
+++++++++++++++++++++++++++++ CHANGES IN english/events/index.wml
Index: english/events/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/events/index.wml,v
retrieving revision 1.13
retrieving revision 1.20
diff -u -u -r1.13 -r1.20
--- english/events/index.wml 1999/01/22 00:34:03 1.13
+++ english/events/index.wml 2000/02/11 18:42:51 1.20
@@ -1,4 +1,4 @@
-#use wml::debian::basic title="Debian GNU/Linux — Upcoming Attractions"
+#use wml::debian::basic title="Upcoming Attractions"
#use wml::debian::languages
#words and phrases to translate
@@ -19,94 +19,26 @@
<define-tag past_words>past events</define-tag>
<define-tag none_word>none</define-tag>
-<perl>
-sub get_event_list {
- my ( $path, $number, $current_dir ) = @_;
-
-
- $str=""; $over=""; $current=""; $unknown="";
-
- opendir(DIR, "$current_dir/$path");
- @files = grep { /^\d+.*.wml$/ && -f "$current_dir/$path/$_" } readdir(DIR);
- @files = sort @files;
- closedir DIR;
-
- $count = 0;
- foreach (@files) {
- $count++;
- open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
- if ( /(\d+.*).wml/ ) {
- $base = $1;
- }
- $title = ''; $when = ''; $where = ''; $desc = ''; $past = '';
- foreach $line (<FILE>) {
- if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) {
- $title = $1;
- }
- elsif ($line =~ /^#use wml::debian::past_event$/) {
- $past = 'yes';
- }
- elsif ($line =~ /^#use wml::debian::event$/) {
- $past = 'no';
- }
- elsif ($line =~ /^<define-tag date>(.*)<\/define-tag>$/) {
- $when = $1;
- }
- elsif ($line =~ /^<define-tag where>(.*)<\/define-tag>$/) {
- $where = $1;
- }
- elsif ($line =~ /^<define-tag desc>(.*)<\/define-tag>$/) {
- $desc = $1;
- }
-
- if ($title && $when && $where) {
- $str1 = "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG><A HREF=\"$path/$base\">$title</A></STRONG> ($where)</TD></TR>\n";
- }
- elsif ($title && $when) {
- $str1 = "<TR><TD width=120><TT>[$when]</TT></TD><TD><STRONG><A HREF=\"$path/$base\">$title</A></STRONG></TD></TR>\n";
- }
-
- if ($past && $title && $when && $where ) {
- last;
- }
- }
- if ( $past eq "yes" )
- {
- $over .= $str1;
- }
- elsif ( $past eq "no" )
- {
- $current .= $str1;
- }
- else
- {
- $unknown .= $str1;
- }
- close FILE;
- if ($count eq $number) { last; }
- }
-close DIR;
-if ( $over eq "" && $current eq "" && $unknown eq "" )
-{
- $str = "$path - [<none_word>]<BR>";
-}
-else
-{
- $str = "";
- if ( $current ne "" ) { $str .= "<H3>$path <event_word></H3><TABLE>$current</TABLE>"; }
- if ( $over ne "" ) { $str .= "<A HREF=\"./$path/\">$path - <past_words></A><BR>"; }
- if ( $unknown ne "" ) { $str .= "<H3>$path Unknown (indicates bug)</H3><TABLE>$unknown</TABLE>"; }
-}
-return $str;
-}
-</perl>
+#include "../../english/events/index.include"
<p>
<intro>
-<:= get_event_list ('1999', '0', '$(ENGLISHDIR)/events' ) :>
+#
+# This has been redone. See index.wml.README for details. Email me if
+# you have any difficulties.
+#
+# - blackie@sfcc.net
-<:= get_event_list ('1998', '0', '$(ENGLISHDIR)/events' ) :>
+<:= get_future_event_list('$(ENGLISHDIR)/events','','','futurefirst') :>
+
+#<:= get_event_list ('1999', '0', '$(ENGLISHDIR)/events' ) :>
+
+#<:= get_event_list ('2000', '0', '$(ENGLISHDIR)/events' ) :>
+
+#<:= get_event_list ('1998', '0', '$(ENGLISHDIR)/events' ) :>
+
+<:= get_past_event_list('$(ENGLISHDIR)/events','','','futurefirst') :>
<:= languages() :>
#use wml::debian::footer
+++++++++++++++++++++++++++++ END OF english/events/index.wml
+++++++++++++++++++++++++++++ CHANGES IN english/intro/free.wml
Index: english/intro/free.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/free.wml,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -u -r1.6 -r1.9
--- english/intro/free.wml 1999/03/03 02:10:25 1.6
+++ english/intro/free.wml 2000/11/15 03:10:50 1.9
@@ -1,21 +1,18 @@
#use wml::debian::template title="What Does Free Mean?" NOHEADER="yes"
-<H1>What Does Free Mean?
-<tt>or</tt> What do you mean by Open Software?</H1>
+<H1>What Does Free Mean? <tt>or</tt> What do you mean by Free Software?</H1>
-<b>Note:</b> In February 1998 a group moved to replace the term "Free
-Software" by "Open Software". As will become clear in the discussion
-below, they both refer to the same thing since "Open" refers to the availability
-of the source code. As both are in common usage it was decided to
-keep this document (with minor modifications) at this time.
+<P><strong>Note:</strong> In February 1998 a group moved to replace the term
+"Free Software" with "Open Source Software". As will become clear in the
+discussion below, they both refer to essentially the same thing.
<P>Many people new to free software find themselves confused because
the word "free" in the term "free software" is not used the way they expect.
To them free means "at no cost".
-My dictionary lists seventeen different meanings for "free".
+An English dictionary lists almost twenty different meanings for "free".
Only one of them is "at no cost". The rest refer to liberty
and lack of constraint. When we speak of <em>Free Software</em>,
-we mean freedom not price.
+we mean freedom, not price.
<P>Software that is free only in the sense that you don't need to pay
to use it is hardly free at all. You may be forbidden to pass it on,
@@ -71,25 +68,22 @@
Luckily, there are a number of licenses already written that probably
do what you want.
-<P>Four of the most widely found licenses are:
+<P>Three of the most widely found licenses are:
<UL>
-<LI>The <A HREF="http://www.gnu.org/";>GNU General Public License (GPL)</A>.
-Some good background information on software licenses and a copy of the license can
-be found at
-<A HREF="http://www.gnu.org/copyleft/copyleft.html";>http://www.gnu.org/copyleft/copyleft.html</A>.
+<LI>The <A HREF="http://www.gnu.org/copyleft/gpl.html";>GNU General Public
+License (GPL)</A>. Some good background information on software licenses
+and a copy of the license can be found at
+<A HREF="http://www.gnu.org/copyleft/copyleft.html";>the GNU web site</A>.
This is the most common free license in use in the world.
-<LI>Artistic License
-<A HREF="http://language.perl.com/misc/Artistic.html";>http://language.perl.com/misc/Artistic.html</A>.
+<LI><A HREF="http://language.perl.com/misc/Artistic.html";>Artistic License</A>.
<LI><A HREF="../misc/bsd.license">BSD style license</A>.
-
-<LI><A HREF="../misc/modified.bsd.license">Modified BSD license</A>.
</UL>
<!--
Clearly, no single license will fit everyone's needs. To help people select
the license that is most appropriate for them, you might like to look at
-our <A HREF="license_disc">comparison of common Free (Open) Software licenses</A>.
+our <A HREF="license_disc">comparison of common Free Software licenses</A>.
-->
<P>Some of the features these licenses have in common.
@@ -100,24 +94,25 @@
to whomever you want (free or open redistribution).
<LI>There are no restrictions on modifying the software (except for keeping certain
notices intact).
-<LI>There is no restriction on selling the software.
+<LI>There is no restriction on distributing, or even selling, the software.
</UL>
<P>This last point, which allows the software to be sold for money seems to go
against the whole idea of free software. It is actually one of its strengths.
Since the license allows free redistribution, once one person gets a copy
they can distribute it themselves. They can even try to sell it.
-The idea behind this is that it costs essentially no money to make electronic
+In practice, it costs essentially no money to make electronic
copies of software. Supply and demand will keep the cost down. If it
is convenient for a large piece of software or an aggregate of software
to be distributed by some media, such as CD, the vendor is free to charge
what they like. If the profit margin is too high, however, new vendors will
enter the market and competition will drive the price down.
-As a result, you can buy a 2 CD distribution of Debian for less than $5US.
+As a result, you can buy a full 3 CD distribution of Debian for as little
+as $6US.
<P>While free software is not totally free of constraints (only putting something
in the public domain does that) it gives the user the flexibility
-to do what he needs in order to get work done. At the same time, it protects
+to do what they need in order to get work done. At the same time, it protects
the rights of the author. Now that's freedom.
<P>Debian GNU/Linux is a strong supporter of free software. Since many different
@@ -126,4 +121,3 @@
were developed to come up with a reasonable definition of what
constitutes free software. Only software that complies with the DFSG is allowed
in the main distribution of Debian.
-
+++++++++++++++++++++++++++++ END OF english/intro/free.wml
+++++++++++++++++++++++++++++ CHANGES IN english/security/index.wml
Index: english/security/index.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/security/index.wml,v
retrieving revision 1.34
retrieving revision 1.36
diff -u -u -r1.34 -r1.36
--- english/security/index.wml 2000/08/09 16:19:24 1.34
+++ english/security/index.wml 2000/11/18 16:32:02 1.36
@@ -14,33 +14,40 @@
higher than the one shown in this area fixing the bug, then use the newer
version.
-<P>For the latest Debian security information, subscribe to the <A
-HREF="/MailingLists/subscribe">debian-security-announce </A>mailing list. List
-archives are available for
+<P>For the latest Debian security information, subscribe to the
+<A HREF="/MailingLists/subscribe">debian-security-announce</A> mailing list.
+List archives are available for
# there does not appear to be a debian-security-announce-97 archive
-# <a href=http://lists.debian.org/debian-security-announce-97/>1997</a>,
-<a href=http://lists.debian.org/debian-security-announce-98/>1998</a>,
-<a href=http://lists.debian.org/debian-security-announce-99/threads.html>1999</a>
+# <A HREF="http://lists.debian.org/debian-security-announce-97/";>1997</A>,
+<A HREF="http://lists.debian.org/debian-security-announce-98/";>1998</A>,
+<A HREF="http://lists.debian.org/debian-security-announce-99/";>1999</A>
and
-<a href=http://lists.debian.org/debian-security-announce-00/threads.html>2000</a>.
-PGP/GPG keys for the security team are available <a
-href="keys.txt">here</a>.</P>
+<A HREF="http://lists.debian.org/debian-security-announce-00/";>2000</A>.
+PGP/GPG keys for the security team are available
+<A href="keys.txt">here</A>.</P>
<p>You may find it convenient to use apt to get the latest security updates.
-This requires a line such as <br><code>deb http://security.debian.org/ slink
-updates</code><br> or <br><code>deb http://security.debian.org/ potato/updates
-main contrib non-free</code><br> in your /etc/apt/sources.list file.
+This requires a line such as
+<BLOCKQUOTE>
+<code>deb http://security.debian.org/ potato/updates main contrib non-free</code>
+</BLOCKQUOTE>
+in your <CODE>/etc/apt/sources.list</CODE> file.
-<P>Send security-related bug reports to <A HREF="mailto:security@debian.org";>
-security@debian.org</A></P>
+<P>Please send security-related bug reports to
+<A href="mailto:security@debian.org";>security@debian.org</A>.
+<br>
+(Developers may use debian-security and debian-security-private mailing
+lists in order to inform the security team members of problems in their
+packages.)</P>
-<H1>Recent Alerts</H1>
+<H2>Recent Alerts</H2>
+
<:= get_recent_list( '2000', '6', '$(ENGLISHDIR)/security', 'list', '\d+\w*' ) :>
-<H1>Other Alerts</H1>
-Security Alerts announced in <A HREF="2000/">2000</A><BR>
-Security Alerts announced in <A HREF="1999/">1999</A><BR>
-Security Alerts announced in <A HREF="1998/">1998</A><BR>
-Security Alerts announced in <A HREF="1997/">1997</A><BR>
-<A HREF="undated/">Undated</A> Security Alerts included for posterity.<BR>
+<H2>Other Alerts</H2>
+<p>Security Alerts announced in <A href="2000/">2000</A><BR>
+Security Alerts announced in <A href="1999/">1999</A><BR>
+Security Alerts announced in <A href="1998/">1998</A><BR>
+Security Alerts announced in <A href="1997/">1997</A><BR>
+<A href="undated/">Undated</A> Security Alerts included for posterity.<BR>
+++++++++++++++++++++++++++++ END OF english/security/index.wml
Reply to: