Index: openacs-4/contrib/packages/portal/portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/portal.info,v
diff -u -r1.10 -r1.11
--- openacs-4/contrib/packages/portal/portal.info	17 Mar 2004 02:15:51 -0000	1.10
+++ openacs-4/contrib/packages/portal/portal.info	19 Mar 2004 00:41:21 -0000	1.11
@@ -24,17 +24,16 @@
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="CacheSeconds"  default="0" description="The number of seconds to cache a fully rendered portal." section_name="Performance"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ChangeableTheme"  default="0" description="If set true, users can change the theme of their portal, if false, they're stuck with the one the administrator choses for them." section_name="Look and Feel"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="CreatePrivatePortals"  default="0" description="If set to 1, create private portals for users.  Users will be able to configure their private portal layout (number of pages, portal element placement).  If false, a single portal, edited only by portal package admins, will be created and shared by all visitors."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultThemeName"  default="default" description="the default theme"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultThemeName"  default="default" description="the default theme" section_name="Look and Feel"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="LogDatasourceErrors"  default="1" description="Create an entry in the error log whenever an error occurs while evaluating a datasource." section_name="Debug"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MasterTemplate"  description="It is best to allow the configuration wizard set this.  If blank we'll just skip to the subsite master, which may be our custom portal tabbed master template." section_name="Look and Feel"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NavbarClass"  default="navbar" description="Use the default (&quot;navbar&quot;) if the parent subsite is configured to use the &quot;plain&quot; style of presentation, &quot;subnavbar&quot; if it configured to use the &quot;tabbed&quot; style of presentation."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="NoHideButton"  default="0" description="When set, don't show the &quot;hide&quot; button for portal elements (overrides the portal datasource default)." section_name="Look and Feel"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="NoShadeButton"  default="0" description="When set, don't show the &quot;shade&quot; button for portal elements (overrides the portal datasource default)." section_name="Look and Feel"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ReplaceSubsiteMasterTemplate"  default="0" description="If set true the portal package will subsitute its own master template for the subsite's current master template.  The result is a tabbed interface that seamlessly integrates portaled pages with the tabbed pages provided by the standard subsite &quot;tabbed&quot; master template.
-" section_name="Look and Feel"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="NavbarClass"  default="navbar" description="Use the default (&quot;navbar&quot;) if the parent subsite is configured to use the &quot;plain&quot; style of presentation, &quot;subnavbar&quot; if it configured to use the &quot;tabbed&quot; style of presentation." section_name="Look and Feel"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="OurMasterTemplate"  description="Template to use as the master template when rendering a portalled page  (this is best maintained by the configuration wizard)." section_name="Look and Feel"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowDatasourceErrors"  default="0" description="When set, display datasource errors in lieu of content.  Otherwise, the element containing the erroneous datasource is omitted from the portal." section_name="Debug"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowHideButton"  default="0" description="When set, show the &quot;hide&quot; button for portal elements." section_name="Look and Feel"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowShadeButton"  default="0" description="When set, show the &quot;shade&quot; button for portal elements." section_name="Look and Feel"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SiteMasterTemplate"  description="The template to use as the actual subsite master template when we've overwritten the subsite's DefaultMaster parameter (this is best maintained by the configuration wizard)." section_name="Look and Feel"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ThemeChangeable"  default="0" description="If set true, users can change the theme of their portal, if false, they're stuck with the one the administrator choses for them." section_name="Look and Feel"/>
         </parameters>
 
     </version>