aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfiresoft-de <34716031+firesoft-de@users.noreply.github.com>2021-04-15 18:06:32 +0200
committerGitHub <noreply@github.com>2021-04-15 18:06:32 +0200
commitaf2adb4e35ea71ca5c7fbb1e51b9d25fe49af2e4 (patch)
treef7b8dcdc539545be395790b1379f894452dfa6db
parent2a42d80d14e97fe962658bbcb3d2341571f2afcf (diff)
downloadgitea-af2adb4e35ea71ca5c7fbb1e51b9d25fe49af2e4.tar.gz
gitea-af2adb4e35ea71ca5c7fbb1e51b9d25fe49af2e4.zip
Specify relation between multiple signing options (#15496)
-rw-r--r--docs/content/doc/advanced/signing.en-us.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/content/doc/advanced/signing.en-us.md b/docs/content/doc/advanced/signing.en-us.md
index 926f6b1f4c..71af33fad8 100644
--- a/docs/content/doc/advanced/signing.en-us.md
+++ b/docs/content/doc/advanced/signing.en-us.md
@@ -109,7 +109,7 @@ when creating a repository. The possible values are:
- `always`: Always sign
Options other than `never` and `always` can be combined as a comma
-separated list.
+separated list. The commit will be signed if all selected options are true.
### `WIKI`
@@ -123,7 +123,7 @@ The possible values are:
- `always`: Always sign
Options other than `never` and `always` can be combined as a comma
-separated list.
+separated list. The commit will be signed if all selected options are true.
### `CRUD_ACTIONS`
@@ -137,7 +137,7 @@ editor or API CRUD actions. The possible values are:
- `always`: Always sign
Options other than `never` and `always` can be combined as a comma
-separated list.
+separated list. The change will be signed if all selected options are true.
### `MERGES`
@@ -154,7 +154,7 @@ The possible options are:
- `always`: Always sign
Options other than `never` and `always` can be combined as a comma
-separated list.
+separated list. The merge will be signed if all selected options are true.
## Obtaining the Public Key of the Signing Key