Browse code

Docs: Be more clear when specifying valid formats for strings

- Use the word letter rather than character to refer to letters ;) when trying to specify that only letters and numbers can be used, and not ANY character...
- Small corrections

Fixes #29821

Signed-off-by: Timothy Hobbs <timothy@hobbs.cz>

Timothy Hobbs authored on 2017/01/03 06:06:46
Showing 3 changed files
... ...
@@ -29,13 +29,13 @@ by a registry hostname. The hostname must comply with standard DNS rules, but
29 29
 may not contain underscores. If a hostname is present, it may optionally be
30 30
 followed by a port number in the format `:8080`. If not present, the command
31 31
 uses Docker's public registry located at `registry-1.docker.io` by default. Name
32
-components may contain lowercase characters, digits and separators. A separator
32
+components may contain lowercase letters, digits and separators. A separator
33 33
 is defined as a period, one or two underscores, or one or more dashes. A name
34 34
 component may not start or end with a separator.
35 35
 
36
-A tag name may contain lowercase and uppercase characters, digits, underscores,
37
-periods and dashes. A tag name may not start with a period or a dash and may
38
-contain a maximum of 128 characters.
36
+A tag name must be valid ASCII and may contain lowercase and uppercase letters,
37
+digits, underscores, periods and dashes. A tag name may not start with a
38
+period or a dash and may contain a maximum of 128 characters.
39 39
 
40 40
 You can group your images together using names and tags, and then upload them
41 41
 to [*Share Images via Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/#/contributing-to-docker-hub).
... ...
@@ -92,7 +92,7 @@ This specification uses the following terms:
92 92
         often referred to as a tag as well, though it strictly refers to the
93 93
         full name of an image. Acceptable values for a tag suffix are
94 94
         implementation specific, but they SHOULD be limited to the set of
95
-        alphanumeric characters <code>[a-zA-z0-9]</code>, punctuation
95
+        alphanumeric characters <code>[a-zA-Z0-9]</code>, punctuation
96 96
         characters <code>[._-]</code>, and MUST NOT contain a <code>:</code>
97 97
         character.
98 98
     </dd>
... ...
@@ -105,7 +105,7 @@ This specification uses the following terms:
105 105
         <code>my-app:3.1.4</code>, <code>my-app</code> is the <i>Repository</i>
106 106
         component of the name. Acceptable values for repository name are
107 107
         implementation specific, but they SHOULD be limited to the set of
108
-        alphanumeric characters <code>[a-zA-z0-9]</code>, and punctuation
108
+        alphanumeric characters <code>[a-zA-Z0-9]</code>, and punctuation
109 109
         characters <code>[._-]</code>, however it MAY contain additional
110 110
         <code>/</code> and <code>:</code> characters for organizational
111 111
         purposes, with the last <code>:</code> character being interpreted
... ...
@@ -9,15 +9,16 @@ entire image name including the optional `TAG` after the ':'.
9 9
    present, it may optionally be followed by a port number in the format 
10 10
    `:8080`. If not present, the command uses Docker's public registry located at
11 11
    `registry-1.docker.io` by default. Name components may contain lowercase 
12
-   characters, digits and separators. A separator is defined as a period, one or 
12
+   letters, digits and separators. A separator is defined as a period, one or
13 13
    two underscores, or one or more dashes. A name component may not start or end 
14 14
    with a separator.
15 15
 
16 16
 **TAG**
17 17
    The tag assigned to the image to version and distinguish images with the same
18
-   name. The tag name may contain lowercase and uppercase characters, digits, 
19
-   underscores, periods and dashes. A tag name may not start with a period or a 
20
-   dash and may contain a maximum of 128 characters.
18
+   name. The tag name must be valid ASCII and may contain lowercase and
19
+   uppercase letters, digits, underscores, periods and hyphens. A tag name
20
+   may not start with a period or a hyphen and may contain a maximum of 128
21
+   characters.
21 22
 
22 23
 # EXAMPLES
23 24