upstream commit

enviroment -> environment: apologies to darren for not
 spotting that first time round...

diff --git a/ssh_config.5 b/ssh_config.5
index 3048119151eadd516d4046cd4100d7186a01b4f4..844556b56e6473a6786873c9fbc4984b011cc048 100644 (file)
--- 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.207 2015/04/28 10:17:58 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.208 2015/04/28 13:47:38 jmc Exp $
 .Dd $Mdocdate: April 28 2015 $
 .Dt SSH_CONFIG 5
 .Os
@@ -1335,7 +1335,7 @@ The server must also support it, and the server must be configured to
 accept these environment variables.
 Note that the
 .Ev TERM
-enviroment variable is always sent whenever a
+environment variable is always sent whenever a
 pseudo-terminal is requested as it is required by the protocol.
 Refer to
 .Cm AcceptEnv

diff --git a/sshd_config.5 b/sshd_config.5
index f09adfc4d93bebd647313809ba6e5783597b1fe0..33e401170c974f5d23fad7769d5702da08d63ea3 100644 (file)
--- a/sshd_config.5
+++ b/sshd_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: sshd_config.5,v 1.198 2015/04/28 10:25:15 dtucker Exp $
+.\" $OpenBSD: sshd_config.5,v 1.199 2015/04/28 13:47:38 jmc Exp $
 .Dd $Mdocdate: April 28 2015 $
 .Dt SSHD_CONFIG 5
 .Os
@@ -73,7 +73,7 @@ for how to configure the client.
 Note that environment passing is only supported for protocol 2, and
 that the
 .Ev TERM
-enviroment variable is always sent whenever the client
+environment variable is always sent whenever the client
 requests a pseudo-terminal is requested as it is required by the protocol.
 Variables are specified by name, which may contain the wildcard characters
 .Ql *