diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh_config.5 | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -157,6 +157,9 @@ | |||
157 | - jmc@cvs.openbsd.org 2006/02/24 10:33:54 | 157 | - jmc@cvs.openbsd.org 2006/02/24 10:33:54 |
158 | [sshd_config.5] | 158 | [sshd_config.5] |
159 | signpost to PATTERNS; | 159 | signpost to PATTERNS; |
160 | - jmc@cvs.openbsd.org 2006/02/24 10:37:07 | ||
161 | [ssh_config.5] | ||
162 | tidy up the refs to PATTERNS; | ||
160 | 163 | ||
161 | 20060313 | 164 | 20060313 |
162 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 165 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4058,4 +4061,4 @@ | |||
4058 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4061 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4059 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4062 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4060 | 4063 | ||
4061 | $Id: ChangeLog,v 1.4183 2006/03/15 00:54:21 djm Exp $ | 4064 | $Id: ChangeLog,v 1.4184 2006/03/15 00:54:36 djm Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index 5f1ced5b6..a334e57dc 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.80 2006/02/24 10:25:14 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.81 2006/02/24 10:37:07 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 |
@@ -141,13 +141,14 @@ A single | |||
141 | .Ql \&* | 141 | .Ql \&* |
142 | as a pattern can be used to provide global | 142 | as a pattern can be used to provide global |
143 | defaults for all hosts. | 143 | defaults for all hosts. |
144 | See | ||
145 | .Sx PATTERNS | ||
146 | for more information on patterns. | ||
147 | The host is the | 144 | The host is the |
148 | .Ar hostname | 145 | .Ar hostname |
149 | argument given on the command line (i.e., the name is not converted to | 146 | argument given on the command line (i.e., the name is not converted to |
150 | a canonicalized host name before matching). | 147 | a canonicalized host name before matching). |
148 | .Pp | ||
149 | See | ||
150 | .Sx PATTERNS | ||
151 | for more information on patterns. | ||
151 | .It Cm AddressFamily | 152 | .It Cm AddressFamily |
152 | Specifies which address family to use when connecting. | 153 | Specifies which address family to use when connecting. |
153 | Valid arguments are | 154 | Valid arguments are |
@@ -838,14 +839,15 @@ in | |||
838 | .Xr sshd_config 5 | 839 | .Xr sshd_config 5 |
839 | for how to configure the server. | 840 | for how to configure the server. |
840 | Variables are specified by name, which may contain wildcard characters. | 841 | Variables are specified by name, which may contain wildcard characters. |
841 | See | ||
842 | .Sx PATTERNS | ||
843 | for more information on patterns. | ||
844 | Multiple environment variables may be separated by whitespace or spread | 842 | Multiple environment variables may be separated by whitespace or spread |
845 | across multiple | 843 | across multiple |
846 | .Cm SendEnv | 844 | .Cm SendEnv |
847 | directives. | 845 | directives. |
848 | The default is not to send any environment variables. | 846 | The default is not to send any environment variables. |
847 | .Pp | ||
848 | See | ||
849 | .Sx PATTERNS | ||
850 | for more information on patterns. | ||
849 | .It Cm ServerAliveCountMax | 851 | .It Cm ServerAliveCountMax |
850 | Sets the number of server alive messages (see below) which may be | 852 | Sets the number of server alive messages (see below) which may be |
851 | sent without | 853 | sent without |