Plan 9 from Bell Labs 2006-06-30

dist/replica/_plan9.db

@@ -13998,7 +13998,7 @@ sys/src/cmd/upas/fs/rfc2047-test - 664 sys sys 1143946985 1146
 sys/src/cmd/upas/fs/strtotm.c - 664 sys sys 1041137528 1904
 sys/src/cmd/upas/fs/tester.c - 664 sys sys 985037420 1418
 sys/src/cmd/upas/marshal - 20000000775 sys sys 1015009721 0
-sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1143827332 33818
+sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1151596511 33817
 sys/src/cmd/upas/marshal/mkfile - 664 sys sys 1047490298 235
 sys/src/cmd/upas/misc - 20000000775 sys sys 944961318 0
 sys/src/cmd/upas/misc/gone.fishing - 664 sys sys 944961318 313

dist/replica/plan9.db

@@ -13998,7 +13998,7 @@ sys/src/cmd/upas/fs/rfc2047-test - 664 sys sys 1143946985 1146
 sys/src/cmd/upas/fs/strtotm.c - 664 sys sys 1041137528 1904
 sys/src/cmd/upas/fs/tester.c - 664 sys sys 985037420 1418
 sys/src/cmd/upas/marshal - 20000000775 sys sys 1015009721 0
-sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1143827332 33818
+sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1151596511 33817
 sys/src/cmd/upas/marshal/mkfile - 664 sys sys 1047490298 235
 sys/src/cmd/upas/misc - 20000000775 sys sys 944961318 0
 sys/src/cmd/upas/misc/gone.fishing - 664 sys sys 944961318 313

dist/replica/plan9.log

@@ -30178,3 +30178,4 @@
 1151404218 3 d sys/src/fs/pc/sdmv50xx.c - 664 sys sys 1151401913 0
 1151456435 0 c sys/src/cmd/ip/imap4d/date.c - 664 sys sys 1151455743 5684
 1151463637 0 c 386/bin/ip/imap4d - 775 sys sys 1151463461 238064
+1151596881 0 c sys/src/cmd/upas/marshal/marshal.c - 664 sys sys 1151596511 33817

sys/src/cmd/upas/marshal/marshal.c

@@ -386,7 +386,7 @@ main(int argc, char **argv)
 		Bprint(&out, "\tboundary=\"%s\"\n\n", boundary);
 		Bprint(&out, "This is a multi-part message in MIME format.\n");
 		Bprint(&out, "--%s\n", boundary);
-		Bprint(&out, "Content-Disposition: ainline\n");
+		Bprint(&out, "Content-Disposition: inline\n");
 	}
 
 	if(!nflag){
@@ -687,7 +687,7 @@ attachment(Attach *a, Biobuf *out)
 		Bprint(out, "Content-Type: %s\n", a->type);
 
 	if(a->ainline){
-		Bprint(out, "Content-Disposition: ainline\n");
+		Bprint(out, "Content-Disposition: inline\n");
 	} else {
 		p = strrchr(a->path, '/');
 		if(p == nil)
@@ -1905,4 +1905,4 @@ mksubject(char *line)
 hard:
 	snprint(buf, sizeof buf, "Subject: %U", p);
 	return buf;
-}
+}