5 files changed, 14 insertions, 14 deletions
diff --git a/doc/progs/cat.go b/doc/progs/cat.go
index f9f00b6e3..4e5e31cae 100644
--- a/doc/progs/cat.go
+++ b/doc/progs/cat.go
@@ -17,13 +17,13 @@ func cat(f *file.File) {
 	for {
 		switch nr, er := f.Read(&buf); true {
 		case nr < 0:
-			fmt.Fprintf(os.Stderr, "error reading from %s: %s\n", f.String(), er.String());
+			fmt.Fprintf(os.Stderr, "cat: error reading from %s: %s\n", f.String(), er.String());
 			os.Exit(1);
 		case nr == 0:  // EOF
 			return;
 		case nr > 0:
 			if nw, ew := file.Stdout.Write(buf[0:nr]); nw != nr {
-				fmt.Fprintf(os.Stderr, "error writing from %s: %s\n", f.String(), ew.String());
+				fmt.Fprintf(os.Stderr, "cat: error writing from %s: %s\n", f.String(), ew.String());
 			}
 		}
 	}
@@ -37,7 +37,7 @@ func main() {
 	for i := 0; i < flag.NArg(); i++ {
 		f, err := file.Open(flag.Arg(i), 0, 0);
 		if f == nil {
-			fmt.Fprintf(os.Stderr, "can't open %s: error %s\n", flag.Arg(i), err);
+			fmt.Fprintf(os.Stderr, "cat: can't open %s: error %s\n", flag.Arg(i), err);
 			os.Exit(1);
 		}
 		cat(f);
diff --git a/doc/progs/cat_rot13.go b/doc/progs/cat_rot13.go
index ea608b83d..870a2d78f 100644
--- a/doc/progs/cat_rot13.go
+++ b/doc/progs/cat_rot13.go
@@ -59,14 +59,14 @@ func cat(r reader) {
 	for {
 		switch nr, er := r.Read(&buf); {
 		case nr < 0:
-			fmt.Fprintf(os.Stderr, "error reading from %s: %s\n", r.String(), er.String());
+			fmt.Fprintf(os.Stderr, "cat: error reading from %s: %s\n", r.String(), er.String());
 			os.Exit(1);
 		case nr == 0:  // EOF
 			return;
 		case nr > 0:
 			nw, ew := file.Stdout.Write(buf[0:nr]);
 			if nw != nr {
-				fmt.Fprintf(os.Stderr, "error writing from %s: %s\n", r.String(), ew.String());
+				fmt.Fprintf(os.Stderr, "cat: error writing from %s: %s\n", r.String(), ew.String());
 			}
 		}
 	}
@@ -80,7 +80,7 @@ func main() {
 	for i := 0; i < flag.NArg(); i++ {
 		f, err := file.Open(flag.Arg(i), 0, 0);
 		if f == nil {
-			fmt.Fprintf(os.Stderr, "can't open %s: error %s\n", flag.Arg(i), err);
+			fmt.Fprintf(os.Stderr, "cat: can't open %s: error %s\n", flag.Arg(i), err);
 			os.Exit(1);
 		}
 		cat(f);
diff --git a/doc/progs/echo.go b/doc/progs/echo.go
index b2c09d958..caf911733 100644
--- a/doc/progs/echo.go
+++ b/doc/progs/echo.go
@@ -12,8 +12,8 @@ import (
 var n_flag = flag.Bool("n", false, "don't print final newline")
 
 const (
-	kSpace = " ";
-	kNewline = "\n";
+	Space = " ";
+	Newline = "\n";
 )
 
 func main() {
@@ -21,12 +21,12 @@ func main() {
 	var s string = "";
 	for i := 0; i < flag.NArg(); i++ {
 		if i > 0 {
-			s += kSpace
+			s += Space
 		}
 		s += flag.Arg(i)
 	}
 	if !*n_flag {
-		s += kNewline
+		s += Newline
 	}
 	os.Stdout.WriteString(s);
 }
diff --git a/doc/progs/file.go b/doc/progs/file.go
index bda3890de..c55149421 100644
--- a/doc/progs/file.go
+++ b/doc/progs/file.go
@@ -10,7 +10,7 @@ import (
 )
 
 type File struct {
-	fd      int;  // file descriptor number
+	fd      int;    // file descriptor number
 	name    string; // file name at Open time
 }
 
diff --git a/doc/progs/sortmain.go b/doc/progs/sortmain.go
index 63d68ff05..8f6b1061d 100644
--- a/doc/progs/sortmain.go
+++ b/doc/progs/sortmain.go
@@ -29,8 +29,8 @@ func strings() {
 
 type day struct {
 	num        int;
-	short_name string;
-	long_name  string;
+	shortName  string;
+	longName   string;
 }
 
 type dayArray struct {
@@ -56,7 +56,7 @@ func days() {
 		panic()
 	}
 	for _, d := range data {
-		fmt.Printf("%s ", d.long_name)
+		fmt.Printf("%s ", d.longName)
 	}
 	fmt.Printf("\n")
 }