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

Re: [SRM] upload of debian-reference/2.46 to stable



Hi,

On Sat, Feb 26, 2011 at 05:45:21PM +0000, Adam D. Barratt wrote:
> On Fri, 2011-02-25 at 22:20 +0900, Osamu Aoki wrote:
> > | debian-reference (2.46) stable; urgency=low
> > | 
> > |   * Updated Portguese translation by Américo Monteiro.
> > |   * Fixed s/--get-selection/--get-selections/ etc. Closes: #612435
> > |   * Reflected introduction of squeeze-updates suite which replaced
> > |     Debian Volatile Service. Closes: #614224
> > |   * Fixed URL for Debian Mirror Checker site. Closes: #614253
> 
> Thanks for working on this.  The above sounds okay; is a debdiff of the
> proposed upload available somewhere?

Here it is.  (I excluded *.po and *.pot files for debdiff of dsc files
since they contain line numbers which is different due to rebuild and
causes debdiff to be 16892KB instead of 33KB).
 
> Is an upload to sid planned soon?  

Not so soon.  If I do, it will be 2.47

> If the package has the same version in stable and testing at the time
> of the point release then dak will automatically propagate the new
> stable package upwards in to testing (and unstable as well if
> required) in order to ensure that the version constraints between the
> suites are met; that may or may not be what you want.

Thanks.
 
File lists identical (after any substitutions)

Control files of package debian-reference: lines which differ (wdiff format)
----------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-common: lines which differ (wdiff format)
-----------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-de: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-en: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Installed-Size: [-4012-] {+4008+}
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-es: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-fr: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-it: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-ja: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Installed-Size: [-4408-] {+4404+}
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-pl: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-pt: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Installed-Size: [-4052-] {+4068+}
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-pt-br: lines which differ (wdiff format)
----------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-zh-cn: lines which differ (wdiff format)
----------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}

Control files of package debian-reference-zh-tw: lines which differ (wdiff format)
----------------------------------------------------------------------------------
Version: [-2.45-] {+2.46+}
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/asciidoc/02_package.txt debian-reference-2.46/asciidoc/02_package.txt
--- debian-reference-2.45/asciidoc/02_package.txt	2010-09-08 21:50:36.000000000 +0900
+++ debian-reference-2.46/asciidoc/02_package.txt	2011-02-26 09:01:01.000000000 +0900
@@ -119,7 +119,7 @@
 deb-src http://security.debian.org/ @-@codename-stable@-@/updates main contrib
 --------------------
 
-Please note "`ftp.XX.debian.org`" must be replaced with appropriate mirror site URL for your location, for USA "`ftp.us.debian.org`", which can be found in http://www.debian.org/mirror/list[the list of Debian worldwide mirror sites].  The status of these servers can be checked at http://www.de.debian.org/dmc/[Debian Mirror Checker site].
+Please note "`ftp.XX.debian.org`" must be replaced with appropriate mirror site URL for your location, for USA "`ftp.us.debian.org`", which can be found in http://www.debian.org/mirror/list[the list of Debian worldwide mirror sites].  The status of these servers can be checked at http://ftp.de.debian.org/dmc/[Debian Mirror Checker site].
 
 Here, I tend to use codename "`@-@codename-stable@-@`" instead of suite name "`stable`" to avoid surprises when the next `stable` is released.
 
@@ -149,12 +149,11 @@
 http://ftp.us.debian.org/debian/[http://ftp.XX.debian.org/debian/]                           `stable-proposed-updates`              Updates for the next stable point release (optional)
 http://security.debian.org/[http://security.debian.org/]                                     `stable/updates`                       security updates for stable release (important)
 http://security.debian.org/[http://security.debian.org/]                                     `testing/updates`                      security updates for testing release (important)
-http://volatile.debian.org/debian-volatile/[http://volatile.debian.org/debian-volatile/]     `volatile`                             compatible updates for spam filter, IM clients, etc.
-http://volatile.debian.org/debian-volatile/[http://volatile.debian.org/debian-volatile/]     `volatile-sloppy`                      non-compatible updates for spam filter, IM clients, etc.
-http://backports.debian.org/debian-backports/[http://backports.debian.org/debian-backports/] `@-@codename-stable@-@-backports`      newer backported packages for @-@codename-stable@-@ (official, optional)
+http://ftp.us.debian.org/debian/[http://ftp.XX.debian.org/debian/]                           `@-@codename-stable@-@-updates`        compatible updates for spam filter, IM clients, etc. for @-@codename-stable@-@
+http://backports.debian.org/debian-backports/[http://backports.debian.org/debian-backports/] `@-@codename-stable@-@-backports`      newer backported packages for @-@codename-stable@-@ (optional)
 -------------------------------------------------------------------------------------------------------------------------------------------------------
 
