diff options
author | Damien Miller <djm@mindrot.org> | 2006-01-06 14:49:17 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-01-06 14:49:17 +1100 |
commit | 4c102eede39e71cf6a32b9cca6149ed67f6178aa (patch) | |
tree | 9e75a76305fdbb863e666227eddc81ab80234665 | |
parent | fb8ea74116bebb5cf68b1c346604895bd16c45e5 (diff) |
- jmc@cvs.openbsd.org 2006/01/03 16:55:18
[ssh.1]
tweak the description of ~/.ssh/environment
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -12,6 +12,9 @@ | |||
12 | - jmc@cvs.openbsd.org 2006/01/03 16:52:36 | 12 | - jmc@cvs.openbsd.org 2006/01/03 16:52:36 |
13 | [ssh.1] | 13 | [ssh.1] |
14 | put FILES in some sort of order: sort by pathname | 14 | put FILES in some sort of order: sort by pathname |
15 | - jmc@cvs.openbsd.org 2006/01/03 16:55:18 | ||
16 | [ssh.1] | ||
17 | tweak the description of ~/.ssh/environment | ||
15 | 18 | ||
16 | 20060103 | 19 | 20060103 |
17 | - (djm) [channels.c] clean up harmless merge error, from reyk@ | 20 | - (djm) [channels.c] clean up harmless merge error, from reyk@ |
@@ -3646,4 +3649,4 @@ | |||
3646 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3649 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3647 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3650 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3648 | 3651 | ||
3649 | $Id: ChangeLog,v 1.4076 2006/01/06 03:48:52 djm Exp $ | 3652 | $Id: ChangeLog,v 1.4077 2006/01/06 03:49:17 djm Exp $ |
@@ -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.238 2006/01/03 16:52:36 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.239 2006/01/03 16:55:18 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -1122,8 +1122,8 @@ Because of the potential for abuse, this file must have strict permissions: | |||
1122 | read/write for the user, and not accessible by others. | 1122 | read/write for the user, and not accessible by others. |
1123 | .Pp | 1123 | .Pp |
1124 | .It ~/.ssh/environment | 1124 | .It ~/.ssh/environment |
1125 | Contains additional definitions for environment variables, see section | 1125 | Contains additional definitions for environment variables; see |
1126 | .Sx ENVIRONMENT | 1126 | .Sx ENVIRONMENT , |
1127 | above. | 1127 | above. |
1128 | .Pp | 1128 | .Pp |
1129 | .It ~/.ssh/identity | 1129 | .It ~/.ssh/identity |