Merge branch 'pr/396'

Changelog.md

@@ -1,3 +1,8 @@
+# v49 2016/01/13
+
+* Add UK spelling license/licence to the pile + fix up a bunch of typos 
+* Clarify tag handling in docs
+
 # v48 2016/01/13
 
 * Abort restore if there is no $GOPATH set.

Readme.md

@@ -86,7 +86,7 @@ To update a package from your `$GOPATH`, do this:
 1. Run `godep update foo/bar`. (You can use the `...` wildcard, for example
 `godep update foo/...`).
 
-Before committing the change, you'll probably want to inspect the changes to
+Before comitting the change, you'll probably want to inspect the changes to
 Godeps, for example with `git diff`, and make sure it looks reasonable.
 
 ## Multiple Packages

license.go

@@ -7,7 +7,8 @@ import (
 // LicenseFilePrefix is a list of filename prefixes that indicate it
 //  might contain a software license
 var LicenseFilePrefix = []string{
-	"license",
+	"licence", // UK spelling
+	"license", // US spelling
 	"copying",
 	"unlicense",
 	"copyright",

license_test.go

@@ -18,6 +18,9 @@ func TestLicenseFiles(t *testing.T) {
 		{"LICENSE.md", true, true},
 		{"LICENSE.rst", true, true},
 		{"LICENSE.txt", true, true},
+		{"licence", true, true},
+		{"LICENCE.broadcom", true, true},
+		{"LICENCE.md", true, true},
 		{"copying", true, true},
 		{"COPYING.txt", true, true},
 		{"unlicense", true, true},

rewrite.go

@@ -17,7 +17,7 @@ import (
 )
 
 // rewrite visits the go files in pkgs, plus all go files
-// in the directory tree Godeps, rewriting import statments
+// in the directory tree Godeps, rewriting import statements
 // according to the rules for func qualify.
 func rewrite(pkgs []*Package, qual string, paths []string) error {
 	for _, path := range pkgFiles(pkgs) {
@@ -42,7 +42,7 @@ func pkgFiles(pkgs []*Package) []string {
 }
 
 // rewriteTree recursively visits the go files in path, rewriting
-// import statments according to the rules for func qualify.
+// import statements according to the rules for func qualify.
 // This function ignores the 'testdata' directory.
 func rewriteTree(path, qual string, paths []string) error {
 	w := fs.Walk(path)
@@ -66,7 +66,7 @@ func rewriteTree(path, qual string, paths []string) error {
 	return nil
 }
 
-// rewriteGoFile rewrites import statments in the named file
+// rewriteGoFile rewrites import statements in the named file
 // according to the rules for func qualify.
 func rewriteGoFile(name, qual string, paths []string) error {
 	debugln("rewriteGoFile", name, ",", qual, ",", paths)

version.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 )
 
-const version = 48
+const version = 49
 
 var cmdVersion = &Command{
 	Name:  "version",