summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.55
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eaa2a857..e5cc7d5e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
40 - jmc@cvs.openbsd.org 2013/05/16 06:28:45 40 - jmc@cvs.openbsd.org 2013/05/16 06:28:45
41 [ssh_config.5] 41 [ssh_config.5]
42 put IgnoreUnknown in the right place; 42 put IgnoreUnknown in the right place;
43 - jmc@cvs.openbsd.org 2013/05/16 06:30:06
44 [sshd_config.5]
45 oops! avoid Xr to self;
43 46
4420130510 4720130510
45 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler 48 - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler
diff --git a/sshd_config.5 b/sshd_config.5
index 9e0b3a5c0..18b1d81a0 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
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: sshd_config.5,v 1.159 2013/05/16 04:09:14 dtucker Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.160 2013/05/16 06:30:06 jmc Exp $
37.Dd $Mdocdate: May 16 2013 $ 37.Dd $Mdocdate: May 16 2013 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
@@ -1027,8 +1027,7 @@ depending on the cipher.
1027The optional second value is specified in seconds and may use any of the 1027The optional second value is specified in seconds and may use any of the
1028units documented in the 1028units documented in the
1029.Sx TIME FORMATS 1029.Sx TIME FORMATS
1030section of 1030section.
1031.Xr sshd_config 5 .
1032The default value for 1031The default value for
1033.Cm RekeyLimit 1032.Cm RekeyLimit
1034is 1033is