-CAUTION: Only pure **`stable`** release with security updates provides the best stability. Running mostly **`stable`** release mixed with some packages from **`testing`** or **`unstable`** release is riskier than running pure **`unstable`** release for library version mismatch etc.  If you really need the latest version of some programs under **`stable`** release, please use packages from http://www.debian.org/volatile/[the debian-volatile project] and http://backports.debian.org[http://backports.debian.org] (see <<_volatile_and_backports>>) services.  These services must be used with extra care.
+CAUTION: Only pure **`stable`** release with security updates provides the best stability. Running mostly **`stable`** release mixed with some packages from **`testing`** or **`unstable`** release is riskier than running pure **`unstable`** release for library version mismatch etc.  If you really need the latest version of some programs under **`stable`** release, please use packages from http://lists.debian.org/debian-volatile-announce/2011/msg00000.html[@-@codename-stable@-@-updates] and http://backports.debian.org[backports.debian.org] (see <<_updates_and_backports>>) services.  These services must be used with extra care.
 
 CAUTION: You should basically list only one of `stable`, `testing`, or `unstable` suites in the "`deb`" line.  If you list any combination of `stable`, `testing`, and `unstable` suites in the "`deb`" line, APT programs slow down while only the latest archive is effective.  Multiple listing makes sense for these when the "`/etc/apt/preferences`" file is used with clear objectives (see <<_tweaking_candidate_version>>).
 
@@ -745,9 +744,9 @@
 `make-kpkg --initrd kernel_image`                              build a kernel package from a kernel source tree with initramfs enabled
 `dpkg -i <package_name>_<version>-<debian_version>_<arch>.deb` install a local package to the system
 `debi <package_name>_<version>-<debian_version>_<arch>.dsc`    install local package(s) to the system
-`dpkg --get-selection \'\*\' >selection.txt`                   save `dpkg` level package selection state information
-`dpkg --set-selection <selection.txt`                          set `dpkg` level package selection state information
-`echo <package_name> hold | dpkg --set-selection`              set `dpkg` level package selection state for a package to **hold**  (equivalent to "`aptitude hold <package_name>`")
+`dpkg --get-selections \'\*\' >selection.txt`                  save `dpkg` level package selection state information
+`dpkg --set-selections <selection.txt`                         set `dpkg` level package selection state information
+`echo <package_name> hold | dpkg --set-selections`             set `dpkg` level package selection state for a package to **hold**  (equivalent to "`aptitude hold <package_name>`")
 ------------------------------------------------------------------------------------------------------------------------------------------
 
 // removed this since it create package under the same version || download a source and rebuild package(s) locally. || {{{apt-get -b source <package_name>}}} ||
@@ -867,7 +866,7 @@
 
 CAUTION: For "`Archive:`" stanza, suite names ("`stable`", "`testing`", "`unstable`", ...) are used in http://ftp.us.debian.org/debian/[the Debian archive] while codenames ("`dapper`", "`feisty`", "`gutsy`", "`hardy`", "`intrepid`", ...) are used in http://archive.ubuntu.com/ubuntu/[the Ubuntu archive].
 
-For some archives, such as `experimental`, `volatile-sloppy`, and `@-@codename-stable@-@-backports`, which contain packages which should not be installed automatically, there is an extra line, e.g., "`http://ftp.us.debian.org/debian/dists/experimental/main/binary-amd64/Release`"; as follows.
+For some archives, such as `experimental`, and `@-@codename-stable@-@-backports`, which contain packages which should not be installed automatically, there is an extra line, e.g., "`http://ftp.us.debian.org/debian/dists/experimental/main/binary-amd64/Release`"; as follows.
 
 --------------------
 Archive: experimental
@@ -1148,7 +1147,7 @@
 
 ==== Packages from mixed source of archives
 
