Added shell help.

Fixed newline missing in help.

diff --git a/doc/zypper.8 b/doc/zypper.8
index 81c60eb..c7b96ee 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -14,6 +14,14 @@ zypper is designed to be compatible with rug, which is a command\-line interface
 .LP
 zypper provides a number of \fBcommands\fR. Each command accepts the option flags listed in the GLOBAL OPTIONS section. In addition, many commands have specific option flags, which are listed in this section.
 
+.LP
+.B General Commands
+
+.TP
+.B shell (sh)
+Starts a shell for entering multiple commands in one session.
+
+
 .LP 
 .B Package Management Commands
 
@@ -80,6 +88,11 @@ Type of resolvable (default: patch)
 .I \-y, \-\-no-confirm
 Don't require user confirmation.
 
+.B NOTE:
+Update currently only works on patches! That is, it will only update a
+package if there is a patch description for it. It will not update if
+there is simply a package with a higher version. But coming soon.
+
 .TP
 \fBsearch\fR (\fBse\fR) [\fIoptions\fR] [\fBquerystring\fR] ...
 Search for resolvables matching given strings. * (any substring) and ? (any character) wildcards can also be used within search strings.

diff --git a/src/zypper.cc b/src/zypper.cc
index 2357cbc..45fcfdf 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -73,6 +73,7 @@ Url make_url (const string & url_s) {
 string help_commands = _(
   "  Commands:\n"
   "\thelp\t\t\tHelp\n"
+  "\tshell, sh\t\tAccept multiple commands at once\n"
   "\tinstall, in\t\tInstall packages or resolvables\n"
   "\tremove, rm\t\tRemove packages or resolvables\n"
   "\tsearch, se\t\tSearch for packages matching a pattern\n"
@@ -118,7 +119,7 @@ string process_globals(int argc, char **argv)
     "\t--verbose, -v\t\tIncrease verbosity\n"
     "\t--terse, -t\t\tTerse output for machine consumption\n"
     "\t--table-style, -s\tTable style (integer)\n"
-    "\t--rug-compatible, -r\tTurn on rug compatibility"
+    "\t--rug-compatible, -r\tTurn on rug compatibility\n"
     ;
 
   if (gopts.count("version")) {
@@ -808,7 +809,7 @@ int main(int argc, char **argv)
   // parse global options and the command
   string command = process_globals (argc, argv);
   int ret = 0;
-  if (command == "shell")
+  if (command == "shell" || command == "sh")
     command_shell ();
   else
     ret = one_command (command, argc, argv);