More tweaks based on review

cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #

cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml

@@ -1,43 +1,38 @@
 
-## EXAMPLE (these lines may be deleted)
-#
+## Gopkg.toml example (these lines may be deleted)
+
 ## "required" lists a set of packages (not projects) that must be included in
 ## Gopkg.lock. This list is merged with the set of packages imported by the current
 ## project. Use it when your project needs a package it doesn't explicitly import -
 ## including "main" packages.
 # required = ["github.com/user/thing/cmd/thing"]
-#
-#
+
 ## "ignored" lists a set of packages (not projects) that are ignored when
 ## dep statically analyzes source code. Ignored packages can be in this project,
 ## or in a dependency.
 # ignored = ["github.com/user/project/badpkg"]
-#
-#
-# [[dependencies]]
+
 ## Dependencies define constraints on dependent projects. They are respected by
 ## dep whether coming from the Gopkg.toml of the current project or a dependency.
-#
+# [[dependencies]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #
-## Optional, but recommended: the version constraint to enforce for the project.
+## Recommended: the version constraint to enforce for the project.
 ## Only one of "branch", "version" or "revision" can be specified.
 # version = "1.0.0"
 # branch = "master"
 # revision = "abc123"
 #
 ## Optional: an alternate location (URL or import path) for the project's source.
 # source = "https://github.com/myfork/package.git"
-#
-#
-# [[overrides]]
+
 ## Overrides have the same structure as [[dependencies]], but supercede all
 ## [[dependencies]] declarations from all projects. Only the current project's
 ## [[overrides]] are applied.
 ##
 ## Overrides are a sledgehammer. Use them only as a last resort.
-#
+# [[overrides]]
 ## Required: the root import path of the project being constrained.
 # name = "github.com/user/project"
 #