-CAUTION: Installing packages from mixed source of archives is not supported by the official Debian distribution except for officially supported particular combinations of archives such as `stable` with http://www.debian.org/security/[security updates] and http://www.debian.org/volatile/[volatile updates].
+CAUTION: Installing packages from mixed source of archives is not supported by the official Debian distribution except for officially supported particular combinations of archives such as `stable` with http://www.debian.org/security/[security updates] and http://lists.debian.org/debian-volatile-announce/2011/msg00000.html[@-@codename-stable@-@-updates].
 
 Here is an example of operations to include specific newer upstream version packages found in `unstable` while tracking `testing` for single occasion.
 
@@ -1298,25 +1297,22 @@
 
 The default Pin-Priority value for `experimental` archive is always 1 (@@@dlt@@@100) since it is **NotAutomatic** archive (see <<_archive_level_release_files>>).  There is no need to set Pin-Priority value explicitly in the "`/etc/apt/preferences`" file just to use `experimental` archive unless you wish to track particular packages in it automatically for next upgrading.
 
-==== Volatile and Backports
+==== Updates and Backports
 
-There are http://www.debian.org/volatile/[debian-volatile project] and http://backports.debian.org[backports.debian.org] archives which provide updgrade packages for `stable`.
+There are http://lists.debian.org/debian-volatile-announce/2011/msg00000.html[@-@codename-stable@-@-updates] and http://backports.debian.org[backports.debian.org] archives which provide updgrade packages for `stable` (`@-@codename-stable@-@`).
 
-WARNING: Do not use all packages available in the **NotAutomatic** archives such as `@-@codename-stable@-@-backports` and `volatile-sloppy`.  Use only selected packages which fits your needs.
+WARNING: Do not use all packages available in the **NotAutomatic** archives such as `@-@codename-stable@-@-backports`.  Use only selected packages which fits your needs.
 
-CAUTION: Archive level Release files (see <<_archive_level_release_files>>) are used for the rule of `apt_preferences`(5).  Thus apt-pinning works only with "code" name for http://volatile.debian.org/debian-volatile/dists/[volatile Debian archives]. This is different from other Debian archives.  For example, you can do "`Pin: release a=@-@codename-stable@-@`" but can not do "`Pin: release a=stable`" in the "`/etc/apt/preferences`" file for volatile Debian archives.
-
-Here is an example of **apt-pinning** technique to include specific newer upstream version packages found in `@-@codename-stable@-@-backports` while tracking `@-@codename-stable@-@` and `volatile`.  You list all required archives in the "`/etc/apt/sources.list`" file as the following.
+Here is an example of **apt-pinning** technique to include specific newer upstream version packages found in `@-@codename-stable@-@-backports` while tracking `@-@codename-stable@-@` and `@-@codename-stable@-@-updates`.  You list all required archives in the "`/etc/apt/sources.list`" file as the following.
 
 --------------------
 deb http://ftp.us.debian.org/debian/ @-@codename-stable@-@ main contrib non-free
 deb http://security.debian.org/ @-@codename-stable@-@/updates main contrib
-deb http://volatile.debian.org/debian-volatile/ @-@codename-stable@-@/volatile main contrib non-free
-deb http://volatile.debian.org/debian-volatile/ @-@codename-stable@-@/volatile-sloppy main contrib non-free
+deb http://ftp.us.debian.org/debian/ @-@codename-stable@-@-updates main contrib non-free
 deb http://backports.debian.org/debian-backports/ @-@codename-stable@-@-backports main contrib non-free
 --------------------
 
-The default Pin-Priority value for http://backports.debian.org[backports.debian.org] and `volatile-sloppy` archives are always 1 (@@@dlt@@@100) since they are **NotAutomatic** archive (see <<_archive_level_release_files>>).  There is no need to set Pin-Priority value explicitly in the "`/etc/apt/preferences`" file just to use for http://backports.debian.org[backports.debian.org] and `volatile-sloppy` archive unless you wish to track packages automatically for next upgrading.
+The default Pin-Priority value for http://backports.debian.org[backports.debian.org] archive is always 1 (@@@dlt@@@100) since it is **NotAutomatic** archive (see <<_archive_level_release_files>>).  There is no need to set Pin-Priority value explicitly in the "`/etc/apt/preferences`" file just to use http://backports.debian.org[backports.debian.org] archive unless you wish to track particular packages in it automatically for next upgrading.
 
 So whenever you wish to install a package named "`<package-name>`" with its dependency from `@-@codename-stable@-@-backports` archive, you use following command while switching target release with "`-t`" option.
 
