From e795408586c9a39ec88b5a4e67b3d53c51eec9a4 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 1 Feb 2017 09:40:17 +0100 Subject: [PATCH] Merge pull request #30620 from thaJeztah/carry-29590 some grammatical errors (cherry picked from commit deb0885419bcca64d73de66fa1d0980edb77d3df) Signed-off-by: Sebastiaan van Stijn --- image/spec/v1.1.md | 2 +- image/spec/v1.2.md | 2 +- image/spec/v1.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/image/spec/v1.1.md b/image/spec/v1.1.md index 83f138011d..6279da54af 100644 --- a/image/spec/v1.1.md +++ b/image/spec/v1.1.md @@ -99,7 +99,7 @@ This specification uses the following terms: my-app:3.1.4, my-app is the Repository component of the name. A repository name is made up of slash-separated name components, optionally prefixed by a DNS hostname. The hostname - must follow comply with standard DNS rules, but may not contain + must comply with standard DNS rules, but may not contain _ characters. If a hostname is present, it may optionally be followed by a port number in the format :8080. Name components may contain lowercase characters, digits, and diff --git a/image/spec/v1.2.md b/image/spec/v1.2.md index 6c641cafec..483ce1e4cb 100644 --- a/image/spec/v1.2.md +++ b/image/spec/v1.2.md @@ -99,7 +99,7 @@ This specification uses the following terms: my-app:3.1.4, my-app is the Repository component of the name. A repository name is made up of slash-separated name components, optionally prefixed by a DNS hostname. The hostname - must follow comply with standard DNS rules, but may not contain + must comply with standard DNS rules, but may not contain _ characters. If a hostname is present, it may optionally be followed by a port number in the format :8080. Name components may contain lowercase characters, digits, and diff --git a/image/spec/v1.md b/image/spec/v1.md index 69115549cb..fce3a06e36 100644 --- a/image/spec/v1.md +++ b/image/spec/v1.md @@ -440,7 +440,7 @@ f60c56784b83/ my-app-tools ``` -This example change is going add a configuration directory at `/etc/my-app.d` +This example change is going to add a configuration directory at `/etc/my-app.d` which contains a default config file. There's also a change to the `my-app-tools` binary to handle the config layout change. The `f60c56784b83` directory then looks like this: