1. docker
  2. Commit 69e481af4e1fec65629c6ea4eb74fc58f5abc932
Browse code

"Annotations" not a parameter

Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>

Eivin Giske Skaaren authored on 2016/08/16 20:58:50
Showing 2 changed files
docs/reference/api/docker_remote_api_v1.24.md
History View file @ 69e481a
... ... 
@@ -4546,10 +4546,8 @@ image](#create-an-image) section for more details.
4546 4546
4547 4547 
 JSON Parameters:
4548 4548
4549 
-- **Annotations** – Optional medata to associate with the service.
4550 
-    - **Name** – User-defined name for the service.
4551 
-    - **Labels** – A map of labels to associate with the service (e.g.,
4552 
-      `{"key":"value"[,"key2":"value2"]}`).
4549 
+- **Name** – User-defined name for the service.
4550 
+- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value"[,"key2":"value2"]}`).
4553 4551 
 - **TaskTemplate** – Specification of the tasks to start as part of the new service.
4554 4552 
     - **ContainerSpec** - Container settings for containers started as part of this task.
4555 4553 
         - **Image** – A string specifying the image name to use for the container.
... ... 
@@ -4636,11 +4634,11 @@ Stop and remove the service `id`
4636 4636
4637 4637 
 **Example response**:
4638 4638
4639 
-    HTTP/1.1 204 No Content
4639 
+    HTTP/1.1 200 No Content
4640 4640
4641 4641 
 **Status codes**:
4642 4642
4643 
--   **204** – no error
4643 
+-   **200** – no error
4644 4644 
 -   **404** – no such service
4645 4645 
 -   **500** – server error
4646 4646
... ... 
@@ -4778,10 +4776,8 @@ image](#create-an-image) section for more details.
4778 4778
4779 4779 
 **JSON Parameters**:
4780 4780
4781 
-- **Annotations** – Optional medata to associate with the service.
4782 
-    - **Name** – User-defined name for the service.
4783 
-    - **Labels** – A map of labels to associate with the service (e.g.,
4784 
-      `{"key":"value"[,"key2":"value2"]}`).
4781 
+- **Name** – User-defined name for the service.
4782 
+- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value"[,"key2":"value2"]}`).
4785 4783 
 - **TaskTemplate** – Specification of the tasks to start as part of the new service.
4786 4784 
     - **ContainerSpec** - Container settings for containers started as part of this task.
4787 4785 
         - **Image** – A string specifying the image name to use for the container.
... ... 
@@ -4857,7 +4853,7 @@ image](#create-an-image) section for more details.
4857 4857 
 -   **200** – no error
4858 4858 
 -   **404** – no such service
4859 4859 
 -   **500** – server error
4860 
-
4860 
+
4861 4861 
 ## 3.10 Tasks
4862 4862
4863 4863 
 **Note**: Task operations require the engine to be part of a swarm.
docs/reference/api/docker_remote_api_v1.25.md
History View file @ 69e481a
... ... 
@@ -4570,10 +4570,8 @@ image](#create-an-image) section for more details.
4570 4570
4571 4571 
 JSON Parameters:
4572 4572
4573 
-- **Annotations** – Optional medata to associate with the service.
4574 
-    - **Name** – User-defined name for the service.
4575 
-    - **Labels** – A map of labels to associate with the service (e.g.,
4576 
-      `{"key":"value"[,"key2":"value2"]}`).
4573 
+- **Name** – User-defined name for the service.
4574 
+- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value"[,"key2":"value2"]}`).
4577 4575 
 - **TaskTemplate** – Specification of the tasks to start as part of the new service.
4578 4576 
     - **ContainerSpec** - Container settings for containers started as part of this task.
4579 4577 
         - **Image** – A string specifying the image name to use for the container.
... ... 
@@ -4660,11 +4658,11 @@ Stop and remove the service `id`
4660 4660
4661 4661 
 **Example response**:
4662 4662
4663 
-    HTTP/1.1 204 No Content
4663 
+    HTTP/1.1 200 No Content
4664 4664
4665 4665 
 **Status codes**:
4666 4666
4667 
--   **204** – no error
4667 
+-   **200** – no error
4668 4668 
 -   **404** – no such service
4669 4669 
 -   **500** – server error
4670 4670
... ... 
@@ -4802,10 +4800,8 @@ image](#create-an-image) section for more details.
4802 4802
4803 4803 
 **JSON Parameters**:
4804 4804
4805 
-- **Annotations** – Optional medata to associate with the service.
4806 
-    - **Name** – User-defined name for the service.
4807 
-    - **Labels** – A map of labels to associate with the service (e.g.,
4808 
-      `{"key":"value"[,"key2":"value2"]}`).
4805 
+- **Name** – User-defined name for the service.
4806 
+- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value"[,"key2":"value2"]}`).
4809 4807 
 - **TaskTemplate** – Specification of the tasks to start as part of the new service.
4810 4808 
     - **ContainerSpec** - Container settings for containers started as part of this task.
4811 4809 
         - **Image** – A string specifying the image name to use for the container.