diff --git a/doc/codewalk/markov.xml b/doc/codewalk/markov.xml index 81df1289c21..977c95dadb6 100644 --- a/doc/codewalk/markov.xml +++ b/doc/codewalk/markov.xml @@ -155,7 +155,7 @@ Prefix Map key

For more information about the append function and slices in general see the - Slices: usage and internals article. + Slices: usage and internals article. diff --git a/doc/go_faq.html b/doc/go_faq.html index d95da0f6faa..e06cab14cb6 100644 --- a/doc/go_faq.html +++ b/doc/go_faq.html @@ -320,10 +320,9 @@ exceptional.

Go takes a different approach. For plain error handling, Go's multi-value returns make it easy to report an error without overloading the return value. -A -canonical error type, coupled -with Go's other features, makes error -handling pleasant but quite different from that in other languages. +A canonical error type, coupled +with Go's other features, makes error handling pleasant but quite different +from that in other languages.

@@ -336,7 +335,7 @@ when used well, can result in clean error-handling code.

-See the Defer, Panic, and Recover article for details. +See the Defer, Panic, and Recover article for details.

@@ -1317,8 +1316,7 @@ table-driven, iterating over a list of inputs and outputs defined in a data structure (Go has excellent support for data structure literals). The work to write a good test and good error messages will then be amortized over many test cases. The standard Go library is full of illustrative examples, such as in -the formatting -tests for the fmt package. +the formatting tests for the fmt package.

@@ -1588,7 +1586,7 @@ appear on a line by itself. Some have argued that the lexer should do lookahead to permit the brace to live on the next line. We disagree. Since Go code is meant to be formatted automatically by -gofmt, +gofmt, some style must be chosen. That style may differ from what you've used in C or Java, but Go is a new language and gofmt's style is as good as any other. More