Translations for the debian web site maintained by Marilleau Hugues
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/distrib/packages.wml
Index: english/distrib/packages.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/distrib/packages.wml,v
retrieving revision 1.11
retrieving revision 1.26
diff -u -u -r1.11 -r1.26
--- english/distrib/packages.wml 1999/03/10 07:30:15 1.11
+++ english/distrib/packages.wml 2000/11/23 22:09:32 1.26
@@ -1,80 +1,141 @@
#use wml::debian::template title="Packages"
+#include "$(ENGLISHDIR)/releases/info"
<DL>
-<DT><A href="$(HOME)/Packages/stable/">
- View the packages in the <STRONG>stable</STRONG> main, contrib, non-free and non-us distributions
-</A>
-<DD>
-<DL>
-<DT>Main
- <DD> The latest release of the main distribution of Debian.
- All packages are available free of charge.
- They are all released under a copyright that allows for free
- redistribution and come with full source code.
-<DT>Contrib
- <DD> Packages in this directory are free themselves but depend on other
- non-free software, such as Motif. They can't be part
- of a pure free software distribution like Debian <abbr>GNU</abbr>/Linux.
-<DT>Non-Free
- <DD> Packages in this directory do not necessarily cost money, but
- have some onerous condition restricting the redistribution of the
- software.
-<DT>Non-US
- <DD> These packages cannot be exported from the USA, they are
- mostly encryption software packages. Some of them are non-free too.
-</DL>
-<DT><A href="$(HOME)/Packages/unstable/">View the packages in the <STRONG>unstable</STRONG> distributions</A>
- <DD> This directory contains packages that are destined for the
- main, contrib, non-free or non-us stable distributions above.
- They have either not been fully tested (and could therefore
- break your system) or have not been around long enough to make
- it into the regular distribution.
-#<DT><A href="$(HOME)/Packages/frozen/">View the packages in the <STRONG>frozen</STRONG> distributions</A>
-# <DD> This is a temporary designation a release goes through when in
-# the testing stage just prior to being released as a new stable distribution.
+
+<DT><A HREF="http://packages.debian.org/stable/";>View the packages in the
+ <STRONG>stable</STRONG> distribution</A></DT>
+ <DD>This is the latest official release of the Debian GNU/Linux
+ distribution, also referred to as `<EM>Main</EM>'. All packages are free
+ according to the <A HREF="../social_contract#guidelines">Debian Free
+ Software Guidelines</A>, assuring free use and redistribution of the
+ packages and their complete source code.
+
+ <P>There are also some additions to the <EM>main</EM> distribution, that
+ have certain restrictions not allowing them to be part of a 100% free
+ software distribution like Debian GNU/Linux. Still, they are provided by
+ Debian as a service to our users, and they include:
+ <BLOCKQUOTE><DL>
+ <DT><EM>Contrib</EM></DT>
+ <DD>Packages in this area are free themselves but depend on other
+ software that is not free.</DD>
+ <DT><EM>Non-Free</EM></DT>
+ <DD>Packages in this area do not necessarily cost money, but have some
+ onerous license condition restricting use or redistribution of the
+ software.</DD>
+ <DT><EM>Non-US/Main</EM> and <EM>Non-US/Non-Free</EM></DT>
+ <DD>These packages cannot be exported from the USA, they are mostly
+ encryption software packages, or software that is encumbered by
+ patent issues. Most of them are free, but some are non-free.</DD>
+ </DL></BLOCKQUOTE>
+ </DD>
+
+<: if ( $frozen_release_exists ) { _:>
+<DT><A HREF="http://packages.debian.org/frozen/";>View the packages in the
+ <STRONG>frozen</STRONG> distribution</A></DT>
+ <DD>This is a temporary designation a release goes through when in
+ the testing stage, just prior to being released as the new stable
+ distribution.
+</DD>
+<: } :>
+
+<DT><A HREF="http://packages.debian.org/unstable/";>View the packages in the
+ <STRONG>unstable</STRONG> distribution</A></DT>
+ <DD>This area contains packages that are destined to become part of the
+ stable distribution above. They have either not been fully tested (and
+ could therefore break your system) or have not been around long enough
+ to make it into the stable distribution.</DD>
+
</DL>
<HR>
-<H2>Search Package Directories</H2>
-<FORM method="get" action="http://cgi.debian.org/cgi-bin/search_packages.pl";>
-<LABEL>Keywords: <INPUT type="text" SIZE="30" name="keywords"></LABEL>
-<INPUT type="submit" value="Search"> <INPUT type="reset">
-<BR>Search on:
-<LABEL><INPUT type="radio" name="searchon" value="names" checked> Package names only </LABEL>
-<LABEL><INPUT type="radio" name="searchon" value="all"> Descriptions </LABEL>
-<BR>Version:
-<LABEL><INPUT type="radio" name="version" value="unstable"> unstable </LABEL>
-<LABEL><INPUT type="radio" name="version" value="stable" CHECKED> stable </LABEL>
-# <LABEL><INPUT type="radio" name="version" value="frozen"> frozen </LABEL>
-<LABEL><INPUT type="radio" name="version" value="all"> all versions</LABEL>
-<BR>Release:
-<LABEL><INPUT type="radio" name="release" value="main"> main </LABEL>
-<LABEL><INPUT type="radio" name="release" value="contrib"> contrib </LABEL>
-<LABEL><INPUT type="radio" name="release" value="non-free"> non-free </LABEL>
-<LABEL><INPUT type="radio" name="release" value="non-us"> non-us </LABEL>
-<LABEL><INPUT type="radio" name="release" value="all" CHECKED> all </LABEL>
-<P>Searches on package names should include a single word. An asterisk, '*', can be used as a
-wildcard at the <b>end</b> of words. Searches on package descriptions can use standard boolean logic
-with the 'and' and 'or' keywords.
+
+<H2><A NAME="search_packages">Search Package Directories</A></H2>
+
+<P>This search engine will search for specified keywords in package headers
+or descriptions.
+
+<BR>
+
+<FORM METHOD="GET" ACTION="http://cgi.debian.org/cgi-bin/search_packages.pl";>
+<LABEL FOR="kw">Keywords:</LABEL>
+<INPUT TYPE="text" SIZE="30" NAME="keywords" ID="kw">
+<INPUT TYPE="submit" VALUE="Search"> <INPUT TYPE="reset">
+<BR>
+Search on:
+<INPUT TYPE=RADIO NAME="searchon" VALUE="names" ID="onlynames" CHECKED>
+<LABEL FOR="onlynames">Package names only</LABEL>
+<INPUT TYPE=RADIO NAME="searchon" VALUE="all" ID="descs">
+<LABEL FOR="descs">Descriptions</LABEL>
+<BR>
+Distribution:
+<SELECT NAME="version">
+ <OPTION VALUE="unstable">unstable</OPTION>
+ <OPTION VALUE="stable" SELECTED>stable</OPTION>
+<: if ( $frozen_release_exists ) { _:>
+ <OPTION VALUE="frozen">frozen</OPTION>
+<: } :>
+ <OPTION VALUE="all">any</OPTION>
+</SELECT>
+Section:
+<SELECT NAME="release">
+ <OPTION VALUE="main">main</OPTION>
+ <OPTION VALUE="contrib">contrib</OPTION>
+ <OPTION VALUE="non-free">non-free</OPTION>
+ <OPTION VALUE="non-us">non-US</OPTION>
+ <OPTION VALUE="all" SELECTED>any</OPTION>
+</SELECT>
</FORM>
+<P>Searches on package names should include a single word. An asterisk, '*',
+can be used as a wildcard at the <b>end</b> of words. Searches on package
+descriptions can use standard boolean logic with the 'and' and 'or'
+keywords.
+
<HR>
-<H2>Search the Contents of the Latest Release</H2>
-<P> The search above will only search package headers and descriptions.
-Thus, searches for many executables that are part of a package, but not
-listed by name in the description will not work. Here, you can search the
-contents of a release and find all packages that contains the given
-keyword in any filename.<BR>
-<FORM method=post ACTION="http://cgi.debian.org/cgi-bin/search_contents.pl";>
-Search in:
-<LABEL><INPUT type=radio name=version value=stable CHECKED> stable </LABEL>
-<LABEL><INPUT type=radio name=version value="unstable"> unstable</LABEL>
+
+<H2><A NAME="search_contents">Search the Contents of the Latest Release</A></H2>
+
+<P>This search engine allows you to search the contents of Debian
+distributions for any files (or just parts of file names) that are
+part of packages.
+
<BR>
-<LABEL><INPUT type=radio name=case value=insensitive CHECKED> case-insensitive </LABEL>
-<LABEL><INPUT type=radio name=case value=sensitive> case-sensitive</LABEL>
+<FORM METHOD="GET" ACTION="http://cgi.debian.org/cgi-bin/search_contents.pl";>
+<LABEL FOR="keyword">Keyword:</LABEL>
+<INPUT TYPE="text" SIZE=30 NAME="word" ID="keyword">
+<INPUT TYPE="submit" VALUE="Search"> <INPUT TYPE="reset">
<BR>
-<LABEL>Keyword: <INPUT type=text SIZE=30 name=word value=""></LABEL>
-<INPUT type=submit value=Search> <INPUT type="reset">
+<LABEL FOR="casesens">Case sensitive:</LABEL>
+<SELECT NAME="case" ID="casesens">
+ <OPTION VALUE="insensitive" SELECTED>no</OPTION>
+ <OPTION VALUE="sensitive">yes</OPTION>
+</SELECT>
+<LABEL FOR="distro">Distribution:</LABEL>
+<SELECT NAME="version" ID="distro">
+ <OPTION VALUE="stable" SELECTED>stable</OPTION>
+<: if ( $frozen_release_exists ) { _:>
+ <OPTION VALUE="frozen">frozen</OPTION>
+<: } :>
+ <OPTION VALUE="unstable">unstable</OPTION>
+</SELECT>
+<LABEL FOR="architecture">Architecture:</LABEL>
+<SELECT NAME="arch" ID="architecture">
+ <OPTION VALUE="i386" SELECTED>Intel x86</OPTION>
+ <OPTION VALUE="m68k">Motorola 680x0</OPTION>
+ <OPTION VALUE="alpha">Alpha</OPTION>
+ <OPTION VALUE="sparc">SPARC</OPTION>
+ <OPTION VALUE="powerpc">PowerPC</OPTION>
+ <OPTION VALUE="arm">ARM</OPTION>
+# Hurd should be a separate distribution
+# <OPTION VALUE="hurd-i386">Hurd (i386)</OPTION>
+</SELECT>
+<LABEL FOR="incdirs">Search on Directories:</LABEL>
+<SELECT NAME="directories" ID="incdirs">
+ <OPTION VALUE="yes" SELECTED>yes</OPTION>
+ <OPTION VALUE="no">no</OPTION>
+</SELECT>
</FORM>
+<P>Searches on package names will also display all files in the package.
+++++++++++++++++++++++++++++ END OF english/distrib/packages.wml
+++++++++++++++++++++++++++++ CHANGES IN english/intro/organization.wml
Index: english/intro/organization.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/organization.wml,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -u -r1.10 -r1.12
--- english/intro/organization.wml 1999/07/24 04:08:25 1.10
+++ english/intro/organization.wml 2000/09/26 21:16:50 1.12
@@ -1,11 +1,11 @@
#use wml::debian::template title="Debian's Organizational Structure"
<P>Occasionally people need to contact someone about a particular aspect of
-Debian. The following is a list of different jobs and the email address to
-use to contact the people responsible for those tasks.
+Debian. The following is a list of different jobs and the e-mail addresses
+to use in order to contact the people responsible for those tasks.
-<P>This has been maintained rather piecemeal so if anything is missing or
-incorrect please send corrections to
-<A HREF="mailto:webmaster@debian.org";>webmaster@debian.org</A>.
+#include "$(ENGLISHDIR)/intro/organization.data"
-#include "../../english/intro/organization.data"
+<P>This list can become outdated since it isn't updated automatically after
+things change. If you find anything missing or incorrect, please
+<A HREF="mailto:debian-www@lists.debian.org";>send us corrections</A>.
+++++++++++++++++++++++++++++ END OF english/intro/organization.wml
Reply to: