diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-07-22 17:47:04 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-07-22 17:47:04 +0400 |
| commit | 9ff3ce8bd17293956bbbcb1b5e2391549bbf9aad (patch) | |
| tree | 28e90a1858f206ee4724100a08400e737cc96688 | |
| parent | reflect correct default value un example documentation (diff) | |
| parent | Fix "s2s_access" option name in documentation (diff) | |
Merge pull request #257 from weiss/fix-option-name
Fix "s2s_access" option name in documentation
| -rw-r--r-- | doc/guide.tex | 4 | ||||
| -rw-r--r-- | ejabberd.yml.example | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/guide.tex b/doc/guide.tex index 44869e167..30ccb7553 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -1288,11 +1288,11 @@ access: all: normal xmlrpc_access: xmlrpc_bot: allow - s2s_access: + s2s: trusted_servers: allow all: deny s2s_certfile: "/path/to/ssl.pem" -s2s_policy: s2s_access +s2s_access: s2s s2s_use_starttls: required_trusted listen: - diff --git a/ejabberd.yml.example b/ejabberd.yml.example index 627011d2e..ad5ca9e4e 100644 --- a/ejabberd.yml.example +++ b/ejabberd.yml.example @@ -196,7 +196,7 @@ listen: ## ## Default s2s policy for undefined hosts. ## -## s2s_policy: s2s_access +## s2s_access: s2s ## ## Outgoing S2S options @@ -487,7 +487,7 @@ access: trusted_network: loopback: allow ## Do not establish S2S connections with bad servers - ## s2s_access: + ## s2s: ## bad_servers: deny ## all: allow |