From owner-svn-src-stable@freebsd.org  Sat Mar 11 17:57:24 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7828FD08484;
 Sat, 11 Mar 2017 17:57:24 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4737910BF;
 Sat, 11 Mar 2017 17:57:24 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2BHvNhS078148;
 Sat, 11 Mar 2017 17:57:23 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2BHvNep078147;
 Sat, 11 Mar 2017 17:57:23 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201703111757.v2BHvNep078147@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 11 Mar 2017 17:57:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r315080 - in stable: 10/usr.sbin/ntp/doc
 11/usr.sbin/ntp/doc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Mar 2017 17:57:24 -0000

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