nvi 1.75

3 files changed, 21 insertions, 13 deletions

diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index d17ff50db56..9c9187dde71 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -8,9 +8,9 @@
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
-.\"     @(#)vi.1	8.48 (Berkeley) 8/18/96
+.\"     @(#)vi.1	8.49 (Berkeley) 8/20/96
 .\"
-.TH VI 1 "August 18, 1996"
+.TH VI 1 "August 20, 1996"
 .UC
 .SH NAME
 ex, vi, view \- text editors
@@ -48,11 +48,11 @@ ex, vi, view \- text editors
 .BI -w " size"\c
 ] [file ...]
 .SH LICENSE
-The vi program is shareware.  You are welcome to copy, modify and share
-it with others under the conditions listed in the LICENSE file.  If your
-company finds vi sufficiently useful that you would have purchased it,
-or your company wishes to redistribute it, contributions to the authors
-would be appreciated.
+The vi program is freely redistributable.  You are welcome to copy,
+modify and share it with others under the conditions listed in the
+LICENSE file.  If any company (not individual!) finds vi sufficiently
+useful that you would have purchased it, or if any company wishes to
+redistribute it, contributions to the authors would be appreciated.
 .SH DESCRIPTION
 .I \&Vi
 is a screen oriented text editor.
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
index c5d3ec9f387..338099a427e 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
@@ -8,7 +8,7 @@
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
-.\"     @(#)vi.ref	8.82 (Berkeley) 8/18/96
+.\"     @(#)vi.ref	8.83 (Berkeley) 8/20/96
 .\"
 .\"
 .so ref.so
@@ -57,11 +57,11 @@ Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
 Keith Bostic.  All Rights Reserved.
 .sp
 .pp
-The vi program is shareware.  You are welcome to copy, modify and share
-it with others under the conditions listed in the LICENSE file.  If your
-company finds vi sufficiently useful that you would have purchased it,
-or your company wishes to redistribute it, contributions to the authors
-would be appreciated.
+The vi program is freely redistributable.  You are welcome to copy,
+modify and share it with others under the conditions listed in the
+LICENSE file.  If any company (not individual!) finds vi sufficiently
+useful that you would have purchased it, or if any company wishes to
+redistribute it, contributions to the authors would be appreciated.
 .bp 2
 .(l C
 .i Acknowledgements
diff --git a/usr.bin/vi/docs/changelog b/usr.bin/vi/docs/changelog
index dc3a7cc0c27..b864a202108 100644
--- a/usr.bin/vi/docs/changelog
+++ b/usr.bin/vi/docs/changelog
@@ -1,3 +1,11 @@
+1.74 -> 1.75 (08/22/96)
+	+ Add French to the error message translations.
+	+ Move the UNLICENSED message to the end of the message line.
+	+ Fix bug where wide characters in a file name weren't calculated
+	  correctly in the status message.
+	+ Fix bug where cl_rename was called directly, by the ex shell code.
+	+ Fix bug where splitting a screen resulting in a new screen at the
+	  top of the display resulted in badly displayed status messages.
 1.73 -> 1.74 (08/18/96)
 	+ Fix bug where the status line wasn't redisplayed if the user ran
 	  an ex command that trashed the screen.