- help text and man page update

diff --git a/doc/zypper.8 b/doc/zypper.8
index 8a35ce0..b6f8716 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -1,4 +1,4 @@
-.TH "zypper" "8" "0.10.0" "zypper" "System Tools"
+.TH "zypper" "8" "0.10.2" "zypper" "System Tools"
 .SH "SYNTAX"
 .LP
 zypper [\fI\-\-global\-options\fR] <\fBcommand\fR> [\fI\-\-command\-options\fR] [\fBcommand-arguments\fR]
@@ -428,7 +428,8 @@ Increase verbosity. For debugging output specify this option twice.
 Suppress normal output. Brief (esp. result notification) messages and error messages will still be printed, though. If used together with conflicting --verbose option, the --verbose option takes preference.
 .TP
 .I \-t, \-\-terse
-Terse output for machine consumption.
+Terse output for machine consumption. Currently not used and provided only for
+compatibility with rug.
 .TP
 .I \-s, \-\-table\-style
 Specifies table style to use. Table style is identified by an integer number. TODO
@@ -439,6 +440,11 @@ Turns on rug compatibility. See section COMPATIBILITY WITH RUG for details.
 .I \-n, \-\-non\-interactive
 Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically. The behaviour of this option is somewhat different than that of options like '--yes', since zypper can answer different answers to different questions. The answers also depend on other options like '--no-gpg-checks'.
 .TP
+.I \-x, \-\-xmlout
+Switches to XML output. This option is useful for scripts or graphical frontends
+using zypper. For detailed information about this feature, see
+http://en.opensuse.org/Zypper/XML_Output.
+.TP
 .I \-D, \-\-reposd\-dir <dir>
 Use the specified directory to look for the repository definition (*.repo) files.
 The default value is /etc/zypp/repos.d.
@@ -550,11 +556,8 @@ Use the \-\-raw\-cache\-dir global option to use an alternative directory
 for this purpose or the \-\-root option to make this directory relative to the
 specified root directory.
 .TP
-.B /var/cache/zypp/zypp.db
-Sqlite database file containing pre-parsed metadata of all repositories.
-Use the \-\-cache\-dir global option to use an alternative directory
-for the zypp.db file or the \-\-root option to make its default location
-relative to the specified root directory.
+.B /var/cache/zypp/*.solv
+TODO
 .TP
 .B ~/.zypper_history
 Command history for the shell.
@@ -715,6 +718,9 @@ This option is an alias to zypper's \-\-repo <alias> and it will restrict
 the operation of commands like search, install, etc to the repository specified
 by the alias.
 
+.SH "HOMEPAGE"
+
+http://en.opensuse.org/Zypper
 
 .SH "AUTHORS"
 .LP

diff --git a/src/zypper.cc b/src/zypper.cc
index 0430299..cdc674e 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -145,50 +145,51 @@ void print_main_help(Zypper & zypper)
     "\t--table-style, -s\tTable style (integer).\n"
     "\t--rug-compatible, -r\tTurn on rug compatibility.\n"
     "\t--non-interactive, -n\tDo not ask anything, use default answers automatically.\n"
+    "\t--xmlout, -x\t\tSwitch to XML output.\n"  
     "\t--reposd-dir, -D <dir>\tUse alternative repository definition files directory.\n"
     "\t--cache-dir, -C <dir>\tUse alternative meta-data cache database directory.\n"
-    "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory\n"
+    "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n"
   );
 
   static string help_global_source_options = _(
     "\tRepository Options:\n"
     "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-    "\t--plus-repo, -p <URI>\tUse an additional repository\n"
+    "\t--plus-repo, -p <URI>\tUse an additional repository.\n"
     "\t--disable-repositories\tDo not read meta-data from repositories.\n"
     "\t--no-refresh\tDo not refresh the repositories.\n"
   );
 
   static string help_global_target_options = _("\tTarget Options:\n"
     "\t--root, -R <dir>\tOperate on a different root directory.\n"
-    "\t--disable-system-resolvables  Do not read installed resolvables\n"
+    "\t--disable-system-resolvables  Do not read installed resolvables.\n"
   );
 
   static 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"
+    "\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"
     "\trepos, lr\t\tList all defined repositories.\n"
-    "\taddrepo, ar\t\tAdd a new repository\n"
-    "\tremoverepo, rr\t\tRemove specified repository\n"
-    "\trenamerepo, nr\t\tRename specified repository\n"
-    "\tmodifyrepo, mr\t\tModify specified repository\n"
-    "\trefresh, ref\t\tRefresh all repositories\n"
-    "\tpatch-check, pchk\tCheck for patches\n"
-    "\tpatches, pch\t\tList patches\n"
-    "\tlist-updates, lu\tList updates\n"
-    "\txml-updates, xu\t\tList updates and patches in xml format\n"
+    "\taddrepo, ar\t\tAdd a new repository.\n"
+    "\tremoverepo, rr\t\tRemove specified repository.\n"
+    "\trenamerepo, nr\t\tRename specified repository.\n"
+    "\tmodifyrepo, mr\t\tModify specified repository.\n"
+    "\trefresh, ref\t\tRefresh all repositories.\n"
+    "\tpatch-check, pchk\tCheck for patches.\n"
+    "\tpatches, pch\t\tList patches.\n"
+    "\tlist-updates, lu\tList updates.\n"
+    "\txml-updates, xu\t\tList updates and patches in xml format.\n"
     "\tupdate, up\t\tUpdate installed resolvables with newer versions.\n"
-    "\tdist-upgrade, dup\tPerform a distribution upgrade\n"
-    "\tinfo, if\t\tShow full information for packages\n"
-    "\tpatch-info\t\tShow full information for patches\n"
-    "\tsource-install, si\tInstall a source package\n"
-    "\tbuild-deps-install, bi\tInstall source package build dependencies\n"
-    "\tclean\t\t\tClean local caches\n"
+    "\tdist-upgrade, dup\tPerform a distribution upgrade.\n"
+    "\tinfo, if\t\tShow full information for packages.\n"
+    "\tpatch-info\t\tShow full information for patches.\n"
+    "\tsource-install, si\tInstall a source package.\n"
+    "\tbuild-deps-install, bi\tInstall source package build dependencies.\n"
+    "\tclean\t\t\tClean local caches.\n"
     "");
-  
+
   static string help_usage = _(
     "  Usage:\n"
     "\tzypper [--global-options] <command> [--command-options] [arguments]\n"