summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-17 11:39:00 +1100
committerDamien Miller <djm@mindrot.org>2013-10-17 11:39:00 +1100
commitd77b81f856e078714ec6b0f86f61c20249b7ead4 (patch)
tree0cf1abf5827213d17c5ac7bd19359400a8647f1b
parentdcd39f29ce3308dc74a0ff27a9056205a932ce05 (diff)
downloadopenssh-git-d77b81f856e078714ec6b0f86f61c20249b7ead4.tar.gz
- jmc@cvs.openbsd.org 2013/10/15 14:10:25
[ssh.1 ssh_config.5] tweak previous;
-rw-r--r--ChangeLog6
-rw-r--r--ssh.15
-rw-r--r--ssh_config.56
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ddf25d34..255a3e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20131017
+ - (djm) OpenBSD CVS Sync
+ - jmc@cvs.openbsd.org 2013/10/15 14:10:25
+ [ssh.1 ssh_config.5]
+ tweak previous;
+
20131015
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2013/10/09 23:42:17
diff --git a/ssh.1 b/ssh.1
index 22765401..8091aecf 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
.\" (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.336 2013/08/20 06:56:07 jmc Exp $
-.Dd $Mdocdate: August 20 2013 $
+.\" $OpenBSD: ssh.1,v 1.337 2013/10/15 14:10:25 jmc Exp $
+.Dd $Mdocdate: October 15 2013 $
.Dt SSH 1
.Os
.Sh NAME
@@ -456,6 +456,7 @@ For full details of the options listed below, and their possible values, see
.It LocalForward
.It LogLevel
.It MACs
+.It Match
.It NoHostAuthenticationForLocalhost
.It NumberOfPasswordPrompts
.It PasswordAuthentication
diff --git a/ssh_config.5 b/ssh_config.5
index f35f468f..3eaaa536 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
.\" (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.169 2013/10/14 22:22:05 djm Exp $
-.Dd $Mdocdate: October 14 2013 $
+.\" $OpenBSD: ssh_config.5,v 1.170 2013/10/15 14:10:25 jmc Exp $
+.Dd $Mdocdate: October 15 2013 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -126,7 +126,7 @@ matches.
See
.Sx PATTERNS
for more information on patterns.
-.It Cm Match
+.It Cm Match
Restricts the following declarations (up to the next
.Cm Host
or