1 files changed, 7 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 1f3efca78..00ebdd4dd 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.160 2002/06/22 11:51:39 naddy Exp $
+.\" $OpenBSD: ssh.1,v 1.161 2002/08/02 16:00:07 marc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -742,7 +742,12 @@ reads
 .Pa $HOME/.ssh/environment ,
 and adds lines of the format
 .Dq VARNAME=value
-to the environment.
+to the environment if the file exists and if users are allowed to
+change their environment.
+See
+.Cm PermitUserEnvironment
+in
+.Xr sshd_config 5 .
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/known_hosts

diff --git a/ssh.1 b/ssh.1 index 1f3efca78..00ebdd4dd 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.160 2002/06/22 11:51:39 naddy Exp $	37	.\" $OpenBSD: ssh.1,v 1.161 2002/08/02 16:00:07 marc Exp $
38	.Dd September 25, 1999	38	.Dd September 25, 1999
39	.Dt SSH 1	39	.Dt SSH 1
40	.Os	40	.Os
@@ -742,7 +742,12 @@ reads
742	.Pa $HOME/.ssh/environment ,	742	.Pa $HOME/.ssh/environment ,
743	and adds lines of the format	743	and adds lines of the format
744	.Dq VARNAME=value	744	.Dq VARNAME=value
745	to the environment.	745	to the environment if the file exists and if users are allowed to
		746	change their environment.
		747	See
		748	.Cm PermitUserEnvironment
		749	in
		750	.Xr sshd_config 5 .
746	.Sh FILES	751	.Sh FILES
747	.Bl -tag -width Ds	752	.Bl -tag -width Ds
748	.It Pa $HOME/.ssh/known_hosts	753	.It Pa $HOME/.ssh/known_hosts