docs: update

This commit is contained in:
Dylan Araps 2020-02-10 22:35:08 +02:00
parent 2353ca467b
commit 938e8784a9
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
2 changed files with 9 additions and 33 deletions

View File

@ -199,11 +199,14 @@ export CMAKE_GENERATOR=
## Alternatives system ## Alternatives system
When a package with conflicts is installed with `KISS_CHOICE=1`, the conflicting files will be added as "choices" to the alternatives system. When a package with conflicts is installed the conflicting
files will be added as "choices" to the alternatives system.
Afterwards, running `kiss a`/`kiss alternatives` will list all of the choices you are able to make. Each line of output with this command is also usable directly as input. Afterwards, running kiss a/kiss alternatives will list all of
the choices you are able to make. Each line of output with this
command is also usable directly as input.
**NOTE** If a package has fewer than 10 conflicting files, the conflicting files will automatically be added to the alternatives system. NOTE: To disable this functionality, set 'KISS_CHOICE=0'.
Example usage: Example usage:
@ -231,18 +234,6 @@ Example usage (complex):
```sh ```sh
-> kiss i sbase -> kiss i sbase
# More lines... # More lines...
/var/db/kiss/installed/util-linux/manifest:/usr/bin/renice
/var/db/kiss/installed/util-linux/manifest:/usr/bin/logger
/var/db/kiss/installed/util-linux/manifest:/usr/bin/flock
/var/db/kiss/installed/util-linux/manifest:/usr/bin/cal
!> Package 'sbase' conflicts with another package
!> Run 'KISS_CHOICE=1 kiss i sbase' to add conflicts
!> as alternatives.
# There were more than 10 conflicts so the alternatives system
# must be manually enabled for this package.
-> KISS_CHOICE=1 kiss i sbase
# More lines...
-> sbase Found conflict (/usr/bin/renice), adding choice -> sbase Found conflict (/usr/bin/renice), adding choice
-> sbase Found conflict (/usr/bin/logger), adding choice -> sbase Found conflict (/usr/bin/logger), adding choice
-> sbase Found conflict (/usr/bin/flock), adding choice -> sbase Found conflict (/usr/bin/flock), adding choice

21
kiss.1
View File

@ -188,17 +188,14 @@ export CMAKE_GENERATOR=
. .
.nf .nf
When a package with conflicts is installed with KISS_CHOICE=1, When a package with conflicts is installed the conflicting
the conflicting files will be added as "choices" to the files will be added as "choices" to the alternatives system.
alternatives system.
Afterwards, running kiss a/kiss alternatives will list all of Afterwards, running kiss a/kiss alternatives will list all of
the choices you are able to make. Each line of output with this the choices you are able to make. Each line of output with this
command is also usable directly as input. command is also usable directly as input.
NOTE: If a package has fewer than 10 conflicting files, the NOTE: To disable this functionality, set 'KISS_CHOICE=0'.
conflicting files will automatically be added to the alternatives
system.
Example usage: Example usage:
@ -223,18 +220,6 @@ Example usage (complex):
-> kiss i sbase -> kiss i sbase
# More lines... # More lines...
/var/db/kiss/installed/util-linux/manifest:/usr/bin/renice
/var/db/kiss/installed/util-linux/manifest:/usr/bin/logger
/var/db/kiss/installed/util-linux/manifest:/usr/bin/flock
/var/db/kiss/installed/util-linux/manifest:/usr/bin/cal
!> Package 'sbase' conflicts with another package
!> Run 'KISS_CHOICE=1 kiss i sbase' to add conflicts
!> as alternatives.
# There were more than 10 conflicts so the alternatives system
# must be manually enabled for this package.
-> KISS_CHOICE=1 kiss i sbase
# More lines...
-> sbase Found conflict (/usr/bin/renice), adding choice -> sbase Found conflict (/usr/bin/renice), adding choice
-> sbase Found conflict (/usr/bin/logger), adding choice -> sbase Found conflict (/usr/bin/logger), adding choice
-> sbase Found conflict (/usr/bin/flock), adding choice -> sbase Found conflict (/usr/bin/flock), adding choice