@@ -1330,10 +1326,6 @@
 Package: <package-1>
 Pin: release o=Backports.org archive
 Pin-Priority: 700
-
-Package: <package-2>
-Pin: release o=volatile.debian.org
-Pin-Priority: 700
 --------------------
 
 Alternatively, with the "`/etc/apt/preferences`" file as the following.
@@ -1344,16 +1336,12 @@
 Pin-Priority: 500
 
 Package: *
-Pin: release a=@-@codename-stable@-@, o=volatile.debian.org
+Pin: release a=@-@codename-stable@-@-updates, o=Debian
 Pin-Priority: 500
 
 Package: *
 Pin: release a=@-@codename-stable@-@-backports, o=Backports.org archive
 Pin-Priority: 200
-
-Package: *
-Pin: release a=@-@codename-stable@-@-sloppy, o=volatile.debian.org
-Pin-Priority: 200
 --------------------
 
 Execution of "`apt-get upgrade`" and "`apt-get dist-upgrade`" (or "`aptitude safe-upgrade`" and "`aptitude full-upgrade`") upgrades packages which were installed from `stable` archive using current `stable` archive and packages which were installed from other archives using current corresponding archive for all archives in the "`/etc/apt/sources.list`" file.
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/asciidoc/12_program.txt debian-reference-2.46/asciidoc/12_program.txt
--- debian-reference-2.45/asciidoc/12_program.txt	2010-09-19 00:27:28.000000000 +0900
+++ debian-reference-2.46/asciidoc/12_program.txt	2011-01-22 15:47:26.000000000 +0900
@@ -90,7 +90,7 @@
 - Avoid using any command options except "`-n`".
 - Avoid using escape sequences in the string since their handling varies.
 
-NOTE: Although "`-n` option is **not** really POSIX syntax, it is generally accepted.
+NOTE: Although "`-n`" option is **not** really POSIX syntax, it is generally accepted.
 
 TIP: Use the "`printf`" command instead of the "`echo`" command if you need to embed escape sequences in the output string.
 
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/common.ent debian-reference-2.46/common.ent
--- debian-reference-2.45/common.ent	2010-12-09 00:26:03.000000000 +0900
+++ debian-reference-2.46/common.ent	2011-02-26 09:01:01.000000000 +0900
@@ -1,4 +1,4 @@
-<!ENTITY build-date "2010-12-08 15:04:23 UTC">
+<!ENTITY build-date "2011-02-23 14:05:53 UTC">
 <!ENTITY arch "amd64">
 <!ENTITY codename-stable   "squeeze">
 <!ENTITY codename-testing  "wheezy">
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/debian/changelog debian-reference-2.46/debian/changelog
--- debian-reference-2.45/debian/changelog	2010-12-09 00:26:03.000000000 +0900
+++ debian-reference-2.46/debian/changelog	2011-02-26 17:22:17.000000000 +0900
@@ -1,3 +1,13 @@
+debian-reference (2.46) stable; urgency=low
+
+  * Updated Portguese translation by Américo Monteiro.
+  * Fixed s/--get-selection/--get-selections/ etc. Closes: #612435
+  * Reflected introduction of squeeze-updates suite which replaced
+    Debian Volatile Service. Closes: #614224
+  * Fixed URL for Debian Mirror Checker site. Closes: #614253
+
+ -- Osamu Aoki <osamu@debian.org>  Wed, 23 Feb 2011 23:11:59 +0900
+
 debian-reference (2.45) unstable; urgency=low
 
   * Fixed typo per Mathieu Parent. Closes: #597816
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/debian-reference.raw.xml debian-reference-2.46/debian-reference.raw.xml
--- debian-reference-2.45/debian-reference.raw.xml	2010-12-09 00:26:03.000000000 +0900
+++ debian-reference-2.46/debian-reference.raw.xml	2011-02-26 09:01:01.000000000 +0900
@@ -4822,7 +4822,7 @@
 
 deb http://security.debian.org/ @-@codename-stable@-@/updates main contrib
 deb-src http://security.debian.org/ @-@codename-stable@-@/updates main contrib</screen>
