From owner-svn-src-head@freebsd.org  Mon Mar  6 07:11:25 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 42039CFB6A9;
 Mon,  6 Mar 2017 07:11:25 +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 0F32C1BA0;
 Mon,  6 Mar 2017 07:11: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 v267BOw3017458;
 Mon, 6 Mar 2017 07:11:24 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v267BOWr017457;
 Mon, 6 Mar 2017 07:11:24 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201703060711.v267BOWr017457@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: Mon, 6 Mar 2017 07:11:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314768 - head/usr.sbin/ntp/doc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2017 07:11:25 -0000

Author: cy
Date: Mon Mar  6 07:11:23 2017
New Revision: 314768
URL: https://svnweb.freebsd.org/changeset/base/314768

Log:
  Fix mismerge of r280849.
  
  Reported by:	des
  MFC after:	3 days

Modified:
  head/usr.sbin/ntp/doc/ntp.keys.5

Modified: head/usr.sbin/ntp/doc/ntp.keys.5
==============================================================================
--- head/usr.sbin/ntp/doc/ntp.keys.5	Mon Mar  6 06:47:05 2017	(r314767)
+++ head/usr.sbin/ntp/doc/ntp.keys.5	Mon Mar  6 07:11:23 2017	(r314768)
@@ -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