doc: only trim newlines in tmpltohtml, gofmt progs

R=golang-dev, r, r
CC=golang-dev
https://golang.org/cl/5530048
diff --git a/doc/progs/defer2.go b/doc/progs/defer2.go
index be6791d..341a141 100644
--- a/doc/progs/defer2.go
+++ b/doc/progs/defer2.go
@@ -35,6 +35,7 @@
 	fmt.Println("Printing in g", i)
 	g(i + 1)
 }
+
 // STOP OMIT
 
 // Revised version.
@@ -53,4 +54,5 @@
 
 	return io.Copy(dst, src)
 }
+
 // STOP OMIT