summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-12-24 14:53:44 +1100
committerDamien Miller <djm@mindrot.org>2005-12-24 14:53:44 +1100
commit9a765b22b78d3e2d3102db094bc08a3ad33436bb (patch)
treeb0965b26b913a09a033f33409133483f7b7916b0
parent329cb016386a7e5eaa839fc34e6e53c9428e76db (diff)
- jmc@cvs.openbsd.org 2005/12/21 11:57:25
[ssh.1] options now described `above', rather than `later';
-rw-r--r--ChangeLog5
-rw-r--r--ssh.16
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cef2a84e9..3ebcd6ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - jmc@cvs.openbsd.org 2005/12/21 11:48:16 16 - jmc@cvs.openbsd.org 2005/12/21 11:48:16
17 [ssh.1] 17 [ssh.1]
18 -L and -R descriptions are now above, not below, ~C description; 18 -L and -R descriptions are now above, not below, ~C description;
19 - jmc@cvs.openbsd.org 2005/12/21 11:57:25
20 [ssh.1]
21 options now described `above', rather than `later';
19 22
2020051220 2320051220
21 - (dtucker) OpenBSD CVS Sync 24 - (dtucker) OpenBSD CVS Sync
@@ -3518,4 +3521,4 @@
3518 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3521 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3519 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3522 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3520 3523
3521$Id: ChangeLog,v 1.4043 2005/12/24 03:53:23 djm Exp $ 3524$Id: ChangeLog,v 1.4044 2005/12/24 03:53:44 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 10d77e568..2cf222234 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.225 2005/12/21 11:48:16 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.226 2005/12/21 11:57:25 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -854,7 +854,7 @@ variable is set to
854.Fl X 854.Fl X
855and 855and
856.Fl x 856.Fl x
857options described later) 857options above)
858and the user is using X11 (the 858and the user is using X11 (the
859.Ev DISPLAY 859.Ev DISPLAY
860environment variable is set), the connection to the X11 display is 860environment variable is set), the connection to the X11 display is
@@ -896,7 +896,7 @@ variable is set to
896.Fl A 896.Fl A
897and 897and
898.Fl a 898.Fl a
899options described later) and 899options above) and
900the user is using an authentication agent, the connection to the agent 900the user is using an authentication agent, the connection to the agent
901is automatically forwarded to the remote side. 901is automatically forwarded to the remote side.
902.Pp 902.Pp