summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorit33 <iantien@gmail.com>2015-10-29 14:40:23 -0700
committerit33 <iantien@gmail.com>2015-10-29 14:40:23 -0700
commit5e1d6bbb5277af5828f545a6dac2a973f3852e1b (patch)
tree5859cea820abd621929066b5e81447b9ee66eca7
parent1f64733040514f4e13be2ba397323b3bd41d3847 (diff)
parentaf278fa988eefeaa348fed39227868dd82c9e999 (diff)
downloadchat-5e1d6bbb5277af5828f545a6dac2a973f3852e1b.tar.gz
chat-5e1d6bbb5277af5828f545a6dac2a973f3852e1b.tar.bz2
chat-5e1d6bbb5277af5828f545a6dac2a973f3852e1b.zip
Merge pull request #1228 from mattermost/moving-api-doc
Update and rename doc/api/Overview.md to doc/developer/API-Web-Servic…
-rw-r--r--doc/README.md2
-rw-r--r--doc/developer/API-Web-Service.md (renamed from doc/api/Overview.md)6
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/README.md b/doc/README.md
index ccb702a5d..1b9cc759d 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -27,7 +27,7 @@ Set up Mattermost in your data center
- [Code Contribution Guidelines](developer/Code-Contribution-Guidelines.md)
- [Developer Machine Setup](developer/Setup.md)
- [Mattermost Style Guide](developer/Style-Guide.md)
-- [API Overview](api/Overview.md)
+- [API Overview](developer/API.md)
- [Incoming Webhooks](integrations/webhooks/Incoming-Webhooks.md)
## Help
diff --git a/doc/api/Overview.md b/doc/developer/API-Web-Service.md
index 0a407b1e9..53ebc869c 100644
--- a/doc/api/Overview.md
+++ b/doc/developer/API-Web-Service.md
@@ -1,6 +1,8 @@
-# API Overview
+# Mattermost Web Service API
-This provides a basic overview of the Mattermost API. All examples assume there is a Mattermost instance running at http://localhost:8065.
+This provides a basic overview of the Mattermost Web Service API. Drivers interfacing with this API are available in different languages. Current documentation focuses on the transport layer for the API and functional documentation will be developed next.
+
+All examples assume there is a Mattermost instance running at http://localhost:8065.
## Schema