Browse code

1.change validateNoSchema into validateNoScheme 2.change schema into scheme in docs and some annotations.

Signed-off-by: allencloud <allen.sun@daocloud.io>

allencloud authored on 2016/03/29 15:36:38
Showing 6 changed files
... ...
@@ -234,7 +234,7 @@ func parseURL(ctx logger.Context) (*url.URL, error) {
234 234
 		(splunkURL.Path != "" && splunkURL.Path != "/") ||
235 235
 		splunkURL.RawQuery != "" ||
236 236
 		splunkURL.Fragment != "" {
237
-		return nil, fmt.Errorf("%s: expected format schema://dns_name_or_ip:port for %s", driverName, splunkURLKey)
237
+		return nil, fmt.Errorf("%s: expected format scheme://dns_name_or_ip:port for %s", driverName, splunkURLKey)
238 238
 	}
239 239
 
240 240
 	splunkURL.Path = "/services/collector/event/1.0"
... ...
@@ -36,7 +36,7 @@ logging driver options:
36 36
 | Option                      | Required | Description                                                                                                                                                                                                        |
37 37
 |-----------------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
38 38
 | `splunk-token`              | required | Splunk HTTP Event Collector token.                                                                                                                                                                                 |
39
-| `splunk-url`                | required | Path to your Splunk Enterprise or Splunk Cloud instance (including port and schema used by HTTP Event Collector) `https://your_splunk_instance:8088`.                                                              |
39
+| `splunk-url`                | required | Path to your Splunk Enterprise or Splunk Cloud instance (including port and scheme used by HTTP Event Collector) `https://your_splunk_instance:8088`.                                                              |
40 40
 | `splunk-source`             | optional | Event source.                                                                                                                                                                                                      |
41 41
 | `splunk-sourcetype`         | optional | Event source type.                                                                                                                                                                                                 |
42 42
 | `splunk-index`              | optional | Event index.                                                                                                                                                                                                       |
... ...
@@ -53,7 +53,7 @@ Both options add additional fields to the attributes of a logging message.
53 53
 Below is an example of the logging option specified for the Splunk Enterprise
54 54
 instance. The instance is installed locally on the same machine on which the
55 55
 Docker daemon is running. The path to the root certificate and Common Name is
56
-specified using an HTTPS schema. This is used for verification.
56
+specified using an HTTPS scheme. This is used for verification.
57 57
 The `SplunkServerDefaultCert` is automatically generated by Splunk certificates.
58 58
 
59 59
     docker run --log-driver=splunk \
... ...
@@ -177,7 +177,7 @@ you must use `--rm=false`. This does not affect the build cache.
177 177
 This will clone the GitHub repository and use the cloned repository as context.
178 178
 The Dockerfile at the root of the repository is used as Dockerfile. Note that
179 179
 you can specify an arbitrary Git repository by using the `git://` or `git@`
180
-schema.
180
+scheme.
181 181
 
182 182
 ### Build with -
183 183
 
... ...
@@ -277,7 +277,7 @@ repository.
277 277
 
278 278
     docker build github.com/scollier/purpletest
279 279
 
280
-Note: You can set an arbitrary Git repository via the `git://` schema.
280
+Note: You can set an arbitrary Git repository via the `git://` scheme.
281 281
 
282 282
 ## Building an image using a URL to a tarball'ed context
283 283
 
... ...
@@ -206,7 +206,7 @@ func ValidateIndexName(val string) (string, error) {
206 206
 	return val, nil
207 207
 }
208 208
 
209
-func validateNoSchema(reposName string) error {
209
+func validateNoScheme(reposName string) error {
210 210
 	if strings.Contains(reposName, "://") {
211 211
 		// It cannot contain a scheme!
212 212
 		return ErrInvalidRepositoryName
... ...
@@ -91,7 +91,7 @@ func splitReposSearchTerm(reposName string) (string, string) {
91 91
 // Search queries the public registry for images matching the specified
92 92
 // search terms, and returns the results.
93 93
 func (s *Service) Search(term string, authConfig *types.AuthConfig, userAgent string, headers map[string][]string) (*registrytypes.SearchResults, error) {
94
-	if err := validateNoSchema(term); err != nil {
94
+	if err := validateNoScheme(term); err != nil {
95 95
 		return nil, err
96 96
 	}
97 97