X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=resources.dbk;h=0c1c75ac1552795ea940a1611efe0fb43326ac0d;hp=57b3824f18faf2c02783c0a0f65be812ea79f1bd;hb=b15bd896f2fb4eebad30139a23104bee6b5eabd4;hpb=917680c03685a473f8fc55f8aeb2238991b48101
diff --git a/resources.dbk b/resources.dbk
index 57b3824..0c1c75a 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -141,7 +141,8 @@ similarly named channels for speakers of other languages.
The main channel for Debian development is #debian-devel.
-It is a very active channel since usually over 150 people are always logged in.
+It is a very active channel; it will typically have a minimum of 150 people
+at any time of day.
It's a channel for people who work on Debian, it's not a support channel
(there's #debian for that). It is however open to anyone
who wants to lurk (and learn). Its topic is commonly full of interesting
@@ -164,7 +165,7 @@ talk about documentation, like the document you are reading. Other channels
are dedicated to an architecture or a set of packages:
#debian-kde, #debian-dpkg,
#debian-jr, #debian-edu,
-#debian-oo (OpenOffice package) ...
+#debian-oo (OpenOffice.org package)...
Some non-English developers' channels exist as well, for example
@@ -221,7 +222,7 @@ volunteers.
Please take care to protect your Debian passwords and SSH keys installed on
Debian machines. Avoid login or upload methods which send passwords over the
-Internet in the clear, such as telnet, FTP, POP etc.
+Internet in the clear, such as Telnet, FTP, POP etc.
Please do not put any material that doesn't relate to Debian on the Debian
@@ -283,7 +284,7 @@ It is restricted; a mirror is available on merkel.
Problems with the Debian FTP archive generally need to be reported as bugs
against the &ftp-debian-org;
pseudo-package or an email to &email-ftpmaster;, but also see
-the procedures in .
+the procedures in .
@@ -357,7 +358,7 @@ Executing shell in chroot: /org/vore.debian.org/chroots/user/unstable
In all chroots, the normal user home directories are available. You can find
out which chroots are available via
-&url-devel-machines;.
+.
@@ -453,13 +454,13 @@ distributions is arranged in an identical manner. What we describe below for
In each of the areas, there is a directory for the source packages
(source) and a directory for each supported architecture
-(binary-i386, binary-m68k, etc.).
+(binary-i386, binary-amd64, etc.).
The main area contains additional directories which hold
the disk images and some essential pieces of documentation required for
installing the Debian distribution on a specific architecture
-(disks-i386, disks-m68k, etc.).
+(disks-i386, disks-amd64, etc.).
Sections
@@ -487,7 +488,7 @@ non-free packages.
Packages which do not conform to the DFSG are placed in the
non-free section. These packages are not considered as
-part of the Debian distribution, though we support their use, and we provide
+part of the Debian distribution, though we enable their use, and we provide
infrastructure (such as our bug-tracking system and mailing lists) for non-free
software packages.
@@ -640,7 +641,7 @@ automatically by taking packages from unstable if they
satisfy certain criteria. Those criteria should ensure a good quality for
packages within testing. The update to testing
is launched twice each day, right after the new packages
-have been installed. See .
+have been installed. See .
After a period of development, once the release manager deems fit, the
@@ -754,7 +755,7 @@ space on people.debian.org.
When uploading to unstable a package which had bugs fixed
-in experimental, please consider using the option
+in experimental, please consider using the option
-v to dpkg-buildpackage to finally get
them closed.
@@ -776,7 +777,7 @@ There is also a ``pseudo-distribution'', called
sid, which is the current unstable
distribution; since packages are moved from unstable to
testing as they approach stability, sid
-itself is never released. As well as the usual contents of a Debian
+itself is never released. As well as the usual contents of a Debian
distribution, sid contains packages for architectures which
are not yet officially supported or released by Debian. These architectures
are planned to be integrated into the mainstream distribution at some future
@@ -802,7 +803,7 @@ was 1.1, and not 1.0.)
Thus, the names of the distribution directories in the archive are determined
-by their code names and not their release status (e.g., `slink'). These names
+by their code names and not their release status (e.g., `squeeze'). These names
stay the same during the development period and after the release; symbolic
links, which can be changed easily, indicate the currently released stable
distribution. That's why the real distribution directories use the
@@ -882,11 +883,11 @@ script is called to ask all the primary mirrors to update themselves.
The archive maintenance software will also send the OpenPGP/GnuPG signed
.changes file that you uploaded to the appropriate mailing
-lists. If a package is released with the Distribution: set
+lists. If a package is released with the Distribution set
to stable, the announcement is sent to
&email-debian-changes;. If a package is released with
-Distribution: set to unstable or
-experimental, the announcement will be posted to
+Distribution set to unstable or
+experimental, the announcement will be posted to
&email-debian-devel-changes; instead.
@@ -918,7 +919,7 @@ one of those directories will be moved to the real unchecked
directory after the corresponding number of days.
This is done by a script which is run each day and which moves the
packages between the directories. Those which are in "1-day" are
-installed in unchecked while the others are moved to the
+installed in unchecked while the others are moved to the
adjacent directory (for example, a package in 5-day will
be moved to 4-day). This feature is particularly useful
for people who are doing non-maintainer uploads. Instead of
@@ -931,7 +932,7 @@ the NMU.
The use of that delayed feature can be simplified with a bit
-of integration with your upload tool. For instance, if you use
+of integration with your upload tool. For instance, if you use
dupload (see ), you can add this
snippet to your configuration file:
@@ -1136,6 +1137,14 @@ example Ubuntu).
+
+derivatives-bugs
+
+
+Bugs reports and comments from derivative distributions (for example Ubuntu).
+
+
+
The PTS email interface
@@ -1235,6 +1244,12 @@ distributions
+derivatives-bugs: bugs reports and comments from derivative
+distributions
+
+
+
+
upload-source: announce of a new source upload that has been
accepted
@@ -1354,7 +1369,7 @@ Once you set up the VCS repository to generate commit notifications, you just
have to make sure it sends a copy of those mails to
sourcepackage_cvs@&pts-host;.
Only the people who accept the cvs keyword will receive
-these notifications. Note that the mail need to be sent from a
+these notifications. Note that the mail needs to be sent from a
debian.org machine, otherwise you'll have to add
the X-PTS-Approved: 1 header.
@@ -1372,7 +1387,7 @@ url="http://&pts-host;/"> that puts together a lot of
information about each source package. It features many useful links (BTS, QA
stats, contact information, DDTP translation status, buildd logs) and gathers
much more information from various places (30 latest changelog entries, testing
-status, ...). It's a very useful tool if you want to know what's going on with
+status, etc.). It's a very useful tool if you want to know what's going on with
a specific source package. Furthermore there's a form that allows easy
subscription to the PTS via email.
@@ -1472,7 +1487,7 @@ item.
Here are a few examples of valid mails used to generate news items in the PTS.
-The first one adds a link to the cvsweb interface of debian-cd in the Static
+The first one adds a link to the viewsvn interface of debian-cd in the Static
information section:
@@ -1535,7 +1550,7 @@ responsibility.
Alioth is a Debian service based on a slightly modified version of the
FusionForge software (which evolved from SourceForge and GForge). This software offers
developers access to easy-to-use tools such as bug trackers, patch
-manager, project/task managers, file hosting services, mailing lists, CVS
+manager, project/task managers, file hosting services, mailing lists, VCS
repositories etc. All these tools are managed via a web interface.