Author: mmcallis Date: 2008-02-25 19:52:13 -0500 (Mon, 25 Feb 2008) New Revision: 10115 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml Log: 6.1.2. The JBoss Portlet Instance DTD last revisions for this section Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-26 00:00:22 UTC (rev 10114) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-26 00:52:13 UTC (rev 10115) @@ -427,7 +427,7 @@ </screen></term> <listitem> <para> - Instructs the portal to overwrite or keep this object if it already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> value will destroy the existing object and create a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option will maintain the existing object deployment, or create a new one if it does not exist. + Instructs the portal to overwrite or keep this object if it already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option will destroy the existing object and create a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option will maintain the existing object deployment, or create a new one if it does not exist. </para> </listitem> </varlistentry> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-26 00:00:22 UTC (rev 10114) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-26 00:52:13 UTC (rev 10115) @@ -327,7 +327,7 @@ </screen> </para> <para> - The <computeroutput>&lt;if-exists&gt;</computeroutput> element is used to define the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> value will destroy the existing object and create a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option will maintain the existing object deployment, or create a new one if it does not exist. + The <computeroutput>&lt;if-exists&gt;</computeroutput> element is used to define the action to take if an instance with the same name already exists. Accepted values are <computeroutput>overwrite</computeroutput> and <computeroutput>keep</computeroutput>. The <computeroutput>overwrite</computeroutput> option will destroy the existing object and create a new one based on the content of the deployment. The <computeroutput>keep</computeroutput> option will maintain the existing object deployment, or create a new one if it does not exist. </para> </listitem> </varlistentry> @@ -376,7 +376,7 @@ </screen> </para> <para> - The reference to the portlet, which is the portlet name. The <computeroutput>&lt;portlet-ref&gt;</computeroutput> value must match the <computeroutput>&lt;portlet-name&gt;</computeroutput> give in the <filename>WEB-INF/portlet.xml</filename> file. + The reference to the portlet, which is the name of the portlet. The <computeroutput>&lt;portlet-ref&gt;</computeroutput> value must match the <computeroutput>&lt;portlet-name&gt;</computeroutput> give in the <filename>WEB-INF/portlet.xml</filename> file. </para> <para> <screen><![CDATA[ @@ -487,7 +487,7 @@ </screen> </para> <para> - If present. the <computeroutput>&lt;unchecked&gt;</computeroutput> element is used to define that anyone can view the instance. + If present, the <computeroutput>&lt;unchecked&gt;</computeroutput> element is used to define that anyone can view the instance. </para> <para> <screen><![CDATA[ @@ -495,7 +495,7 @@ </screen> </para> <para> - The <computeroutput>&lt;role-name&gt;</computeroutput> element is used to define a role that this security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role, to access the instance: + The <computeroutput>&lt;role-name&gt;</computeroutput> element is used to define a role that the security constraint will apply to. The following example only allows users that are part of the <computeroutput>EXAMPLEROLE</computeroutput> role, to access the instance: </para> <para> <screen><![CDATA[