-        <simpara>Please note "<literal>ftp.XX.debian.org</literal>" must be replaced with appropriate mirror site URL for your location, for USA "<literal>ftp.us.debian.org</literal>", which can be found in <ulink url="http://www.debian.org/mirror/list";>the list of Debian worldwide mirror sites</ulink>.  The status of these servers can be checked at <ulink url="http://www.de.debian.org/dmc/";>Debian Mirror Checker site</ulink>.</simpara>
+        <simpara>Please note "<literal>ftp.XX.debian.org</literal>" must be replaced with appropriate mirror site URL for your location, for USA "<literal>ftp.us.debian.org</literal>", which can be found in <ulink url="http://www.debian.org/mirror/list";>the list of Debian worldwide mirror sites</ulink>.  The status of these servers can be checked at <ulink url="http://ftp.de.debian.org/dmc/";>Debian Mirror Checker site</ulink>.</simpara>
         <simpara>Here, I tend to use codename "<literal>@-@codename-stable@-@</literal>" instead of suite name "<literal>stable</literal>" to avoid surprises when the next <literal>stable</literal> is released.</simpara>
         <simpara>The meaning of "<literal>/etc/apt/sources.list</literal>" is described in <literal>sources.list</literal>(5) and key points are followings.</simpara>
         <itemizedlist>
@@ -4953,24 +4953,13 @@
               </row>
               <row>
                 <entry>
-                  <ulink url="http://volatile.debian.org/debian-volatile/";>http://volatile.debian.org/debian-volatile/</ulink>
-                </entry>
-                <entry>
-                  <literal>volatile</literal>
-                </entry>
-                <entry>
-    compatible updates for spam filter, IM clients, etc.
-    </entry>
-              </row>
-              <row>
-                <entry>
-                  <ulink url="http://volatile.debian.org/debian-volatile/";>http://volatile.debian.org/debian-volatile/</ulink>
+                  <ulink url="http://ftp.us.debian.org/debian/";>http://ftp.XX.debian.org/debian/</ulink>
                 </entry>
                 <entry>
-                  <literal>volatile-sloppy</literal>
+                  <literal>@-@codename-stable@-@-updates</literal>
                 </entry>
                 <entry>
-    non-compatible updates for spam filter, IM clients, etc.
+    compatible updates for spam filter, IM clients, etc. for @-@codename-stable@-@
     </entry>
               </row>
               <row>
@@ -4981,14 +4970,14 @@
                   <literal>@-@codename-stable@-@-backports</literal>
                 </entry>
                 <entry>
-    newer backported packages for @-@codename-stable@-@ (official, optional)
+    newer backported packages for @-@codename-stable@-@ (optional)
     </entry>
               </row>
             </tbody>
           </tgroup>
         </table>
         <caution>
-          <simpara>Only pure <emphasis role="strong"><literal>stable</literal></emphasis> release with security updates provides the best stability. Running mostly <emphasis role="strong"><literal>stable</literal></emphasis> release mixed with some packages from <emphasis role="strong"><literal>testing</literal></emphasis> or <emphasis role="strong"><literal>unstable</literal></emphasis> release is riskier than running pure <emphasis role="strong"><literal>unstable</literal></emphasis> release for library version mismatch etc.  If you really need the latest version of some programs under <emphasis role="strong"><literal>stable</literal></emphasis> release, please use packages from <ulink url="http://www.debian.org/volatile/";>the debian-volatile project</ulink> and <ulink url="http://backports.debian.org";>http://backports.debian.org</ulink> (see <xref linkend="_volatile_and_backports"/>) services.  These services must be used with extra care.</simpara>
+          <simpara>Only pure <emphasis role="strong"><literal>stable</literal></emphasis> release with security updates provides the best stability. Running mostly <emphasis role="strong"><literal>stable</literal></emphasis> release mixed with some packages from <emphasis role="strong"><literal>testing</literal></emphasis> or <emphasis role="strong"><literal>unstable</literal></emphasis> release is riskier than running pure <emphasis role="strong"><literal>unstable</literal></emphasis> release for library version mismatch etc.  If you really need the latest version of some programs under <emphasis role="strong"><literal>stable</literal></emphasis> release, please use packages from <ulink url="http://lists.debian.org/debian-volatile-announce/2011/msg00000.html";>@-@codename-stable@-@-updates</ulink> and <ulink url="http://backports.debian.org";>backports.debian.org</ulink> (see <xref linkend="_updates_and_backports"/>) services.  These services must be used with extra care.</simpara>
         </caution>
         <caution>
           <simpara>You should basically list only one of <literal>stable</literal>, <literal>testing</literal>, or <literal>unstable</literal> suites in the "<literal>deb</literal>" line.  If you list any combination of <literal>stable</literal>, <literal>testing</literal>, and <literal>unstable</literal> suites in the "<literal>deb</literal>" line, APT programs slow down while only the latest archive is effective.  Multiple listing makes sense for these when the "<literal>/etc/apt/preferences</literal>" file is used with clear objectives (see <xref linkend="_tweaking_candidate_version"/>).</simpara>
