Browse code

proper rebase

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Victor Vieux authored on 2014/07/12 07:39:43
Showing 2 changed files
... ...
@@ -1,4 +1,4 @@
1
-page_title: Remote API v1.12
1
+page_title: Remote API v1.13
2 2
 page_description: API Documentation for Docker
3 3
 page_keywords: API, Docker, rcli, REST, documentation
4 4
 
... ...
@@ -302,7 +302,7 @@ List processes running inside the container `id`
302 302
 
303 303
 `GET /containers/(id)/logs`
304 304
 
305
-Get STDOUT and STDERR logs from the container ``id``
305
+Get stdout and stderr logs from the container ``id``
306 306
 
307 307
     **Example request**:
308 308
 
... ...
@@ -593,16 +593,16 @@ Attach to the container `id`
593 593
     When using the TTY setting is enabled in
594 594
     [`POST /containers/create`
595 595
     ](../docker_remote_api_v1.9/#post--containers-create "POST /containers/create"),
596
-    the stream is the raw data from the process PTY and client's STDIN.
596
+    the stream is the raw data from the process PTY and client's stdin.
597 597
     When the TTY is disabled, then the stream is multiplexed to separate
598
-    STDOUT and STDERR.
598
+    stdout and stderr.
599 599
 
600 600
     The format is a **Header** and a **Payload** (frame).
601 601
 
602 602
     **HEADER**
603 603
 
604 604
     The header will contain the information on which stream write the
605
-    stream (STDOUT or STDERR). It also contain the size of the
605
+    stream (stdout or stderr). It also contain the size of the
606 606
     associated frame encoded on the last 4 bytes (uint32).
607 607
 
608 608
     It is encoded on the first 8 bytes like this:
... ...
@@ -611,9 +611,9 @@ Attach to the container `id`
611 611
 
612 612
     `STREAM_TYPE` can be:
613 613
 
614
-    -   0: STDIN (will be written on STDOUT)
615
-    -   1: STDOUT
616
-    -   2: STDERR
614
+    -   0: stdin (will be written on stdout)
615
+    -   1: stdout
616
+    -   2: stderr
617 617
 
618 618
     `SIZE1, SIZE2, SIZE3, SIZE4` are the 4 bytes of
619 619
     the uint32 size encoded as big endian.
... ...
@@ -627,7 +627,7 @@ Attach to the container `id`
627 627
     The simplest way to implement the Attach protocol is the following:
628 628
 
629 629
     1.  Read 8 bytes
630
-    2.  chose STDOUT or STDERR depending on the first byte
630
+    2.  chose stdout or stderr depending on the first byte
631 631
     3.  Extract the frame size from the last 4 byets
632 632
     4.  Read the extracted size and output it on the correct output
633 633
     5.  Goto 1)
... ...
@@ -1077,11 +1077,11 @@ Search for an image on [Docker Hub](https://hub.docker.com).
1077 1077
 
1078 1078
 ## 2.3 Misc
1079 1079
 
1080
-### Build an image from Dockerfile via STDIN
1080
+### Build an image from Dockerfile via stdin
1081 1081
 
1082 1082
 `POST /build`
1083 1083
 
1084
-Build an image from Dockerfile via STDIN
1084
+Build an image from Dockerfile via stdin
1085 1085
 
1086 1086
     **Example request**:
1087 1087
 
... ...
@@ -1403,16 +1403,16 @@ Here are the steps of `docker run`:
1403 1403
 - Start the container
1404 1404
 
1405 1405
 - If you are not in detached mode:
1406
-    - Attach to the container, using logs=1 (to have STDOUT and
1407
-      STDERR from the container's start) and stream=1
1406
+    - Attach to the container, using logs=1 (to have stdout and
1407
+      stderr from the container's start) and stream=1
1408 1408
 
1409
-- If in detached mode or only STDIN is attached:
1409
+- If in detached mode or only stdin is attached:
1410 1410
     - Display the container's id
1411 1411
 
1412 1412
 ## 3.2 Hijacking
1413 1413
 
1414
-In this version of the API, /attach, uses hijacking to transport STDIN,
1415
-STDOUT and STDERR on the same socket. This might change in the future.
1414
+In this version of the API, /attach, uses hijacking to transport stdin,
1415
+stdout and stderr on the same socket. This might change in the future.
1416 1416
 
1417 1417
 ## 3.3 CORS Requests
1418 1418