merge text into base

19 files changed, 5 insertions, 41 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index b7c097e9902..10e395748ec 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -24,8 +24,6 @@ OpenBSDman(2.4M, 9.2M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(1.7M,5.6M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 68b75af6167..74711ee5231 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -42,8 +42,6 @@ OpenBSDman(2.4M,9.2M)
 
 OpenBSDmisc(1.7M,5.8M)
 
-OpenBSDtext(945K,3.5M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/arc/contents b/distrib/notes/arc/contents
index ff24cf9a30d..23a982ab980 100644
--- a/distrib/notes/arc/contents
+++ b/distrib/notes/arc/contents
@@ -27,8 +27,6 @@ OpenBSDman(2.4M,9.2M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(958K,4.0M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index 93312bc94a2..1d2be25d7bd 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -53,8 +53,6 @@ OpenBSDman(730K,3M)
 
 OpenBSDmisc(2M,6M)
 
-OpenBSDtext(784K,3M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 4d151568985..73cfb967c9d 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -32,8 +32,6 @@ OpenBSDman(2.5M,9.2M)
 
 OpenBSDmisc(1.7M,5.8M)
 
-OpenBSDtext(947K,3.5M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 5d9c0634d31..1d91a13e0d5 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -32,8 +32,6 @@ OpenBSDman(2.5M,9.4M)
 
 OpenBSDmisc(1.7M,5.8M)
 
-OpenBSDtext(944K,3.3M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 3c9a51d7626..368d83a8eaa 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.3 1998/11/20 04:09:23 todd Exp $
+dnl	$OpenBSD: m4.common,v 1.4 1998/12/19 18:32:00 deraadt Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -118,14 +118,6 @@ define({:-OpenBSDmisc-:},
 		installed from the source tree by default.showsize($1,$2)-:})dnl
 dnl
 dnl
-dnl OpenBSDtext( compressed size, uncompressed size )
-dnl
-define({:-OpenBSDtext-:},
-{:-	text{:--:}OSrev	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.showsize($1,$2)-:})dnl
-dnl
-dnl
 dnl OpenBSDxbase( compressed size, uncompressed size )
 dnl
 define({:-OpenBSDxbase-:},
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 1e3be87148c..30279d5fec9 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -34,8 +34,6 @@ OpenBSDman(2.4M,9.1M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(946K,3.5M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 74b2bff20f4..bad42920f91 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -20,8 +20,6 @@ OpenBSDman(2.4M,9.2M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(946K,3.5M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 2075f28abd9..bd20e557d8e 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -342,7 +342,7 @@ provided script, "install_from_sunos.sh" will help you:
 
     sunos# ls -FC
     base.tar.gz      etc.tar.gz       man.tar.gz       secr.tar.gz
-    comp.tar.gz      games.tar.gz     misc.tar.gz      text.tar.gz
+    comp.tar.gz      games.tar.gz     misc.tar.gz      
     install.sh       bsd.id3_scsi
     sunos# ./install_from_sunos.sh
     [...]
diff --git a/distrib/notes/mvme88k/contents b/distrib/notes/mvme88k/contents
index 74b2bff20f4..bad42920f91 100644
--- a/distrib/notes/mvme88k/contents
+++ b/distrib/notes/mvme88k/contents
@@ -20,8 +20,6 @@ OpenBSDman(2.4M,9.2M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(946K,3.5M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index fe352c9c7f1..3c03626abd6 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -23,8 +23,6 @@ OpenBSDman(0.8M,?)
 
 OpenBSDmisc(1.9M,?)
 
-OpenBSDtext(0.8M,?)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/pmax/contents b/distrib/notes/pmax/contents
index a4ec12a9f59..9354a2274d2 100644
--- a/distrib/notes/pmax/contents
+++ b/distrib/notes/pmax/contents
@@ -27,8 +27,6 @@ OpenBSDman(2.4M,9.1M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(957K,4.0M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index f4f3c5ba6dd..530b71d4b9c 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -46,8 +46,6 @@ OpenBSDman(3.2M,12.1M)
 
 OpenBSDmisc(1.5M,5.4M)
 
-OpenBSDtext(1.7M,5.4M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index bfdb17ba9bc..d298363db52 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -95,8 +95,6 @@ OpenBSDman(2.4M,9.2M)
 
 OpenBSDmisc(1.7M,5.9M)
 
-OpenBSDtext(994K,3.7M)	
-
 OpenBSDxbase
 	
 OpenBSDxfont
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 01da97bc1ba..9eb384a34c4 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -490,7 +490,7 @@ You can now extract the provided "*.tar.gz files onto your disk.
 
     sunos# ls -FC
     base{:--:}OSrev.tar.gz      etc{:--:}OSrev.tar.gz       man{:--:}OSrev.tar.gz       secr23.tar.gz
-    comp{:--:}OSrev.tar.gz      game{:--:}OSrev.tar.gz      misc{:--:}OSrev.tar.gz      text{:--:}OSrev.tar.gz
+    comp{:--:}OSrev.tar.gz      game{:--:}OSrev.tar.gz      misc{:--:}OSrev.tar.gz
     xbase{:--:}OSrev.tar.gz     xfont{:--:}OSrev.tar.gz     xserv{:--:}OSrev.tar.gz     bsd
     bsd.scsi3
     sunos{:-#-:} gunzip < base{:--:}OSrev.tar.gz | (cd /mnt; gtar xvpf -)
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index f89797d5c8d..60de1120be7 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -217,7 +217,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
 	#! /bin/sh
 	tape=/dev/nrst0
 	mt -f ${tape} rewind
-	for file in base23 etc23 comp23 game23 man23 misc23 text23 x*23
+	for file in base23 etc23 comp23 game23 man23 misc23 x*23
 	do
 		dd if=${file}.tar.gz of=${tape}
 	done
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index b802ea82d67..e257ebaa9eb 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -48,8 +48,6 @@ OpenBSDman(850K,3.3M)
 
 OpenBSDmisc(1.8M,6.5M)
 
-OpenBSDtext(770K,2.8M)
-
 OpenBSDxbase
 
 OpenBSDxfont
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index 41348254995..0300f47e710 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -38,7 +38,7 @@ The install tape is created as follows:
 	cd .../2.0/sun3/install
 	set T = /dev/nrst0
 	mt -f $T rewind
-	foreach f (base etc comp games man misc text)
+	foreach f (base etc comp games man misc)
 	  gzip -d < $f.gz | dd of=$T bs=8k
 	end
 	mt -f $T rewind