summaryrefslogtreecommitdiffstats
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 cef2a84e..3ebcd6ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
- jmc@cvs.openbsd.org 2005/12/21 11:48:16
[ssh.1]
-L and -R descriptions are now above, not below, ~C description;
+ - jmc@cvs.openbsd.org 2005/12/21 11:57:25
+ [ssh.1]
+ options now described `above', rather than `later';
20051220
- (dtucker) OpenBSD CVS Sync
@@ -3518,4 +3521,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4043 2005/12/24 03:53:23 djm Exp $
+$Id: ChangeLog,v 1.4044 2005/12/24 03:53:44 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 10d77e56..2cf22223 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.225 2005/12/21 11:48:16 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.226 2005/12/21 11:57:25 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -854,7 +854,7 @@ variable is set to
.Fl X
and
.Fl x
-options described later)
+options above)
and the user is using X11 (the
.Ev DISPLAY
environment variable is set), the connection to the X11 display is
@@ -896,7 +896,7 @@ variable is set to
.Fl A
and
.Fl a
-options described later) and
+options above) and
the user is using an authentication agent, the connection to the agent
is automatically forwarded to the remote side.
.Pp