rfc 5905 replaces rfc 2030; for now, the reference to 2030 in ntpd.conf

stays;

ok henning

2 files changed, 18 insertions, 12 deletions

diff --git a/usr.sbin/ntpd/ntpd.8 b/usr.sbin/ntpd/ntpd.8
index 2dbab5392e9..d43b5849a42 100644
--- a/usr.sbin/ntpd/ntpd.8
+++ b/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.31 2011/09/17 10:22:00 jmc Exp $
+.\" $OpenBSD: ntpd.8,v 1.32 2012/08/30 06:48:33 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 17 2011 $
+.Dd $Mdocdate: August 30 2012 $
 .Dt NTPD 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@ or local timedelta sensors.
 can also act as an NTP server itself,
 redistributing the local time.
 It implements the Simple Network Time Protocol version 4,
-as described in RFC 2030,
+as described in RFC 5905,
 and the Network Time Protocol version 3,
 as described in RFC 1305.
 .Pp
@@ -139,14 +139,20 @@ Drift file.
 .Xr rc.conf 8 ,
 .Xr rdate 8
 .Rs
-.%R RFC 1305
-.%T "Network Time Protocol (Version 3)"
+.%A D. Mills
 .%D March 1992
+.%R RFC 1305
+.%T Network Time Protocol (Version 3): Specification, Implementation and Analysis
 .Re
 .Rs
-.%R RFC 2030
-.%T "Simple Network Time Protocol (SNTP) Version 4"
-.%D October 1996
+.%A D. Mills
+.%A U. Delaware
+.%A J. Martin
+.%A J. Burbank
+.%A W. Kasch
+.%D June 2010
+.%R RFC 5905
+.%T Network Time Protocol Version 4: Protocol and Algorithms Specification
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/rdate/rdate.8 b/usr.sbin/rdate/rdate.8
index 1b5bb190e72..371b08a0838 100644
--- a/usr.sbin/rdate/rdate.8
+++ b/usr.sbin/rdate/rdate.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdate.8,v 1.34 2011/07/24 17:16:32 jmc Exp $
+.\"	$OpenBSD: rdate.8,v 1.35 2012/08/30 06:48:33 jmc Exp $
 .\"	$NetBSD: rdate.8,v 1.4 1996/04/08 20:55:17 jtc Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 24 2011 $
+.Dd $Mdocdate: August 30 2012 $
 .Dt RDATE 8
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@ host name or address given as the argument.
 The time source may be an RFC 868 TCP protocol server,
 which is usually implemented as a built-in service of
 .Xr inetd 8 ,
-or an RFC 2030 protocol SNTP/NTP server.
+or an RFC 5905 protocol SNTP/NTP server.
 By default,
 .Nm
 uses the RFC 868 TCP protocol.
@@ -71,7 +71,7 @@ Correct leap seconds.
 This should be used only when synchronizing to a server
 which does not correctly account for leap seconds.
 .It Fl n
-Use SNTP (RFC 2030) instead of the RFC 868 time protocol.
+Use SNTP (RFC 5905) instead of the RFC 868 time protocol.
 .It Fl p
 Do not set, just print the remote time.
 .It Fl s