From d5606cd43a3b7705dccc70ab46faf3f4c0cab049 Mon Sep 17 00:00:00 2001 From: Matthew Leeds Date: Tue, 26 Jun 2018 00:10:55 -0700 Subject: [PATCH] doc: Fix documentation of shared options The --verbose and --ostree-verbose options are global to all subcommands, but --version can only be used with the main "flatpak" command, so fix the man pages to reflect that. --- doc/flatpak-build-bundle.xml | 5 +++-- doc/flatpak-build-commit-from.xml | 8 -------- doc/flatpak-build-export.xml | 8 -------- doc/flatpak-build-finish.xml | 8 -------- doc/flatpak-build-import-bundle.xml | 8 -------- doc/flatpak-build-init.xml | 4 ++-- doc/flatpak-build-sign.xml | 8 -------- doc/flatpak-build-update-repo.xml | 8 -------- doc/flatpak-build.xml | 8 ++++++++ doc/flatpak-config.xml | 16 ++++++++++++++++ doc/flatpak-document-export.xml | 4 ++-- doc/flatpak-document-info.xml | 4 ++-- doc/flatpak-document-list.xml | 4 ++-- doc/flatpak-document-unexport.xml | 4 ++-- doc/flatpak-enter.xml | 4 ++-- doc/flatpak-install.xml | 8 -------- doc/flatpak-list.xml | 8 -------- doc/flatpak-make-current.xml | 4 ++-- doc/flatpak-override.xml | 4 ++-- doc/flatpak-remote-add.xml | 8 -------- doc/flatpak-remote-delete.xml | 8 -------- doc/flatpak-remote-ls.xml | 8 -------- doc/flatpak-remote-modify.xml | 8 -------- doc/flatpak-remotes.xml | 8 -------- doc/flatpak-repo.xml | 17 +++++++++++++++++ doc/flatpak-run.xml | 5 ++--- doc/flatpak-search.xml | 8 ++++++++ doc/flatpak-uninstall.xml | 8 -------- doc/flatpak-update.xml | 8 -------- 29 files changed, 70 insertions(+), 141 deletions(-) diff --git a/doc/flatpak-build-bundle.xml b/doc/flatpak-build-bundle.xml index 42aaabc4..0f26561f 100644 --- a/doc/flatpak-build-bundle.xml +++ b/doc/flatpak-build-bundle.xml @@ -147,12 +147,13 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. + diff --git a/doc/flatpak-build-commit-from.xml b/doc/flatpak-build-commit-from.xml index b1b82f25..9684422e 100644 --- a/doc/flatpak-build-commit-from.xml +++ b/doc/flatpak-build-commit-from.xml @@ -190,14 +190,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build-export.xml b/doc/flatpak-build-export.xml index a8f94226..0c4b3f6f 100644 --- a/doc/flatpak-build-export.xml +++ b/doc/flatpak-build-export.xml @@ -238,14 +238,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build-finish.xml b/doc/flatpak-build-finish.xml index 75e66bfb..6c51c3e2 100644 --- a/doc/flatpak-build-finish.xml +++ b/doc/flatpak-build-finish.xml @@ -397,14 +397,6 @@ key=v1;v2; Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build-import-bundle.xml b/doc/flatpak-build-import-bundle.xml index 6cdbc715..6db8a41b 100644 --- a/doc/flatpak-build-import-bundle.xml +++ b/doc/flatpak-build-import-bundle.xml @@ -132,14 +132,6 @@ GPG Homedir to use when looking for keyrings - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build-init.xml b/doc/flatpak-build-init.xml index 25a2e747..eaa06b8c 100644 --- a/doc/flatpak-build-init.xml +++ b/doc/flatpak-build-init.xml @@ -204,10 +204,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-build-sign.xml b/doc/flatpak-build-sign.xml index 46077995..f4d3ba8e 100644 --- a/doc/flatpak-build-sign.xml +++ b/doc/flatpak-build-sign.xml @@ -120,14 +120,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build-update-repo.xml b/doc/flatpak-build-update-repo.xml index 1c23fa44..1d59231e 100644 --- a/doc/flatpak-build-update-repo.xml +++ b/doc/flatpak-build-update-repo.xml @@ -186,14 +186,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-build.xml b/doc/flatpak-build.xml index a95b75b0..fcca503f 100644 --- a/doc/flatpak-build.xml +++ b/doc/flatpak-build.xml @@ -78,6 +78,14 @@ + + + + + Print OSTree debug information during command processing. + + + diff --git a/doc/flatpak-config.xml b/doc/flatpak-config.xml index 725de549..5f40603a 100644 --- a/doc/flatpak-config.xml +++ b/doc/flatpak-config.xml @@ -121,6 +121,22 @@ + + + + + + Print debug information during command processing. + + + + + + + + Print OSTree debug information during command processing. + + diff --git a/doc/flatpak-document-export.xml b/doc/flatpak-document-export.xml index 286ccf8a..3704e7d4 100644 --- a/doc/flatpak-document-export.xml +++ b/doc/flatpak-document-export.xml @@ -189,10 +189,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-document-info.xml b/doc/flatpak-document-info.xml index 14f00426..9cfb22b5 100644 --- a/doc/flatpak-document-info.xml +++ b/doc/flatpak-document-info.xml @@ -76,10 +76,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-document-list.xml b/doc/flatpak-document-list.xml index e4b191d9..714109f0 100644 --- a/doc/flatpak-document-list.xml +++ b/doc/flatpak-document-list.xml @@ -72,10 +72,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-document-unexport.xml b/doc/flatpak-document-unexport.xml index 4b36acae..bb6f8957 100644 --- a/doc/flatpak-document-unexport.xml +++ b/doc/flatpak-document-unexport.xml @@ -72,10 +72,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-enter.xml b/doc/flatpak-enter.xml index 6613a340..ebda6c7f 100644 --- a/doc/flatpak-enter.xml +++ b/doc/flatpak-enter.xml @@ -82,10 +82,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-install.xml b/doc/flatpak-install.xml index e07988fd..5aba3c2b 100644 --- a/doc/flatpak-install.xml +++ b/doc/flatpak-install.xml @@ -265,14 +265,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-list.xml b/doc/flatpak-list.xml index b3fef61a..68fd5b68 100644 --- a/doc/flatpak-list.xml +++ b/doc/flatpak-list.xml @@ -153,14 +153,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-make-current.xml b/doc/flatpak-make-current.xml index cf66ed0a..a4c8bc78 100644 --- a/doc/flatpak-make-current.xml +++ b/doc/flatpak-make-current.xml @@ -116,10 +116,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-override.xml b/doc/flatpak-override.xml index 31dcfbfc..44faef3d 100644 --- a/doc/flatpak-override.xml +++ b/doc/flatpak-override.xml @@ -321,10 +321,10 @@ key=v1;v2; - + - Print version information and exit. + Print OSTree debug information during command processing. diff --git a/doc/flatpak-remote-add.xml b/doc/flatpak-remote-add.xml index 45fb3dc9..3a09915f 100644 --- a/doc/flatpak-remote-add.xml +++ b/doc/flatpak-remote-add.xml @@ -219,14 +219,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-remote-delete.xml b/doc/flatpak-remote-delete.xml index 5c2d2540..8a0a63b1 100644 --- a/doc/flatpak-remote-delete.xml +++ b/doc/flatpak-remote-delete.xml @@ -118,14 +118,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-remote-ls.xml b/doc/flatpak-remote-ls.xml index 48254686..3d0f236a 100644 --- a/doc/flatpak-remote-ls.xml +++ b/doc/flatpak-remote-ls.xml @@ -168,14 +168,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-remote-modify.xml b/doc/flatpak-remote-modify.xml index 64d9a374..8bafefe9 100644 --- a/doc/flatpak-remote-modify.xml +++ b/doc/flatpak-remote-modify.xml @@ -246,14 +246,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-remotes.xml b/doc/flatpak-remotes.xml index e89374f2..4dc3dca5 100644 --- a/doc/flatpak-remotes.xml +++ b/doc/flatpak-remotes.xml @@ -124,14 +124,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-repo.xml b/doc/flatpak-repo.xml index d1fbbaea..38b05078 100644 --- a/doc/flatpak-repo.xml +++ b/doc/flatpak-repo.xml @@ -83,6 +83,23 @@ Print metadata for a branch in the repository. + + + + + + + Print debug information during command processing. + + + + + + + + Print OSTree debug information during command processing. + + diff --git a/doc/flatpak-run.xml b/doc/flatpak-run.xml index f46ec9a9..f89f35e5 100644 --- a/doc/flatpak-run.xml +++ b/doc/flatpak-run.xml @@ -93,10 +93,10 @@ - + - Print version information and exit. + Print OSTree debug information during command processing. @@ -394,7 +394,6 @@ key=v1;v2; permissions for the application. - diff --git a/doc/flatpak-search.xml b/doc/flatpak-search.xml index 67544cae..c9c3a3f7 100644 --- a/doc/flatpak-search.xml +++ b/doc/flatpak-search.xml @@ -96,6 +96,14 @@ Print debug information during command processing. + + + + + + Print OSTree debug information during command processing. + + diff --git a/doc/flatpak-uninstall.xml b/doc/flatpak-uninstall.xml index 6d643c15..420ad1b5 100644 --- a/doc/flatpak-uninstall.xml +++ b/doc/flatpak-uninstall.xml @@ -206,14 +206,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - - diff --git a/doc/flatpak-update.xml b/doc/flatpak-update.xml index fbf796dc..97f3a474 100644 --- a/doc/flatpak-update.xml +++ b/doc/flatpak-update.xml @@ -238,14 +238,6 @@ Print OSTree debug information during command processing. - - - - - - Print version information and exit. - -