--- a/components/ntp/manpages/ntp-keygen.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntp-keygen.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -187,8 +187,6 @@
 .LP
 The \fBntp-keygen\fR program generates a MD5 symmetric keys file \fBntpkey_MD5key_\fIhostname.filestamp\fR\fR. Since the file contains private shared keys, it should be visible only to root and distributed by secure means to other subnet hosts. The NTP daemon loads the file \fBntp.keys\fR, so \fBntp-keygen\fR installs a soft link from this name to the generated file. Subsequently, similar soft links must be installed by manual or automated means on the other subnet hosts. While this file is not used with the Autokey Version 2 protocol, it is needed to authenticate some remote configuration commands used by the \fBntpq\fR and \fBntpdc\fR utilities.
 .SH NOTES
-Source for \fBntp-keygen\fR is available on http://src.opensolaris.org.
-.LP
 The documentation available at /usr/share/doc/ntp is provided as is from the
 \fBNTP\fR distribution and may contain information that is not applicable to
 the software as provided in this partIcular distribution.

--- a/components/ntp/manpages/ntpd.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntpd.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -313,8 +313,6 @@
 .LP
 When \fBntpd\fR starts it looks at the value of umask, and if zero \fBntpd\fR will set the umask to 022.
 .LP
-Source for \fBntpd\fR is available on http://src.opensolaris.org.
-.LP
 The documentation available at /usr/share/doc/ntp is provided as is from the 
 \fBNTP\fR distribution and may contain information that is not applicable to 
 the software as provided in this partIcular distribution.

--- a/components/ntp/manpages/ntpdate.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntpdate.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -83,9 +83,7 @@
 Note that in contexts where a host name is expected, a \fB-4\fR qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a \fB-6\fR qualifier forces DNS resolution to the IPv6 namespace.
 .PP
 .SH NOTES
-Source for ntpdate is available on http://src.opensolaris.org.
-.LP
-Disclaimer: The functionality of this program is now available in the \fBntpd\fB program. See the \fB-q\fB command line option in the \fBntpd\fB - Network Time Protocol (NTP) daemon man page. After a suitable period, the \fBntpdate\fB program is to be retired from this distribution
+Disclaimer: The functionality of this program is now available in the \fBntpd\fB program. See the \fB-q\fB command line option in the \fBntpd\fB - Network Time Protocol (NTP) daemon man page. The \fBntpdate\fB program is to be retired from this distribution.
 .TE
 .PP
 .SH SEE ALSO

--- a/components/ntp/manpages/ntpq.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntpq.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -506,8 +506,6 @@
 A protocol or configuration error has occurred in the public key algorithms or a possible intrusion event has been detected. See the Authentication Options page.
 .SH NOTES
 .LP
-Source for \fBntpq\fR is available on http://src.opensolaris.org.
-.LP
 The documentation available at /usr/share/doc/ntp is provided as is from the
 \fBNTP\fR distribution and may contain information that is not applicable to
 the software as provided in this partIcular distribution.

--- a/components/ntp/manpages/ntptime.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntptime.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -65,8 +65,6 @@
 Set the log2 of PLL time constant, an integer in the range 0-10.
 .SH NOTES
 .LP
-Source for \fBntptime\fR is available on http://src.opensolaris.org.
-.LP
 The documentation available at /usr/share/doc/ntp is provided as is from the
 \fBNTP\fR distribution and may contain information that is not applicable to
 the software as provided in this partIcular distribution.

--- a/components/ntp/manpages/ntptrace.1m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/manpages/ntptrace.1m	Wed Jul 27 10:37:00 2011 -0700
@@ -110,10 +110,6 @@
 .RE
 .LP
 All times are given in seconds. Synchronization distance is a measure of the goodness of the clock's time.
-.SH NOTES
-.LP
-Source for \fBntptrace\fR is available on http://src.opensolaris.org.
-.PP
 .SH SEE ALSO
 .LP
 \fBntpq\fR(1M), \fBntpd\fR(1M), \fBntpdc\fR(1M), \fBattributes\fR(5))

--- a/components/ntp/ntp.p5m	Wed Jul 27 08:20:39 2011 -0700
+++ b/components/ntp/ntp.p5m	Wed Jul 27 10:37:00 2011 -0700
@@ -85,11 +85,11 @@
 file path=usr/lib/inet/ntp-wait
 file path=usr/lib/inet/ntpd
 file path=usr/sbin/ntp-keygen
-file path=usr/sbin/ntpdate mangler.man.stability="uncommitted obsolete"
-file path=usr/sbin/ntpdc mangler.man.stability="uncommitted obsolete"
+file path=usr/sbin/ntpdate
+file path=usr/sbin/ntpdc
 file path=usr/sbin/ntpq
-file path=usr/sbin/ntptime mangler.man.stability=volatile
-file path=usr/sbin/ntptrace mangler.man.stability=volatile
+file path=usr/sbin/ntptime
+file path=usr/sbin/ntptrace
 file path=usr/share/doc/ntp/accopt.html
 file path=usr/share/doc/ntp/assoc.html
 file path=usr/share/doc/ntp/audio.html
@@ -290,11 +290,11 @@
 file path=usr/share/doc/ntp/xleave.html
 file manpages/ntp-keygen.1m path=usr/share/man/man1m/ntp-keygen.1m
 file manpages/ntpd.1m path=usr/share/man/man1m/ntpd.1m
-file manpages/ntpdate.1m path=usr/share/man/man1m/ntpdate.1m
-file manpages/ntpdc.1m path=usr/share/man/man1m/ntpdc.1m
+file manpages/ntpdate.1m path=usr/share/man/man1m/ntpdate.1m mangler.man.stability="uncommitted obsolete"
+file manpages/ntpdc.1m path=usr/share/man/man1m/ntpdc.1m mangler.man.stability="uncommitted obsolete"
 file manpages/ntpq.1m path=usr/share/man/man1m/ntpq.1m
-file manpages/ntptime.1m path=usr/share/man/man1m/ntptime.1m
-file manpages/ntptrace.1m path=usr/share/man/man1m/ntptrace.1m
+file manpages/ntptime.1m path=usr/share/man/man1m/ntptime.1m mangler.man.stability=volatile
+file manpages/ntptrace.1m path=usr/share/man/man1m/ntptrace.1m mangler.man.stability=volatile
 file manpages/ntp.conf.4 path=usr/share/man/man4/ntp.conf.4
 file manpages/ntprc.4 path=usr/share/man/man4/ntprc.4
 legacy pkg=SUNWntpr \