summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2020-01-25 10:43:18 -0500
committerTimo Teräs <timo.teras@iki.fi>2020-01-26 09:03:21 +0200
commitee24da7d3607bad67d280b9c3b46a8a43b361e07 (patch)
tree44c2f173453c222a0eddcbe6bde26c2fb2d8b4e2
parent03952ecc350e1effb5d7b1e22012da08e68cca2e (diff)
downloadapk-tools-ee24da7d3607bad67d280b9c3b46a8a43b361e07.tar.gz
apk-tools-ee24da7d3607bad67d280b9c3b46a8a43b361e07.tar.bz2
apk-tools-ee24da7d3607bad67d280b9c3b46a8a43b361e07.tar.xz
apk-tools-ee24da7d3607bad67d280b9c3b46a8a43b361e07.zip
man pages: consoldate commit options in apk(8)
-rw-r--r--doc/apk-add.8.scd28
-rw-r--r--doc/apk-del.8.scd28
-rw-r--r--doc/apk-fix.8.scd28
-rw-r--r--doc/apk-upgrade.8.scd28
-rw-r--r--doc/apk.8.scd22
5 files changed, 30 insertions, 104 deletions
diff --git a/doc/apk-add.8.scd b/doc/apk-add.8.scd
index ab9ca49..902f93a 100644
--- a/doc/apk-add.8.scd
+++ b/doc/apk-add.8.scd
@@ -15,32 +15,8 @@ them if not already present, ensuring all dependencies are met.
# OPTIONS
-## COMMIT OPTIONS
-
-*apk add* commits the database, and supports the same options as other commit
-operations.
-
-*-s, --simulate*
- Simulate the requested operation without making any changes.
-
-*--clean-protected*
- Do not create .apk-new files in configuration directories.
-
-*--overlay-from-stdin*
- Read list of overlay files from stdin.
-
-*--no-scripts*
- Do not execute any scripts.
-
-*--no-commit-hooks*
- Skip pre/post hook scripts (but not other scripts).
-
-*--initramfs-diskless-boot*
- Enables options for diskless initramfs boot (e.g. skip hooks).
-
-## ADD OPTIONS
-
-The following options affect the *add* operation.
+*apk add* supports the commit options described in *apk*(8), as well as the
+following options:
*--initdb*
Initialize a new package database.
diff --git a/doc/apk-del.8.scd b/doc/apk-del.8.scd
index 85c6034..3abc8f1 100644
--- a/doc/apk-del.8.scd
+++ b/doc/apk-del.8.scd
@@ -15,32 +15,8 @@ required by any other packages.
# OPTIONS
-## COMMIT OPTIONS
-
-*apk del* commits the database, and supports the same options as other commit
-operations.
-
-*-s, --simulate*
- Simulate the requested operation without making any changes.
-
-*--clean-protected*
- Do not create .apk-new files in configuration directories.
-
-*--overlay-from-stdin*
- Read list of overlay files from stdin.
-
-*--no-scripts*
- Do not execute any scripts.
-
-*--no-commit-hooks*
- Skip pre/post hook scripts (but not other scripts).
-
-*--initramfs-diskless-boot*
- Enables options for diskless initramfs boot (e.g. skip hooks).
-
-## DELETE OPTIONS
-
-The following options affect the *delete* operation.
+*apk del* supports the commit options described in *apk*(8), as well as the
+following options:
*-r, --rdepends*
Recursively delete all top-level reverse dependencies, too.
diff --git a/doc/apk-fix.8.scd b/doc/apk-fix.8.scd
index f1efce8..2354587 100644
--- a/doc/apk-fix.8.scd
+++ b/doc/apk-fix.8.scd
@@ -15,32 +15,8 @@ the specified packages, or all installed packages if none are specified.
# OPTIONS
-## COMMIT OPTIONS
-
-*apk fix* commits the database, and supports the same options as other commit
-operations.
-
-*-s, --simulate*
- Simulate the requested operation without making any changes.
-
-*--clean-protected*
- Do not create .apk-new files in configuration directories.
-
-*--overlay-from-stdin*
- Read list of overlay files from stdin.
-
-*--no-scripts*
- Do not execute any scripts.
-
-*--no-commit-hooks*
- Skip pre/post hook scripts (but not other scripts).
-
-*--initramfs-diskless-boot*
- Enables options for diskless initramfs boot (e.g. skip hooks).
-
-## FIX OPTIONS
-
-The following options affect the *fix* operation.
+*apk fix* supports the commit options described in *apk*(8), as well as the
+following options:
*-d, --depends*
Also fix dependencies of specified packages.
diff --git a/doc/apk-upgrade.8.scd b/doc/apk-upgrade.8.scd
index f3f95b2..717ab0b 100644
--- a/doc/apk-upgrade.8.scd
+++ b/doc/apk-upgrade.8.scd
@@ -15,32 +15,8 @@ configured package repositories (see *apk-repositories*(5)).
# OPTIONS
-## COMMIT OPTIONS
-
-*apk upgrade* commits the database, and supports the same options as other
-commit operations.
-
-*-s, --simulate*
- Simulate the requested operation without making any changes.
-
-*--clean-protected*
- Do not create .apk-new files in configuration directories.
-
-*--overlay-from-stdin*
- Read list of overlay files from stdin.
-
-*--no-scripts*
- Do not execute any scripts.
-
-*--no-commit-hooks*
- Skip pre/post hook scripts (but not other scripts).
-
-*--initramfs-diskless-boot*
- Enables options for diskless initramfs boot (e.g. skip hooks).
-
-## UPGRADE OPTIONS
-
-The following options affect the *upgrade* operation.
+*apk upgrade* supports the commit options described in *apk*(8), as well as the
+following options:
*-a, --available*
Resets version constraints in _world_ (see *apk-world*(5)) and prefers
diff --git a/doc/apk.8.scd b/doc/apk.8.scd
index 2ec3b80..8280ab9 100644
--- a/doc/apk.8.scd
+++ b/doc/apk.8.scd
@@ -157,6 +157,28 @@ The following options are available for all commands.
Wait for TIME seconds to get an exclusive repository lock before
failing.
+# COMMIT OPTIONS
+
+The following options are available for all commands which commit the database.
+
+*-s, --simulate*
+ Simulate the requested operation without making any changes.
+
+*--clean-protected*
+ Do not create .apk-new files in configuration directories.
+
+*--overlay-from-stdin*
+ Read list of overlay files from stdin.
+
+*--no-scripts*
+ Do not execute any scripts.
+
+*--no-commit-hooks*
+ Skip pre/post hook scripts (but not other scripts).
+
+*--initramfs-diskless-boot*
+ Enables options for diskless initramfs boot (e.g. skip hooks).
+
# NOTES
This apk has coffee making abilities.