summaryrefslogtreecommitdiff
path: root/cmdline/apt-mark.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-10-27 09:57:26 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-04 18:04:05 +0100
commit8561c2fedae26aecd8ba758a5e7ef686ba1243f3 (patch)
tree2dd8bd0c15f75064f2a4f8d7bd4bd9e30b307998 /cmdline/apt-mark.cc
parentc094c868786f70bef8a00625fd62be1fa404b220 (diff)
downloadapt-8561c2fedae26aecd8ba758a5e7ef686ba1243f3.tar.gz
revamp all tools help messages
The general idea is: A small paragraph on the tool itself as a description, a list of the most used (!= all) commands available in the tool, a remark where to find more information on the tool and its commands (aka: in the manpage) and finally a common block referring to even more manpages. In exchange options are completely omitted from the output as well as deprecated or obscure commands. (Better) Information about them is available in the manpages anyway and the few options which were listed before were also the least interesting ones (-o -c -q and co are hardly of interest for someone totally new looking to find info by asking for help and anyone with a bit of experience doesn't need this short list. Those would need a list of options applying to the command they call, but they are too numerous and command specific to list them sanely in this context.
Diffstat (limited to 'cmdline/apt-mark.cc')
-rw-r--r--cmdline/apt-mark.cc19
1 files changed, 4 insertions, 15 deletions
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index b06fcc0cc..66adfd268 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -280,26 +280,15 @@ static bool ShowSelection(CommandLine &CmdL) /*{{{*/
return true;
}
/*}}}*/
-bool ShowHelp(CommandLine &, aptDispatchWithHelp const * Cmds) /*{{{*/
+bool ShowHelp(CommandLine &) /*{{{*/
{
std::cout <<
_("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"apt-mark is a simple command line interface for marking packages\n"
- "as manually or automatically installed. It can also list marks.\n")
- << std::endl;
- ShowHelpListCommands(Cmds);
- std::cout << std::endl
- << _("Options:\n"
- " -h This help text.\n"
- " -q Loggable output - no progress indicator\n"
- " -qq No output except for errors\n"
- " -s No-act. Just prints what would be done.\n"
- " -f read/write auto/manual marking in the given file\n"
- " -c=? Read this configuration file\n"
- " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
- "See the apt-mark(8) and apt.conf(5) manual pages for more information.")
- << std::endl;
+ "as manually or automatically installed. It is also possible to\n"
+ "manipulate the dpkg(1) selection states of packages with it.\n"
+ "It can also list all packages with or without a certain marking.\n");
return true;
}
/*}}}*/