Merge "v2 api: correct user list"

api-ref/source/v2-admin/admin-users.inc

@@ -108,7 +108,7 @@ Response Parameters
 Response Example
 ----------------
 
-.. literalinclude:: samples/admin/user-show-response.json
+.. literalinclude:: samples/admin/users-list-response.json
    :language: javascript
 
 

api-ref/source/v2-admin/samples/admin/users-list-response.json

@@ -0,0 +1,19 @@
+{
+    "users": [
+        {
+            "id": "3c9530e",
+            "name": "admin",
+            "email": "admin@example.org",
+            "username": "admin",
+            "enabled": true
+        },
+        {
+            "id": "a0ae37b",
+            "name": "demo",
+            "email": "demo@example.org",
+            "username": "demo",
+            "enabled": true
+        }
+    ],
+    "users_links": []
+}

api-ref/source/v2-ext/ksadm-admin.inc

@@ -193,34 +193,6 @@ Response Example
    :language: javascript
 
 
-List users (admin extension)
-============================
-
-.. rest_method::  GET /v2.0/users
-
-Lists all users.
-
-Normal response codes: 200,203
-Error response codes: 413,405,404,403,401,400,503
-
-Response Parameters
--------------------
-
-.. rest_parameters:: parameters.yaml
-
-   - users: users
-   - enabled: enabled
-   - email: email
-   - name: name
-   - id: id
-
-Response Example
-----------------
-
-.. literalinclude:: samples/OS-KSADM/users-list-response.json
-   :language: javascript
-
-
 Create user (admin extension)
 =============================