diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer/tests/test-links.md | 1 | ||||
-rw-r--r-- | doc/help/Markdown.md | 2 | ||||
-rw-r--r-- | doc/install/Configuration-Settings.md | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/doc/developer/tests/test-links.md b/doc/developer/tests/test-links.md index 91e3e9403..b4a04e439 100644 --- a/doc/developer/tests/test-links.md +++ b/doc/developer/tests/test-links.md @@ -40,7 +40,6 @@ http:// ./make-compiled-client.sh test.:test https://<your-mattermost-url>/signup/gitlab -https://your-mattermost-url>/signup/gitlab #### Only the links within these sentences should auto-link: diff --git a/doc/help/Markdown.md b/doc/help/Markdown.md index d185a4160..9d3cb2a90 100644 --- a/doc/help/Markdown.md +++ b/doc/help/Markdown.md @@ -88,7 +88,7 @@ and ## Emojis -Emoji provided free by [Emoji One](http://emojione.com/). Check out a full list of emojis [here](http://http://emoji.codes/). +Emoji provided free by [Emoji One](http://emojione.com/). Check out a full list of emojis [here](http://emoji.codes/). ``` :smile: :+1: :sheep: diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 31d4551f6..7ee440b7c 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -41,6 +41,13 @@ Set the number of days before SSO sessions expire. ```"SessionCacheInMinutes" : 10``` Set the number of minutes to cache a session in memory. +```"WebsocketSecurePort": 443``` +The port to use for secure websocket connections being initiated from the client. By default wss:// uses port 443. Some server configurations (e.g. Cloudfoundry) support wss on a different port. + +```"WebsocketPort": 80``` +The port to use for websocket connections being initiated from the client. By default ws:// uses port 80. + + #### Webhooks ```"EnableIncomingWebhooks": true``` |