summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-07-21 13:32:10 +0200
committerGitHub <noreply@github.com>2017-07-21 13:32:10 +0200
commita33b6cdd21868abf026375503a4eb5a36684c8eb (patch)
treea3aa3fb83fc07b4ed3e98197f3e62394b81e99c3
parent86d2fe516e5a6e5cc61c55c63d54d40177b75518 (diff)
parent4e42f059ed788ece49b6fac08bd357869c308903 (diff)
downloadnextcloud-server-a33b6cdd21868abf026375503a4eb5a36684c8eb.tar.gz
nextcloud-server-a33b6cdd21868abf026375503a4eb5a36684c8eb.zip
Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes
Minor documentation fixes
-rw-r--r--lib/private/Authentication/Token/DefaultTokenMapper.php2
-rw-r--r--lib/private/Authentication/Token/DefaultTokenProvider.php2
-rw-r--r--lib/private/Authentication/Token/IProvider.php2
-rw-r--r--settings/Controller/AuthSettingsController.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Authentication/Token/DefaultTokenMapper.php b/lib/private/Authentication/Token/DefaultTokenMapper.php
index 44bc553a92e..ff31628ffb0 100644
--- a/lib/private/Authentication/Token/DefaultTokenMapper.php
+++ b/lib/private/Authentication/Token/DefaultTokenMapper.php
@@ -110,7 +110,7 @@ class DefaultTokenMapper extends Mapper {
}
/**
- * Get all token of a user
+ * Get all tokens of a user
*
* The provider may limit the number of result rows in case of an abuse
* where a high number of (session) tokens is generated
diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index 6fd85295e03..a1a7e83ea21 100644
--- a/lib/private/Authentication/Token/DefaultTokenProvider.php
+++ b/lib/private/Authentication/Token/DefaultTokenProvider.php
@@ -132,7 +132,7 @@ class DefaultTokenProvider implements IProvider {
}
/**
- * Get all token of a user
+ * Get all tokens of a user
*
* The provider may limit the number of result rows in case of an abuse
* where a high number of (session) tokens is generated
diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php
index 9f280263d76..8ec1d9b8d6c 100644
--- a/lib/private/Authentication/Token/IProvider.php
+++ b/lib/private/Authentication/Token/IProvider.php
@@ -105,7 +105,7 @@ interface IProvider {
public function updateTokenActivity(IToken $token);
/**
- * Get all token of a user
+ * Get all tokens of a user
*
* The provider may limit the number of result rows in case of an abuse
* where a high number of (session) tokens is generated
diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php
index 7bb8a6654e6..d1ce567afb9 100644
--- a/settings/Controller/AuthSettingsController.php
+++ b/settings/Controller/AuthSettingsController.php
@@ -156,7 +156,7 @@ class AuthSettingsController extends Controller {
/**
* Return a 25 digit device password
*
- * Example: AbCdE-fGhIj-KlMnO-pQrSt-12345
+ * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
*
* @return string
*/