</tr>
<tr>
-<td><a href="/cmd/godoc/">godoc</a></td>
+<td><a href="/cmd/go/">doc</a></td>
<td> </td>
-<td>Godoc extracts and generates documentation for Go programs.</td>
+<td>Doc extracts and generates documentation for Go packages, it is also available as
+an independent <a href="/cmd/godoc/">godoc</a> command with more general options.</td>
</tr>
<tr>
-<td><a href="/cmd/gofmt/">gofmt</a></td>
+<td><a href="/cmd/go/">fmt</a></td>
<td> </td>
-<td>Gofmt formats Go programs.</td>
+<td>Fmt formats Go packages, it is also available as an independent <a href="/cmd/gofmt/">
+gofmt</a> command with more general options.</td>
</tr>
<tr>
<tr>
<td><a href="/cmd/vet/">vet</a></td>
<td> </td>
-<td>Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string.</td>
+<td>Vet examines Go source code and reports suspicious constructs, such as Printf
+calls whose arguments do not align with the format string.</td>
</tr>
<tr>