diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh_config.5 | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -8,6 +8,10 @@ | |||
8 | - jmc@cvs.openbsd.org 2005/01/28 15:05:43 | 8 | - jmc@cvs.openbsd.org 2005/01/28 15:05:43 |
9 | [ssh_config.5] | 9 | [ssh_config.5] |
10 | grammar; | 10 | grammar; |
11 | - jmc@cvs.openbsd.org 2005/01/28 18:14:09 | ||
12 | [ssh_config.5] | ||
13 | wording; | ||
14 | ok markus@ | ||
11 | 15 | ||
12 | 20050208 | 16 | 20050208 |
13 | - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the | 17 | - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the |
@@ -2097,4 +2101,4 @@ | |||
2097 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2101 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2098 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2102 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2099 | 2103 | ||
2100 | $Id: ChangeLog,v 1.3641 2005/02/08 22:48:57 dtucker Exp $ | 2104 | $Id: ChangeLog,v 1.3642 2005/02/08 22:51:08 dtucker Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index adef452cc..67b6ca72e 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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_config.5,v 1.40 2005/01/28 15:05:43 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.41 2005/01/28 18:14:09 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -63,7 +63,7 @@ system-wide configuration file | |||
63 | .Pp | 63 | .Pp |
64 | For each parameter, the first obtained value | 64 | For each parameter, the first obtained value |
65 | will be used. | 65 | will be used. |
66 | The configuration files contain sections bracketed by | 66 | The configuration files contain sections separated by |
67 | .Dq Host | 67 | .Dq Host |
68 | specifications, and that section is only applied for hosts that | 68 | specifications, and that section is only applied for hosts that |
69 | match one of the patterns given in the specification. | 69 | match one of the patterns given in the specification. |