@@ -7006,7 +6995,7 @@
               </row>
               <row>
                 <entry>
-                  <literal>dpkg --get-selection '*' &gt;selection.txt</literal>
+                  <literal>dpkg --get-selections '*' &gt;selection.txt</literal>
                 </entry>
                 <entry>
     save <literal>dpkg</literal> level package selection state information
@@ -7014,7 +7003,7 @@
               </row>
               <row>
                 <entry>
-                  <literal>dpkg --set-selection &lt;selection.txt</literal>
+                  <literal>dpkg --set-selections &lt;selection.txt</literal>
                 </entry>
                 <entry>
     set <literal>dpkg</literal> level package selection state information
@@ -7022,7 +7011,7 @@
               </row>
               <row>
                 <entry>
-                  <literal>echo &lt;package_name&gt; hold | dpkg --set-selection</literal>
+                  <literal>echo &lt;package_name&gt; hold | dpkg --set-selections</literal>
                 </entry>
                 <entry>
     set <literal>dpkg</literal> level package selection state for a package to <emphasis role="strong">hold</emphasis>  (equivalent to "<literal>aptitude hold &lt;package_name&gt;</literal>")
@@ -7270,7 +7259,7 @@
         <caution>
           <simpara>For "<literal>Archive:</literal>" stanza, suite names ("<literal>stable</literal>", "<literal>testing</literal>", "<literal>unstable</literal>", …) are used in <ulink url="http://ftp.us.debian.org/debian/";>the Debian archive</ulink> while codenames ("<literal>dapper</literal>", "<literal>feisty</literal>", "<literal>gutsy</literal>", "<literal>hardy</literal>", "<literal>intrepid</literal>", …) are used in <ulink url="http://archive.ubuntu.com/ubuntu/";>the Ubuntu archive</ulink>.</simpara>
         </caution>
-        <simpara>For some archives, such as <literal>experimental</literal>, <literal>volatile-sloppy</literal>, and <literal>@-@codename-stable@-@-backports</literal>, which contain packages which should not be installed automatically, there is an extra line, e.g., "<literal>http://ftp.us.debian.org/debian/dists/experimental/main/binary-amd64/Release</literal>" as follows.</simpara>
+        <simpara>For some archives, such as <literal>experimental</literal>, and <literal>@-@codename-stable@-@-backports</literal>, which contain packages which should not be installed automatically, there is an extra line, e.g., "<literal>http://ftp.us.debian.org/debian/dists/experimental/main/binary-amd64/Release</literal>" as follows.</simpara>
         <screen>Archive: experimental
 Component: main
 Origin: Debian
@@ -7861,7 +7850,7 @@
       <section id="_packages_from_mixed_source_of_archives">
         <title>Packages from mixed source of archives</title>
         <caution>
-          <simpara>Installing packages from mixed source of archives is not supported by the official Debian distribution except for officially supported particular combinations of archives such as <literal>stable</literal> with <ulink url="http://www.debian.org/security/";>security updates</ulink> and <ulink url="http://www.debian.org/volatile/";>volatile updates</ulink>.</simpara>
+          <simpara>Installing packages from mixed source of archives is not supported by the official Debian distribution except for officially supported particular combinations of archives such as <literal>stable</literal> with <ulink url="http://www.debian.org/security/";>security updates</ulink> and <ulink url="http://lists.debian.org/debian-volatile-announce/2011/msg00000.html";>@-@codename-stable@-@-updates</ulink>.</simpara>
         </caution>
         <simpara>Here is an example of operations to include specific newer upstream version packages found in <literal>unstable</literal> while tracking <literal>testing</literal> for single occasion.</simpara>
         <orderedlist>
