From c678a0443518aa5e8f328f358fca7b35252df84e Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Wed, 28 Aug 2013 11:28:40 +0200
Subject: add man-page, improve option, use --with-new-pkgs as the flag

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

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

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index cc4e82255..6ccd9e5ec 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -389,6 +389,18 @@
      Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>--with-new-pkgs</option></term>
+     <listitem><para>Allow installing new packages when used in
+     conjunction with <literal>upgrade</literal>.  This is useful if
+     the update of a installed package requires new dependencies to be
+     installed. Instead of holding the package back <literal>upgrade</literal>
+     will upgrade the package and install the new dependencies. Note that
+     <literal>upgrade</literal> with this option will never remove packages,
+     only allow adding new ones.
+     Configuration Item:  <literal>APT::Get::Upgrade-Allow-New</literal>.
+     </para></listitem>
+     </varlistentry>
+
      <varlistentry><term><option>--no-upgrade</option></term>
      <listitem><para>Do not upgrade packages; when used in conjunction with <literal>install</literal>,
      <literal>no-upgrade</literal> will prevent packages on the command line
-- 
cgit v1.2.3


From 4fb66d8731045e6ad90ef70dff45bd28815714fc Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 1 Oct 2013 11:30:56 +0200
Subject: rename "--dpkg-progress" to "--show-progress" and document it in
 apt-get.8

---
 doc/apt-get.8.xml | 10 +++++++++-
 1 file changed, 9 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 cc4e82255..18a559c0b 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -508,7 +508,15 @@
      This is useful for tools like pbuilder.
      Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
      </varlistentry>
-     
+
+     <varlistentry><term><option>--show-progress</option></term>
+     <listitem><para>Show user friendly progress information in the
+     terminal window when packages are installed, upgraded or
+     removed. For a machine parsable version of this data see
+     README.progress-reporting in the apt doc directory.
+     <literal>DpkgPM::Progress</literal>.</para></listitem>
+     </varlistentry>
+    
 
      &apt-commonoptions;
      
-- 
cgit v1.2.3