From 07a2d429b2aafe273056f71ab150456fe3ff31ef Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 5 Feb 2002 12:16:15 +1100
Subject: [PATCH]    - markus@cvs.openbsd.org 2002/01/29 23:50:37      [scp.1
 ssh.1]      mention exit status; ok stevesk@

---
 ChangeLog |  5 ++++-
 scp.1     |  5 ++++-
 ssh.1     | 10 +++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4d8d1495..52d0eb709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,9 @@
    - markus@cvs.openbsd.org 2002/01/29 22:46:41
      [session.c]
      don't depend on servconf.c; ok djm@
+   - markus@cvs.openbsd.org 2002/01/29 23:50:37
+     [scp.1 ssh.1]
+     mention exit status; ok stevesk@
 
 20020130
  - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7447,4 +7450,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1811 2002/02/05 01:15:07 djm Exp $
+$Id: ChangeLog,v 1.1812 2002/02/05 01:16:15 djm Exp $
diff --git a/scp.1 b/scp.1
index d51e680c7..69125c1ff 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.20 2001/09/17 23:56:07 stevesk Exp $
+.\" $OpenBSD: scp.1,v 1.21 2002/01/29 23:50:37 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -134,6 +134,9 @@ Forces
 .Nm
 to use IPv6 addresses only.
 .El
+.Sh DIAGNOSTICS
+.Nm
+exits with 0 on success or >0 if an error occurred.
 .Sh AUTHORS
 Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
 .Sh HISTORY
diff --git a/ssh.1 b/ssh.1
index 42aa37763..08f0c6ce8 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.144 2002/01/16 17:42:33 stevesk Exp $
+.\" $OpenBSD: ssh.1,v 1.145 2002/01/29 23:50:37 markus Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -207,8 +207,8 @@ the password cannot be seen by someone listening on the network.
 .Pp
 .Ss SSH protocol version 2
 .Pp
-When a user connects using the protocol version 2
-different authentication methods are available.
+When a user connects using protocol version 2
+similar authentication methods are available.
 Using the default values for
 .Cm PreferredAuthentications ,
 the client will try to authenticate first using the hostbased method;
@@ -1490,6 +1490,10 @@ Contains additional definitions for environment variables, see section
 .Sx ENVIRONMENT
 above.
 .El
+.Sh DIAGNOSTICS
+.Nm
+exits with the exit status of the remote command or with 255
+if an error occurred.
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.