--- a/usr/src/doc/manpage/man-rad.xml	Wed Jul 27 22:46:41 2011 -0400
+++ b/usr/src/doc/manpage/man-rad.xml	Thu Jul 28 15:54:26 2011 -0700
@@ -135,7 +135,9 @@
 	    </term>
 	    <listitem><para>
 		Add <replaceable>moduledir</replaceable> to the list of
-		directories to scan and load modules from.
+		directories to scan and load modules from.  The
+		<option>-m</option> option can be used multiple times
+		to add multiple module directories.
 	    </para></listitem>
 	    </varlistentry>
 
@@ -146,9 +148,12 @@
 	    <listitem><para>
 		Add <replaceable>module</replaceable> to the list of
 		modules to load.  <replaceable>module</replaceable>
-		should be an absolute or relative pathname.  Modules
-		loaded with <option>-M</option> take precedence over
-		modules found using <option>-m</option>.
+		should be an absolute pathname or a pathname relative
+		to the current working directory.  Modules loaded with
+		<option>-M</option> take precedence over modules found
+		using <option>-m</option>.  The <option>-M</option>
+		option can be used multiple times to add multiple
+		modules.
 	    </para></listitem>
 	    </varlistentry>
 
@@ -189,8 +194,8 @@
 	    <varlistentry>
 	    <term><option>-S</option> <replaceable>fmri</replaceable></term>
 	    <listitem><para>
-		Read configuration from the SMF service specified by
-		<replaceable>fmri</replaceable>.  When the
+		Read configuration from the SMF service instance
+		specified by <replaceable>fmri</replaceable>.  When the
 		<option>-s</option> option isn't specified, configured
 		transports are <emphasis>not</emphasis> read from the
 		service to avoid endpoint conflicts with a running

--- a/usr/src/pkg/Makefile	Wed Jul 27 22:46:41 2011 -0400
+++ b/usr/src/pkg/Makefile	Thu Jul 28 15:54:26 2011 -0700
@@ -25,14 +25,33 @@
 
 include $(SRC)/Makefile.env
 
+# Common configuration options
 TYPE=normal
+IDR=no
 BUILD=BUILD_NOT_DEFINED
 OTHERWS=OTHERWS_NOT_DEFINED
 CONSOLIDATION=vpanels
 
+# Branch versions
+B_TRUNK=0.$(BUILD)
+B_UPDATE=0
+B_SRU=0
+B_PLATFORM=0
+B_BUILDID=0
+
+# IDR versions; set IDR=yes to include
+B_IDR_ID=0
+B_IDR_NUMBER=0
+
+B_IDR_yes=.$(B_IDR_ID).$(B_IDR_NUMBER)
+B_IDR_no=
+B_IDR=$(B_IDR_$(IDR))
+
+BRANCH_STR=$(B_TRUNK).$(B_UPDATE).$(B_SRU).$(B_PLATFORM).$(B_BUILDID)$(B_IDR)
+
 PKGVERS_CMD = $(PKG) -R / list -Hv package/pkg | $(SED) 's/^.*@\(.*\):.*/\1.1/'
 PKGVERS_normal = $(PKGVERS_CMD:sh)
-PKGVERS_wos = 0.5.11,5.11-0.$(BUILD)
+PKGVERS_wos = 0.5.11,5.11-$(BRANCH_STR)
 PKGVERS=$(PKGVERS_$(TYPE))
 
 PKGARCH:sh=uname -p