svn commit: r315080 - in stable: 10/usr.sbin/ntp/doc 11/usr.sbin/ntp/doc

Cy Schubert cy at FreeBSD.org
Sat Mar 11 17:57:24 UTC 2017


Author: cy
Date: Sat Mar 11 17:57:22 2017
New Revision: 315080
URL: https://svnweb.freebsd.org/changeset/base/315080

Log:
  MFC r314768:
  
  Fix mismerge of r280849.
  
  Reported by:	des

Modified:
  stable/10/usr.sbin/ntp/doc/ntp.keys.5
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.sbin/ntp/doc/ntp.keys.5
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/usr.sbin/ntp/doc/ntp.keys.5
==============================================================================
--- stable/10/usr.sbin/ntp/doc/ntp.keys.5	Sat Mar 11 17:46:59 2017	(r315079)
+++ stable/10/usr.sbin/ntp/doc/ntp.keys.5	Sat Mar 11 17:57:22 2017	(r315080)
@@ -11,10 +11,6 @@
 .Sh NAME
 .Nm ntp.keys
 .Nd NTP symmetric key file format
-
-.Sh NAME
-.Nm ntp.keys
-.Nd NTP symmetric key file format
 .Sh SYNOPSIS
 .Nm
 .Op Fl \-option\-name


More information about the svn-src-stable-10 mailing list