###############################################################################
#
# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#

Add notes on SMF integration and change to reflect default startup via
inetd.

diff -urp -x '*~' -x '*.orig' man/xfs.man man/xfs.man
--- man/xfs.man	2010-08-06 18:40:29.000000000 -0700
+++ man/xfs.man	2011-01-28 18:01:17.083394642 -0800
@@ -68,10 +68,14 @@ xfs \- X font server
 .B xfs
 is the X Window System font server.
 It supplies fonts to X Window System display servers.
-The server is usually run by a system administrator, and started via
-.BR init (__adminmansuffix__)
-or
-.BR inetd (__adminmansuffix__).
+The server is usually run by 
+.BR inetd (1M),
+as described in the NOTES section below.
+Automatic starting can be enabled or disabled through the
+.BR fsadmin (1)
+or 
+.BR inetadm (1M)
+commands.
 Users may also wish to start private font servers for specific sets of
 fonts.
 .PP
@@ -361,6 +365,22 @@ causes
 .B xfs
 to reset, closing all active connections and re-reading the configuration
 file.
+.\" Solaris/OpenSolaris additions for SMF:
+.SH "NOTES"
+.PP
+The \fBxfs\fR service is managed by the service management facility, 
+\fBsmf\fR(5), under the service identifier:
+.PP
+.nf
+svc:/application/x11/xfs:default
+.fi
+.PP
+Administrative actions on this service, such as enabling, disabling, or 
+requesting restart, can be performed using \fBsvcadm\fR(1M)\&. Responsibility 
+for initiating and restarting this service is delegated to \fBinetd\fR(1M)\&.
+Use \fBinetadm\fR(1M) to make configuration changes and to view configuration 
+information for this service\&. The service\&'s status can be queried using 
+the \fBsvcs\fR(1) command\&.
 .SH BUGS
 Multiple catalogues should be supported.
 .SH "FUTURE DIRECTIONS"
@@ -382,8 +402,11 @@ Keith Packard, Massachusetts Institute o
 .BR X (__miscmansuffix__),
 .BR xfsinfo (__appmansuffix__),
 .BR fslsfonts (__appmansuffix__),
-.BR init (__adminmansuffix__),
 .BR inetd (__adminmansuffix__),
-.BR syslog (__libmansuffix__),
+.BR fsadmin (1),
+.BR inetadm (1M),
+.BR smf (5),
+.BR syslogd (1M),
+.BR syslog (3c),
 .IR "The X Font Service Protocol" ,
 .I Font Server Implementation Overview