From ee24da7d3607bad67d280b9c3b46a8a43b361e07 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 25 Jan 2020 10:43:18 -0500 Subject: man pages: consoldate commit options in apk(8) --- doc/apk-upgrade.8.scd | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'doc/apk-upgrade.8.scd') 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 -- cgit v1.2.3-60-g2f50