diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-10-09 12:37:42 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-10-09 12:37:42 -0400 |
commit | 411606a75a5e816ab43e6f5daf34f85951bd6622 (patch) | |
tree | d94b16a7b076bfbdc2da8f6cadaa6a6d6c6870b2 /doc/README.md | |
parent | 73371fe33033f32c89bf7dd49170afc4afb1540c (diff) | |
parent | a0febe2f3156ceb02635d9ecd5124da49c494161 (diff) | |
download | chat-411606a75a5e816ab43e6f5daf34f85951bd6622.tar.gz chat-411606a75a5e816ab43e6f5daf34f85951bd6622.tar.bz2 chat-411606a75a5e816ab43e6f5daf34f85951bd6622.zip |
Merge branch 'master' into golang-version
Diffstat (limited to 'doc/README.md')
-rw-r--r-- | doc/README.md | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/doc/README.md b/doc/README.md index 4c7c4cc0e..fcda4fd08 100644 --- a/doc/README.md +++ b/doc/README.md @@ -2,17 +2,23 @@ ## Installation +#### Preview Installation +Get up and running quickly with Docker-based install + - [AWS Elastic Beanstalk Setup](install/Amazon-Elastic-Beanstalk.md) - [Docker Single Container Preview Setup](install/Docker-Single-Container.md) -- [Production Ubuntu Setup](install/Production-Ubuntu.md) -- [Mattermost Release Numbering Scheme](install/Release-Numbering.md) -- [Software and Hardware Requirements](install/Requirements.md) - [SMTP Email Setup](install/SMTP-Email-Setup.md) -## Integrations +#### Production Installation +Set up Mattermost in your data center +- [Software and Hardware Requirements](install/Requirements.md) +- [Production Ubuntu Setup](install/Production-Ubuntu.md) +- [SMTP Email Setup](install/SMTP-Email-Setup.md) -- [GitLab SSO Configuration](integrations/Single-Sign-On/Gitlab.md) -- [Incoming Webhooks](integrations/webhooks/Incoming.md) +#### Configuration and Management +- Configuration Settings Overview + - [GitLab SSO Configuration](integrations/Single-Sign-On/Gitlab.md) +- [Mattermost Release Numbering Scheme](install/Release-Numbering.md) ## Developer Documentation @@ -20,8 +26,17 @@ - [Developer Machine Setup](developer/Setup.md) - [Mattermost Style Guide](developer/Style-Guide.md) - [API Overview](api/Overview.md) + - [Incoming Webhooks](integrations/webhooks/Incoming-Webhooks.md) + +## Help + +_Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._ + +- User Interface + - [Manage Team](help/Manage-Team.md) + - Team Settings + - [Slack Import](help/Slack-Import.md) -## Usage Help +- Messaging + - [Mattermost Markdown Formatting](usage/Markdown.md) -- [Slack Import](usage/Slack-Import.md) -- [Mattermost Markdown Formatting](usage/Markdown.md) |