summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2014-04-14 23:19:51 +0000
committerjmc <jmc@openbsd.org>2014-04-14 23:19:51 +0000
commit9c2bce1ecba02aff29bf94c09795a4f77e8fb682 (patch)
tree6f7153801ce20f0f65bb089d62ed94e6d2ee623b
parentadd a description for this filter similar to what POSIX and FreeBSD use; (diff)
downloadwireguard-openbsd-9c2bce1ecba02aff29bf94c09795a4f77e8fb682.tar.xz
wireguard-openbsd-9c2bce1ecba02aff29bf94c09795a4f77e8fb682.zip
more x removal;
-rw-r--r--bin/ed/ed.114
-rw-r--r--bin/ed/main.c4
2 files changed, 7 insertions, 11 deletions
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index f27404e7bd8..64b268cc3cd 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ed.1,v 1.60 2014/04/14 22:12:01 tedu Exp $
+.\" $OpenBSD: ed.1,v 1.61 2014/04/14 23:19:51 jmc Exp $
.\"
.\" Copyright (c) 1993 Andrew Moore, Talke Studio.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.Sh SYNOPSIS
.Nm ed
.Op Fl
-.Op Fl sx
+.Op Fl s
.Op Fl p Ar string
.Op Ar file
.Sh DESCRIPTION
@@ -775,7 +775,6 @@ or edit another file before writing a modified buffer results in an error.
If the command is entered a second time, it succeeds,
but any changes to the buffer are lost.
.Sh SEE ALSO
-.Xr bdes 1 ,
.Xr sed 1 ,
.Xr sh 1 ,
.Xr vi 1 ,
@@ -794,13 +793,10 @@ utility is compliant with the
.St -p1003.1-2008
specification.
.Pp
-The flag
-.Op Fl x ,
-the commands
-.Cm W ,
-.Cm x ,
+The commands
+.Cm W
and
-.Cm z ,
+.Cm z
and the address specifier
.Sq %
are extensions to that specification.
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 2467d518e6e..539c2e33c69 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.37 2014/04/14 22:12:01 tedu Exp $ */
+/* $OpenBSD: main.c,v 1.38 2014/04/14 23:19:51 jmc Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */
/* main.c: This file contains the main control and user-interface routines
@@ -88,7 +88,7 @@ int lineno; /* script line number */
char *prompt; /* command-line prompt */
char *dps = "*"; /* default command-line prompt */
-char *usage = "usage: %s [-] [-sx] [-p string] [file]\n";
+char *usage = "usage: %s [-] [-s] [-p string] [file]\n";
char *home; /* home directory */