* cmdline/apt-get.cc:

  - fix incorrect help output for -f (LP: #57487)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 11a8b2ef4fd05a28826b00a66f7c6a825004b5f8..920e5e2ec5bd13676c4f4f39bd10059513e6c245 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2635,7 +2635,7 @@ bool ShowHelp(CommandLine &CmdL)
       "  -d  Download only - do NOT install or unpack archives\n"
       "  -s  No-act. Perform ordering simulation\n"
       "  -y  Assume Yes to all queries and do not prompt\n"
-      "  -f  Attempt to continue if the integrity check fails\n"
+      "  -f  Attempt to correct a system with broken dependencies in place\n"
       "  -m  Attempt to continue if archives are unlocatable\n"
       "  -u  Show a list of upgraded packages as well\n"
       "  -b  Build the source package after fetching it\n"

diff --git a/debian/changelog b/debian/changelog
index a4287b1607967a36a117d887f092e5a6082ada19..6a83107fe474bb432080d7f80f755826c10b44f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ apt (0.7.12) UNRELEASED; urgency=low
       is run
   * methods/connect.cc:
     - remember hosts with Resolve failures or connect Timeouts
+  * cmdline/apt-get.cc:
+    - fix incorrect help output for -f (LP: #57487)
   * debian/apt.cron.daily:
     - sleep random amount of time (default within 0-30min) before
       starting the upate to hit the mirrors less hard