diff --git a/cluster/addons/README.md b/cluster/addons/README.md index 0c74116f1dd..3361f4a6496 100644 --- a/cluster/addons/README.md +++ b/cluster/addons/README.md @@ -21,7 +21,7 @@ manifests on the master server. But still, users are discouraged to do it on their own - they should rather wait for a new release of Kubernetes that will also contain new versions of add-ons. -Each add-on must specify the following label: ````kubernetes.io/cluster-service: true````. +Each add-on must specify the following label: ```kubernetes.io/cluster-service: true```. Yaml files that do not define this label will be ignored. The naming convention for Replication Controllers is diff --git a/cmd/mungedocs/preformatted.go b/cmd/mungedocs/preformatted.go index bd42f71a5bd..515b6e3f2c8 100644 --- a/cmd/mungedocs/preformatted.go +++ b/cmd/mungedocs/preformatted.go @@ -16,9 +16,7 @@ limitations under the License. package main -import ( - "bytes" -) +import "bytes" // Blocks of ``` need to have blank lines on both sides or they don't look // right in HTML. diff --git a/cmd/mungedocs/util.go b/cmd/mungedocs/util.go index 1a756dec0a9..a5fd2847a45 100644 --- a/cmd/mungedocs/util.go +++ b/cmd/mungedocs/util.go @@ -23,13 +23,6 @@ import ( "strings" ) -var ( - // Finds all preformatted block start/stops. - preformatRE = regexp.MustCompile("^[\\s]*```.*") - notPreformatRE = regexp.MustCompile("^[\\s]*```.*```.*") - preformatEndRE = regexp.MustCompile(".*```.*") -) - // Splits a document up into a slice of lines. func splitLines(document []byte) []string { lines := strings.Split(string(document), "\n") @@ -141,6 +134,12 @@ type fileBlock struct { type fileBlocks []fileBlock +var ( + // Finds all preformatted block start/stops. + preformatRE = regexp.MustCompile("^\\s*```") + notPreformatRE = regexp.MustCompile("^\\s*```.*```") +) + func splitByPreformatted(input []byte) fileBlocks { f := fileBlocks{} @@ -161,7 +160,7 @@ func splitByPreformatted(input []byte) fileBlocks { cur = append(cur, line...) } else { cur = append(cur, line...) - if preformatEndRE.Match(line) { + if preformatRE.Match(line) { if len(cur) > 0 { f = append(f, fileBlock{true, cur}) } diff --git a/docs/getting-started-guides/rkt/README.md b/docs/getting-started-guides/rkt/README.md index 37fcf184d57..516377bcdc7 100644 --- a/docs/getting-started-guides/rkt/README.md +++ b/docs/getting-started-guides/rkt/README.md @@ -90,7 +90,7 @@ $ export KUBE_RKT_VERSION=0.5.6 Then you can launch the cluster by: -````shell +```shell $ kube-up.sh ``` @@ -120,7 +120,7 @@ $ export COREOS_CHANNEL=stable Then you can launch the cluster by: -````shell +```shell $ kube-up.sh ``` diff --git a/examples/aws_ebs/README.md b/examples/aws_ebs/README.md index d26a5dab2d7..32e79fe876f 100644 --- a/examples/aws_ebs/README.md +++ b/examples/aws_ebs/README.md @@ -52,7 +52,7 @@ You should now be able to query your web server: ```shell $ curl $ Hello World -```` +``` diff --git a/examples/hazelcast/README.md b/examples/hazelcast/README.md index 52c707619e1..59a2b6043ed 100644 --- a/examples/hazelcast/README.md +++ b/examples/hazelcast/README.md @@ -236,14 +236,13 @@ Members [2] { } 2015-07-10 13:26:47.722 INFO 5 --- [ main] com.hazelcast.core.LifecycleService : [10.244.77.3]:5701 [someGroup] [3.5] Address[10.244.77.3]:5701 is STARTED -2015-07-10 13:26:47.723 INFO 5 --- [ main] com.github.pires.hazelcast.Application : Started Application in 13.792 seconds (JVM running for 14.542)``` +2015-07-10 13:26:47.723 INFO 5 --- [ main] com.github.pires.hazelcast.Application : Started Application in 13.792 seconds (JVM running for 14.542) +``` Now let's scale our cluster to 4 nodes: ```sh - $ kubectl scale rc hazelcast --replicas=4 - ``` Examine the status again by checking the logs and you should see the 4 members connected. @@ -253,7 +252,6 @@ Examine the status again by checking the logs and you should see the 4 members c For those of you who are impatient, here is the summary of the commands we ran in this tutorial. ```sh - # create a service to track all hazelcast nodes kubectl create -f examples/hazelcast/hazelcast-service.yaml @@ -265,7 +263,6 @@ kubectl scale rc hazelcast --replicas=2 # scale up to 4 nodes kubectl scale rc hazelcast --replicas=4 - ``` ### Hazelcast Discovery Source