@@ -8117,31 +8106,23 @@
 deb http://security.debian.org/ testing/updates main contrib</screen>
         <simpara>The default Pin-Priority value for <literal>experimental</literal> archive is always 1 (&lt;&lt;100) since it is <emphasis role="strong">NotAutomatic</emphasis> archive (see <xref linkend="_archive_level_release_files"/>).  There is no need to set Pin-Priority value explicitly in the "<literal>/etc/apt/preferences</literal>" file just to use <literal>experimental</literal> archive unless you wish to track particular packages in it automatically for next upgrading.</simpara>
       </section>
-      <section id="_volatile_and_backports">
-        <title>Volatile and Backports</title>
-        <simpara>There are <ulink url="http://www.debian.org/volatile/";>debian-volatile project</ulink> and <ulink url="http://backports.debian.org";>backports.debian.org</ulink> archives which provide updgrade packages for <literal>stable</literal>.</simpara>
+      <section id="_updates_and_backports">
+        <title>Updates and Backports</title>
+        <simpara>There are <ulink url="http://lists.debian.org/debian-volatile-announce/2011/msg00000.html";>@-@codename-stable@-@-updates</ulink> and <ulink url="http://backports.debian.org";>backports.debian.org</ulink> archives which provide updgrade packages for <literal>stable</literal> (<literal>@-@codename-stable@-@</literal>).</simpara>
         <warning>
-          <simpara>Do not use all packages available in the <emphasis role="strong">NotAutomatic</emphasis> archives such as <literal>@-@codename-stable@-@-backports</literal> and <literal>volatile-sloppy</literal>.  Use only selected packages which fits your needs.</simpara>
+          <simpara>Do not use all packages available in the <emphasis role="strong">NotAutomatic</emphasis> archives such as <literal>@-@codename-stable@-@-backports</literal>.  Use only selected packages which fits your needs.</simpara>
         </warning>
-        <caution>
-          <simpara>Archive level Release files (see <xref linkend="_archive_level_release_files"/>) are used for the rule of <literal>apt_preferences</literal>(5).  Thus apt-pinning works only with "code" name for <ulink url="http://volatile.debian.org/debian-volatile/dists/";>volatile Debian archives</ulink>. This is different from other Debian archives.  For example, you can do "<literal>Pin: release a=@-@codename-stable@-@</literal>" but can not do "<literal>Pin: release a=stable</literal>" in the "<literal>/etc/apt/preferences</literal>" file for volatile Debian archives.</simpara>
-        </caution>
-        <simpara>Here is an example of <emphasis role="strong">apt-pinning</emphasis> technique to include specific newer upstream version packages found in <literal>@-@codename-stable@-@-backports</literal> while tracking <literal>@-@codename-stable@-@</literal> and <literal>volatile</literal>.  You list all required archives in the "<literal>/etc/apt/sources.list</literal>" file as the following.</simpara>
+        <simpara>Here is an example of <emphasis role="strong">apt-pinning</emphasis> technique to include specific newer upstream version packages found in <literal>@-@codename-stable@-@-backports</literal> while tracking <literal>@-@codename-stable@-@</literal> and <literal>@-@codename-stable@-@-updates</literal>.  You list all required archives in the "<literal>/etc/apt/sources.list</literal>" file as the following.</simpara>
         <screen>deb http://ftp.us.debian.org/debian/ @-@codename-stable@-@ main contrib non-free
 deb http://security.debian.org/ @-@codename-stable@-@/updates main contrib
-deb http://volatile.debian.org/debian-volatile/ @-@codename-stable@-@/volatile main contrib non-free
-deb http://volatile.debian.org/debian-volatile/ @-@codename-stable@-@/volatile-sloppy main contrib non-free
+deb http://ftp.us.debian.org/debian/ @-@codename-stable@-@-updates main contrib non-free
 deb http://backports.debian.org/debian-backports/ @-@codename-stable@-@-backports main contrib non-free</screen>
