merge latest (4.3.99.16) from XFree86 (vendor) branchXEVIE-BASE

2 files changed, 4 insertions, 4 deletions

diff --git a/rstart.man b/rstart.man
index cd187c0..01cb0d0 100644
--- a/rstart.man
+++ b/rstart.man
@@ -19,7 +19,7 @@
 .\" REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $XFree86: xc/programs/rstart/rstart.man,v 1.6 2001/01/27 18:21:05 dawes Exp $
+.\" $XFree86: xc/programs/rstart/rstart.man,v 1.7 2003/05/29 21:48:11 herrb Exp $
 .\"
 .hy 0		\" I hate hyphenation.
 .de EX		\"Begin example
@@ -85,7 +85,7 @@ program is not detached from the connection.
 This is a trivial implementation.  Far more sophisticated implementations
 are possible and should be developed.
 .PP
-Error handling is nonexistant.  Without \fB\-v\fP, error reports from
+Error handling is nonexistent.  Without \fB\-v\fP, error reports from
 the remote are discarded silently.  With \fB\-v\fP, error reports are
 displayed.
 .PP
diff --git a/server.c b/server.c
index b404c55..a6d9ad5 100644
--- a/server.c
+++ b/server.c
@@ -23,7 +23,7 @@
 /* OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT	*/
 /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.	*/
 /************************************************************************/
-/* $XFree86: xc/programs/rstart/server.c,v 1.5 2001/07/25 15:05:15 dawes Exp $ */
+/* $XFree86: xc/programs/rstart/server.c,v 1.6 2003/05/27 22:26:57 tsi Exp $ */
 
 /* Extended rsh "helper" program */
 #include <stdio.h>
@@ -768,7 +768,7 @@ key_posix_umask(ac, av)
 int ac;
 char **av;
 {
-	unsigned i;
+	int i;
 	char *s;
 
 	if(ac != 2) {