Merge remote-tracking branch 'mvo/feature/dpkg-progress-docs' into debian/sid

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index e8a21cb0cc07a0654f681d23d34bd70f43b83bcb..5124ac157358e5864e2dcc884b16ecd9c6e6a72c 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -120,7 +120,7 @@ bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const * const
    if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
            "dselect-upgrade", "autoremove"))
    {
-      addArg(0, "dpkg-progress", "DpkgPM::Progress", 0);
+      addArg(0, "show-progress", "DpkgPM::Progress", 0);
       addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
       addArg(0, "purge", "APT::Get::Purge", 0);
       addArg('V',"verbose-versions","APT::Get::Show-Versions",0);

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index cc4e82255f4e23fc952bbdd8ee7ec77d812d87ae..18a559c0b6a21711defaf39a3049ffacfcf9c4a1 100644 (file)
--- 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;