-        <simpara>The default Pin-Priority value for <ulink url="http://backports.debian.org";>backports.debian.org</ulink> and <literal>volatile-sloppy</literal> archives are always 1 (&lt;&lt;100) since they are <emphasis role="strong">NotAutomatic</emphasis> archive (see <xref linkend="_archive_level_release_files"/>).  There is no need to set Pin-Priority value explicitly in the "<literal>/etc/apt/preferences</literal>" file just to use for <ulink url="http://backports.debian.org";>backports.debian.org</ulink> and <literal>volatile-sloppy</literal> archive unless you wish to track packages automatically for next upgrading.</simpara>
+        <simpara>The default Pin-Priority value for <ulink url="http://backports.debian.org";>backports.debian.org</ulink> archive is always 1 (&lt;&lt;100) since it is <emphasis role="strong">NotAutomatic</emphasis> archive (see <xref linkend="_archive_level_release_files"/>).  There is no need to set Pin-Priority value explicitly in the "<literal>/etc/apt/preferences</literal>" file just to use <ulink url="http://backports.debian.org";>backports.debian.org</ulink> archive unless you wish to track particular packages in it automatically for next upgrading.</simpara>
         <simpara>So whenever you wish to install a package named "<literal>&lt;package-name&gt;</literal>" with its dependency from <literal>@-@codename-stable@-@-backports</literal> archive, you use following command while switching target release with "<literal>-t</literal>" option.</simpara>
         <screen>$ sudo apt-get install -t @-@codename-stable@-@-backports &lt;package-name&gt;</screen>
         <simpara>If you wish to upgrade particular packages, you must create the "<literal>/etc/apt/preferences</literal>" file and explicitly lists all packages in it as the following.</simpara>
         <screen>Package: &lt;package-1&gt;
 Pin: release o=Backports.org archive
-Pin-Priority: 700
-
-Package: &lt;package-2&gt;
-Pin: release o=volatile.debian.org
 Pin-Priority: 700</screen>
         <simpara>Alternatively, with the "<literal>/etc/apt/preferences</literal>" file as the following.</simpara>
         <screen>Package: *
@@ -8149,15 +8130,11 @@
 Pin-Priority: 500
 
 Package: *
-Pin: release a=@-@codename-stable@-@, o=volatile.debian.org
+Pin: release a=@-@codename-stable@-@-updates, o=Debian
 Pin-Priority: 500
 
 Package: *
 Pin: release a=@-@codename-stable@-@-backports, o=Backports.org archive
-Pin-Priority: 200
-
-Package: *
-Pin: release a=@-@codename-stable@-@-sloppy, o=volatile.debian.org
 Pin-Priority: 200</screen>
         <simpara>Execution of "<literal>apt-get upgrade</literal>" and "<literal>apt-get dist-upgrade</literal>" (or "<literal>aptitude safe-upgrade</literal>" and "<literal>aptitude full-upgrade</literal>") upgrades packages which were installed from <literal>stable</literal> archive using current <literal>stable</literal> archive and packages which were installed from other archives using current corresponding archive for all archives in the "<literal>/etc/apt/sources.list</literal>" file.</simpara>
       </section>
@@ -33307,7 +33284,7 @@
           </listitem>
         </itemizedlist>
         <note>
-          <simpara>Although "<literal>-n</literal> option is <emphasis role="strong">not</emphasis> really POSIX syntax, it is generally accepted.</simpara>
+          <simpara>Although "<literal>-n</literal>" option is <emphasis role="strong">not</emphasis> really POSIX syntax, it is generally accepted.</simpara>
         </note>
         <tip>
           <simpara>Use the "<literal>printf</literal>" command instead of the "<literal>echo</literal>" command if you need to embed escape sequences in the output string.</simpara>
diff -Nru --exclude '*.po' --exclude '*.pot' debian-reference-2.45/po4a/pt.1.add debian-reference-2.46/po4a/pt.1.add
--- debian-reference-2.45/po4a/pt.1.add	2010-10-16 10:15:42.000000000 +0900
+++ debian-reference-2.46/po4a/pt.1.add	2010-12-11 23:13:49.000000000 +0900
@@ -0,0 +1,5 @@
+PO4A-HEADER:mode=after;position=O conteúdo do "Debian Reference \(versão 2\)" é maioritariamente trabalho;endboundary=</simpara>
+
+        <simpara>O Documento "Debian Reference (versão 2)" foi traduzido por
+        Américo Monteiro a_monteiro_AT_netcabo.pt.</simpara>
+

Reply to: