summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ddf25d346..255a3e021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120131017
2 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2013/10/15 14:10:25
4 [ssh.1 ssh_config.5]
5 tweak previous;
6
120131015 720131015
2 - (djm) OpenBSD CVS Sync 8 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2013/10/09 23:42:17 9 - djm@cvs.openbsd.org 2013/10/09 23:42:17
diff --git a/ssh.1 b/ssh.1
index 227654016..8091aecfd 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.336 2013/08/20 06:56:07 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.337 2013/10/15 14:10:25 jmc Exp $
37.Dd $Mdocdate: August 20 2013 $ 37.Dd $Mdocdate: October 15 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -456,6 +456,7 @@ For full details of the options listed below, and their possible values, see
456.It LocalForward 456.It LocalForward
457.It LogLevel 457.It LogLevel
458.It MACs 458.It MACs
459.It Match
459.It NoHostAuthenticationForLocalhost 460.It NoHostAuthenticationForLocalhost
460.It NumberOfPasswordPrompts 461.It NumberOfPasswordPrompts
461.It PasswordAuthentication 462.It PasswordAuthentication
diff --git a/ssh_config.5 b/ssh_config.5
index f35f468f4..3eaaa536a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.169 2013/10/14 22:22:05 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.170 2013/10/15 14:10:25 jmc Exp $
37.Dd $Mdocdate: October 14 2013 $ 37.Dd $Mdocdate: October 15 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -126,7 +126,7 @@ matches.
126See 126See
127.Sx PATTERNS 127.Sx PATTERNS
128for more information on patterns. 128for more information on patterns.
129.It Cm Match 129.It Cm Match
130Restricts the following declarations (up to the next 130Restricts the following declarations (up to the next
131.Cm Host 131.Cm Host
132or 132or