[openssh-commits] [openssh] 02/03: upstream: sort previous;

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit acf4260f0951f89c64e1ebbc4c92f451768871ad
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Sat Jun 9 06:36:31 2018 +0000

    upstream: sort previous;
    
    OpenBSD-Commit-ID: 27d80d8b8ca99bc33971dee905e8ffd0053ec411
---
 scp.1        |  4 ++--
 sftp.1       |  4 ++--
 ssh.1        |  4 ++--
 ssh_config.5 | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scp.1 b/scp.1
index b8886be6..be8309b2 100644
--- a/scp.1
+++ b/scp.1
@@ -8,7 +8,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.78 2018/06/09 03:01:12 djm Exp $
+.\" $OpenBSD: scp.1,v 1.79 2018/06/09 06:36:31 jmc Exp $
 .\"
 .Dd $Mdocdate: June 9 2018 $
 .Dt SCP 1
@@ -171,9 +171,9 @@ For full details of the options listed below, and their possible values, see
 .It PubkeyAuthentication
 .It RekeyLimit
 .It SendEnv
-.It SetEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
+.It SetEnv
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UpdateHostKeys
diff --git a/sftp.1 b/sftp.1
index 686844b4..1e21e202 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.115 2018/06/09 03:01:12 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.116 2018/06/09 06:36:31 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -241,9 +241,9 @@ For full details of the options listed below, and their possible values, see
 .It PubkeyAuthentication
 .It RekeyLimit
 .It SendEnv
-.It SetEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
+.It SetEnv
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UpdateHostKeys
diff --git a/ssh.1 b/ssh.1
index 65f4e396..40b4bfb1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,7 +33,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.394 2018/06/09 03:01:12 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.395 2018/06/09 06:36:31 jmc Exp $
 .Dd $Mdocdate: June 9 2018 $
 .Dt SSH 1
 .Os
@@ -525,9 +525,9 @@ For full details of the options listed below, and their possible values, see
 .It RemoteForward
 .It RequestTTY
 .It SendEnv
-.It SetEnv
 .It ServerAliveInterval
 .It ServerAliveCountMax
+.It SetEnv
 .It StreamLocalBindMask
 .It StreamLocalBindUnlink
 .It StrictHostKeyChecking
diff --git a/ssh_config.5 b/ssh_config.5
index 20a60a2d..e5eadcaa 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,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_config.5,v 1.276 2018/06/09 03:01:12 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.277 2018/06/09 06:36:31 jmc Exp $
 .Dd $Mdocdate: June 9 2018 $
 .Dt SSH_CONFIG 5
 .Os
@@ -1404,12 +1404,6 @@ It is possible to clear previously set
 variable names by prefixing patterns with
 .Pa - .
 The default is not to send any environment variables.
-.It Cm SetEnv
-Directly specify one or more environment variables and their contents to
-be sent to the server.
-Similarly to
-.Cm SendEnv ,
-the server must be prepared to accept the environment variable.
 .It Cm ServerAliveCountMax
 Sets the number of server alive messages (see below) which may be
 sent without
@@ -1444,6 +1438,12 @@ will send a message through the encrypted
 channel to request a response from the server.
 The default
 is 0, indicating that these messages will not be sent to the server.
+.It Cm SetEnv
+Directly specify one or more environment variables and their contents to
+be sent to the server.
+Similarly to
+.Cm SendEnv ,
+the server must be prepared to accept the environment variable.
 .It Cm StreamLocalBindMask
 Sets the octal file creation mode mask
 .Pq umask

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.