From efc487fbd46905f5f3efc4f31d7df15625bcbecf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 7 May 2009 12:04:21 +0200
Subject: [apt-pkg] allow also codenames for specifying a release *
 MatchType::Release checks first for archive than for codename equality * new
 n= option in apt_preference to be able to pin based on a codeName

---
 doc/apt-get.8.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'doc/apt-get.8.xml')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index c1b3470ef..c63b2a6c6 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -53,6 +53,9 @@
 			  <arg choice='plain'>
 				  <replaceable>target_release_number_expression</replaceable>
 			  </arg>
+			  <arg choice='plain'>
+				  <replaceable>target_release_codename</replaceable>
+			  </arg>
 		  </group>
       </arg>
 
@@ -71,6 +74,9 @@
 						<arg choice='plain'>
 							/<replaceable>target_release_name</replaceable>
 						</arg>
+						<arg choice='plain'>
+							/<replaceable>target_release_codename</replaceable>
+						</arg>
 					</group>
 				</arg>
 			 </arg>
@@ -455,7 +461,8 @@
      of this option. In short, this option
      lets you have simple control over which distribution packages will be
      retrieved from. Some common examples might be 
-     <option>-t '2.1*'</option> or <option>-t unstable</option>.
+     <option>-t '2.1*'</option>, <option>-t unstable</option>
+     or <option>-t sid</option>.
      Configuration Item: <literal>APT::Default-Release</literal>;
      see also the &apt-preferences; manual page.</para></listitem>
      </varlistentry>
-- 
cgit v1.2.3


From 55a5a46c235a30bf024fb2301066553953701cc5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 29 Jun 2009 16:55:49 +0200
Subject: support running "--simulate" as user

---
 doc/apt-get.8.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc/apt-get.8.xml')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index c63b2a6c6..e7f6d7094 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -363,6 +363,11 @@
      actually change the system. 
      Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
 
+     <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
+     automatical and display a notice indicating that this is only a simulation.
+     Neigther NoLocking nor the notice will be triggered if run as root (root should know what
+     he is doing without further warnings by <literal>apt-get</literal>).</para>
+
      <para>Simulate prints out
      a series of lines each one representing a dpkg operation, Configure (Conf),
      Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
-- 
cgit v1.2.3


From ecf59bfcf3ca573aa15a44086a7852d1308ff1ad Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 7 Jul 2009 19:23:04 +0200
Subject: [apt-get] add possibility to hide the user simulation note

---
 doc/apt-get.8.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/apt-get.8.xml')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index e7f6d7094..50971d0f5 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -364,7 +364,8 @@
      Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
 
      <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
-     automatical and display a notice indicating that this is only a simulation.
+     automatical. Also a notice will be displayed indicating that this is only a simulation,
+     if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true)
      Neigther NoLocking nor the notice will be triggered if run as root (root should know what
      he is doing without further warnings by <literal>apt-get</literal>).</para>
 
-- 
cgit v1.2.3