- stevesk@cvs.openbsd.org 2002/08/17 23:55:01
[ssh_config.5]
ordered list here
diff --git a/ChangeLog b/ChangeLog
index 5c90378..014fedc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
- stevesk@cvs.openbsd.org 2002/08/17 23:07:14
[ssh.1]
ForwardAgent has defaulted to no for over 2 years; be more clear here.
+ - stevesk@cvs.openbsd.org 2002/08/17 23:55:01
+ [ssh_config.5]
+ ordered list here
20020813
- (tim) [configure.ac] Display OpenSSL header/library version.
@@ -1533,4 +1536,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2424 2002/08/20 19:03:20 mouring Exp $
+$Id: ChangeLog,v 1.2425 2002/08/20 19:04:51 mouring Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 53cb0fe..857cc96 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.1 2002/06/20 19:56:07 stevesk Exp $
+.\" $OpenBSD: ssh_config.5,v 1.2 2002/08/17 23:55:01 stevesk Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -50,10 +50,16 @@
.Nm ssh
obtains configuration data from the following sources in
the following order:
-command line options, user's configuration file
-.Pq Pa $HOME/.ssh/config ,
-and system-wide configuration file
-.Pq Pa /etc/ssh/ssh_config .
+.Bl -enum -offset indent -compact
+.It
+command-line options
+.It
+user's configuration file
+.Pq Pa $HOME/.ssh/config
+.It
+system-wide configuration file
+.Pq Pa /etc/ssh/ssh_config
+.El
.Pp
For each parameter, the first obtained value
will be used.