Merge branch 'issue_341' into server_change_api

This commit is contained in:
Maximilian Hils
2014-09-06 12:43:32 +02:00
4 changed files with 17 additions and 6 deletions

View File

@@ -421,8 +421,7 @@ def common_options(parser):
"Proxy Authentication",
"""
Specify which users are allowed to access the proxy and the method
used for authenticating them. These options are ignored if the
proxy is in transparent or reverse proxy mode.
used for authenticating them.
"""
)
user_specification_group = group.add_mutually_exclusive_group()