diff options
| author | John McLear <john@mclear.co.uk> | 2013-01-02 06:20:59 -0800 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2013-01-02 06:20:59 -0800 |
| commit | 6e7b6942430c7974fb66817de6452343b62a75fc (patch) | |
| tree | fc991acf8aa2675f1b2424c44a45c3374f4ea96b | |
| parent | 1d5dbd45ca88ac9b5f025d5f1aae097301a6a234 (diff) | |
| parent | 9f9f7a627e742c772344d55f048c7245ca03ebcd (diff) | |
| download | etherpad-lite-6e7b6942430c7974fb66817de6452343b62a75fc.zip | |
Merge pull request #1318 from stephan48/develop
Corrected Documentation for checkToken() API Method
| -rw-r--r-- | doc/api/http_api.md | 2 | ||||
| -rw-r--r-- | src/node/db/API.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/http_api.md b/doc/api/http_api.md index 61daeaa3..b9b5fedb 100644 --- a/doc/api/http_api.md +++ b/doc/api/http_api.md @@ -414,7 +414,7 @@ sends a custom message of type `msg` to the pad #### checkToken() * API >= 1.2 -returns ok when api token is valid +returns ok when the current api token is valid *Example returns:* * `{"code":0,"message":"ok","data":null}` diff --git a/src/node/db/API.js b/src/node/db/API.js index ea58d859..a26055a7 100644 --- a/src/node/db/API.js +++ b/src/node/db/API.js @@ -549,7 +549,7 @@ exports.sendClientsMessage = function (padID, msg, callback) { } /** -checkToken() returns ok when api token is valid +checkToken() returns ok when the current api token is valid Example returns: |