--- svccfg_1m.orig	Wed Nov 14 00:07:08 2007
+++ svccfg_1m.new	Thu May 29 11:43:01 2008
@@ -226,7 +226,7 @@
          fails.
 
 
-     import file
+     import [-V] file
 
          If file is a service manifest,  then  the  services  and
          instances it specifies are imported into the repository.
@@ -235,6 +235,14 @@
          manifests.  See  smf_security(5)  for   the   privileges
          required to create and modify service configurations.
 
+         Services and instances in the manifest will be validated
+         against template data in the manifest and the repository,
+         and warnings will be issued for all template violations.
+         See smf_template(5) for a description of templates.
+         If the -V option is specified, manifests which violate
+         the defined templates will fail to import.  In interactive
+         invocations of svccfg, -V is the default behaviour.
+
          For existing services and  instances,  properties  which
          have  not  changed  since  the  last import snapshot was
          taken are upgraded to those specified by  the  manifest.
@@ -287,13 +295,28 @@
          archive was made.
 
 
-     validate file
+     validate [file | fmri]
 
-         file is processed similarly to import,  but  no  changes
-         are  made to the repository. If any errors are detected,
-         svccfg(1M) exits with a nonzero exit status.
+         The validate subcommand can operate on a manifest file,
+         an instance fmri, or the current instance entity selection.  When an
+         argument is specified, svccfg will check to see if a file exists
+         with that name. If the file exists, it will be validated. If no
+         file exists, the argument will be treated as an FMRI pattern.
+         If a conflict arises between a filename and an FMRI, the
+         "svc:" and "file:" prefixes can be used to tell svccfg how to
+         interpret the argument.
 
+         When given a file, the file is processed similarly to import -V,
+         but  no  changes are  made to the repository. If any errors are
+         detected, svccfg(1M) prints the errors, and if invoked with the
+         -s option, exits with a nonzero exit status.
 
+         For instance fmri or instance entity selection, the specified
+         instance in its composed form (See "Properties and Property Groups"
+         in smf(5)) will be validated against template data in the repository.
+         Warnings will be issued for all template violations.  See
+         smf_template(5) for a description of templates.
+
   Entity Selection, Modification, and Navigation Subcommands
      An "entity" refers to a scope, service, or service instance.
 
@@ -419,7 +442,27 @@
          See  smf_security(5)  for  the  privileges  required  to
          modify properties.
 
+     describe [-v] [-t] [propertygroup/property]
 
+         Describes either the current settings or the possible
+         settings.
+
+         When invoked without arguments, describe gives basic
+         descriptions (if available) of the currently selected entity
+         and all of its currently set property groups and properties.
+         A property group or specific property may be queried by
+         specifying either the property group name or the
+         property group name and property name separated by a "/"
+         as an argument.
+
+         The -v option gives all information available, including
+         descriptions for current settings, constraints, and other
+         possible setting choices.
+
+         The -t option shows only the template data for the selection
+         (see smf_template(5)), and does not display the current
+         settings for property groups and properties.
+
      editprop
 
          Comments of commands to reproduce  the  property  groups
@@ -439,7 +482,10 @@
          taken as a glob pattern and only  property  groups  with
          names which match the argument are listed.
 
+         In interactive mode, a basic description of the property
+         groups will also be given.
 
+
      listprop [pattern]
 
          Lists property groups  and  properties  of  the  current
@@ -703,7 +749,7 @@
      libscf(3LIB),    libumem(3LIB),    scf_service_add_pg(3SCF),
      scf_value_create(3SCF),   contract(4),    service_bundle(4),
      attributes(5),     fnmatch(5),     smf(5),    smf_method(5),
-     smf_security(5)
+     smf_security(5), smf_template(5)