summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh-add.14
-rw-r--r--ssh.14
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index def8fc3c7..958724cc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
3 - markus@cvs.openbsd.org 2004/08/30 09:18:08 3 - markus@cvs.openbsd.org 2004/08/30 09:18:08
4 [LICENCE] 4 [LICENCE]
5 s/keygen/keyscan/ 5 s/keygen/keyscan/
6 - jmc@cvs.openbsd.org 2004/08/30 21:22:49
7 [ssh-add.1 ssh.1]
8 .Xsession -> .xsession;
9 originally from a pr from f at obiit dot org, but missed by myself;
10 ok markus@ matthieu@
6 11
720041102 1220041102
8 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX 13 - (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
@@ -1782,4 +1787,4 @@
1782 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1787 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1783 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1788 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1784 1789
1785$Id: ChangeLog,v 1.3563 2004/11/05 09:00:03 dtucker Exp $ 1790$Id: ChangeLog,v 1.3564 2004/11/05 09:01:03 dtucker Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index 6348197b3..4c97fc068 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.40 2003/11/25 23:10:08 matthieu Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.41 2004/08/30 21:22:49 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -129,7 +129,7 @@ and open an X11 window to read the passphrase.
129This is particularly useful when calling 129This is particularly useful when calling
130.Nm 130.Nm
131from a 131from a
132.Pa .Xsession 132.Pa .xsession
133or related script. 133or related script.
134(Note that on some machines it 134(Note that on some machines it
135may be necessary to redirect the input from 135may be necessary to redirect the input from
diff --git a/ssh.1 b/ssh.1
index b9ee4c62b..88dde4b1e 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.195 2004/08/26 16:00:55 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.196 2004/08/30 21:22:49 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -846,7 +846,7 @@ and open an X11 window to read the passphrase.
846This is particularly useful when calling 846This is particularly useful when calling
847.Nm 847.Nm
848from a 848from a
849.Pa .Xsession 849.Pa .xsession
850or related script. 850or related script.
851(Note that on some machines it 851(Note that on some machines it
852may be necessary to redirect the input from 852may be necessary to redirect the input from