Skip to content
Snippets Groups Projects
Commit cd72a88c5599 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

censor: document the censor.policy option (issue6909)

Censor is not marked as experimental and should be documented

I am not doing this on stable because the help markup change it is using seems
more suitable for default.
parent 76387080f238
No related branches found
No related tags found
3 merge requests!1041Merge default into stable,!997tests: use shlex.quote instead of pipes.quote,!936allow to insert documentation from config item and document censor.policy
......@@ -24,5 +24,6 @@
function in a meaningful way. Such commands only tolerate censored file
As having a censored version in a checkout is impractical. The current head
revisions of the repository are checked. If the revision to be censored is in
any of them the command will abort.
any of them the command will abort. You can configure this behavior using the
following option:
......@@ -28,6 +29,6 @@
A few informative commands such as ``hg grep`` will unconditionally
ignore censored data and merely report that it was encountered.
`censor.policy`
:config-doc:`censor.policy`
"""
......
......@@ -65,7 +65,13 @@
section = "censor"
name = "policy"
default = "abort"
experimental = true
documentation="""Control how to react when accessing censored content.
Accepted value: "abort", "ignore". Defaults to abort.
A few informative commands such as ``hg grep`` will unconditionally ignore
censored data and merely report that it was encountered.
"""
[[items]]
section = "chgserver"
......
......@@ -418,6 +418,12 @@
If no suitable authentication entry is found, the user is prompted
for credentials as usual if required by the remote.
``censor``
----------
``policy``
:config-doc:`censor.policy`
``cmdserver``
-------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment