github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22036 from timstclair/docs

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-01 11:46:33 -08:00
commit d5a4915cf3
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/cloudimages/README.md
View File

@ -24,15 +24,15 @@ Advantages of a harmonized image:
## bootstrap-vz ## bootstrap-vz
Currently images are built using Currently images are built using
(bootstrap-vz)[https://github.com/andsens/bootstrap-vz], because this is [bootstrap-vz](https://github.com/andsens/bootstrap-vz), because this is
default builder for the official Debian images, and because it supports default builder for the official Debian images, and because it supports
multiple clouds including AWS, Azure & GCE. It also supports KVM, which should multiple clouds including AWS, Azure & GCE. It also supports KVM, which should
support OpenStack. support OpenStack.
## Building an image ## Building an image
A go program/script to build images in (in A go program/script to build images in
progress)[https://github.com/kubernetes/contrib/pull/486], in the contrib [in progress](https://github.com/kubernetes/contrib/pull/486), in the contrib
project. project.

12
cmd/mungedocs/links.go
View File

@ -29,6 +29,8 @@ import (
var ( var (
// Finds markdown links of the form [foo](bar "alt-text"). // Finds markdown links of the form [foo](bar "alt-text").
linkRE = regexp.MustCompile(`\[([^]]*)\]\(([^)]*)\)`) linkRE = regexp.MustCompile(`\[([^]]*)\]\(([^)]*)\)`)
// Finds markdown link typos of the form (foo)[bar]
badLinkRE = regexp.MustCompile(`\([^]()]*\)\[[^]()]*\]`)
// Splits the link target into link target and alt-text. // Splits the link target into link target and alt-text.
altTextRE = regexp.MustCompile(`([^)]*)( ".*")`) altTextRE = regexp.MustCompile(`([^)]*)( ".*")`)
) )
@ -125,7 +127,15 @@ func updateLinks(filePath string, mlines mungeLines) (mungeLines, error) {
allErrs := []string{} allErrs := []string{}
for lineNum, mline := range mlines { for lineNum, mline := range mlines {
if mline.preformatted || !mline.link { if mline.preformatted {
out = append(out, mline)
continue
}
if badMatch := badLinkRE.FindString(mline.data); badMatch != "" {
allErrs = append(allErrs,
fmt.Sprintf("On line %d: found backwards markdown link %q", lineNum, badMatch))
}
if !mline.link {
out = append(out, mline) out = append(out, mline)
continue continue
} }

2
examples/spark/README.md
View File

@ -237,7 +237,7 @@ $ kubectl port-forward zeppelin-controller-ja09s 8080:8080
``` ```
This forwards `localhost` 8080 to container port 8080. You can then find This forwards `localhost` 8080 to container port 8080. You can then find
Zeppelin at (https://localhost:8080/)[https://localhost:8080/]. Zeppelin at [https://localhost:8080/](https://localhost:8080/).
Create a "New Notebook". In there, type: Create a "New Notebook". In there, type: