[Plone-cvs] r29487 - in Installers/macosx/trunk: . Plone.pmdoc generalResources

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Author: smcmahon
Date: Mon Aug 31 20:33:19 2009
New Revision: 29487

Modified:
   Installers/macosx/trunk/Plone.pmdoc/01standalone.xml
   Installers/macosx/trunk/Plone.pmdoc/02zeo.xml
   Installers/macosx/trunk/Plone.pmdoc/03standalone.xml
   Installers/macosx/trunk/Plone.pmdoc/04zeo.xml
   Installers/macosx/trunk/Plone.pmdoc/06cluster.xml
   Installers/macosx/trunk/Plone.pmdoc/index.xml
   Installers/macosx/trunk/buildme.sh
   Installers/macosx/trunk/generalResources/ReadMe.html
   Installers/macosx/trunk/generalResources/ReadMe.rtf
   Installers/macosx/trunk/packageme.sh
Log:
Update for 3.3

Modified: Installers/macosx/trunk/Plone.pmdoc/01standalone.xml
==============================================================================

--- Installers/macosx/trunk/Plone.pmdoc/01standalone.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/01standalone.xml	Mon Aug 31 20:33:19 2009
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="ECDA0957-0F1F-41AE-9B7D-E65E08350159"><config><identifier>org.plone.plone-3.2.1.zinstance_nr.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">stubs/zinstance_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preflight.isRelativeType</mod><mod>installFrom.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo</mod><mod>installTo.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="ECDA0957-0F1F-41AE-9B7D-E65E08350159"><config><identifier>org.plone.plone-3.2.1.zinstance_nr.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">stubs/zinstance_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preflight.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts></pkgref>
\ No newline at end of file

Modified: Installers/macosx/trunk/Plone.pmdoc/02zeo.xml
==============================================================================
--- Installers/macosx/trunk/Plone.pmdoc/02zeo.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/02zeo.xml	Mon Aug 31 20:33:19 2009
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="9C98F32C-3F51-496F-B525-EB5F44886546"><config><identifier>org.plone.plone-3.2.1.zeotemplate.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installTo.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="9C98F32C-3F51-496F-B525-EB5F44886546"><config><identifier>org.plone.plone-3.2.1.zeotemplate.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod><mod>installTo.path</mod><mod>scripts.postflight.isRelativeType</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts></pkgref>
\ No newline at end of file

Modified: Installers/macosx/trunk/Plone.pmdoc/03standalone.xml
==============================================================================
--- Installers/macosx/trunk/Plone.pmdoc/03standalone.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/03standalone.xml	Mon Aug 31 20:33:19 2009
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="1C36D0F1-B2F0-4AA9-B08A-B8C8605FA566"><config><identifier>org.plone.plone-3.2.1.standalone_root.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>03standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="1C36D0F1-B2F0-4AA9-B08A-B8C8605FA566"><config><identifier>org.plone.plone-3.2.1.standalone_root.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installTo</mod><mod>scripts.postflight.isRelativeType</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>03standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file

Modified: Installers/macosx/trunk/Plone.pmdoc/04zeo.xml
==============================================================================
--- Installers/macosx/trunk/Plone.pmdoc/04zeo.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/04zeo.xml	Mon Aug 31 20:33:19 2009
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="92F0145D-790E-437B-AD7D-051784260D9F"><config><identifier>org.plone.plone-3.2.1.zeoroot.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo.path</mod><mod>installTo</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>04zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="92F0145D-790E-437B-AD7D-051784260D9F"><config><identifier>org.plone.plone-3.2.1.zeoroot.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo.path</mod><mod>installTo</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postflight relative="true" mod="true">scriptResources/showReadMe.py</postflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>04zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file

Modified: Installers/macosx/trunk/Plone.pmdoc/06cluster.xml
==============================================================================
--- Installers/macosx/trunk/Plone.pmdoc/06cluster.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/06cluster.xml	Mon Aug 31 20:33:19 2009
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="3EC99518-0B13-465F-80FE-105864944C3A"><config><identifier>org.plone.plone-3.2.1.initscripts.plonecluster.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Cluster Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">Startup Item</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>installTo</mod><mod>relocatable</mod><mod>installTo.isAbsoluteType</mod><mod>requireAuthorization</mod><mod>scripts.postupgrade.path</mod><mod>installFrom.isRelativeType</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>identifier</mod><mod>installFrom.path</mod></config><scripts><postinstall relative="true" mod="true">scriptResources/fixInitPaths.py</postinstall><postupgrade relative="true" mod="true">scriptResources/fixInitPaths.py</postupgrade></scripts><contents><file-list>06cluster-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="3EC99518-0B13-465F-80FE-105864944C3A"><config><identifier>org.plone.plone-3.2.1.initscripts.plonecluster.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Cluster Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">Startup Item</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.isAbsoluteType</mod><mod>scripts.postupgrade.path</mod><mod>includeRoot</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><scripts><postinstall relative="true" mod="true">scriptResources/fixInitPaths.py</postinstall><postupgrade relative="true" mod="true">scriptResources/fixInitPaths.py</postupgrade></scripts><contents><file-list>06cluster-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file

Modified: Installers/macosx/trunk/Plone.pmdoc/index.xml
==============================================================================
--- Installers/macosx/trunk/Plone.pmdoc/index.xml	(original)
+++ Installers/macosx/trunk/Plone.pmdoc/index.xml	Mon Aug 31 20:33:19 2009
@@ -1,4 +1,4 @@
-<pkmkdoc spec="1.12"><properties><title>Plone 3.3rc5</title><build>/Users/steve/nobackup/osx-3.3/Plone-3.3rc5/Plone-3.3rc5.mpkg</build><organization>org.plone.plone-3.3rc5</organization><userSees ui="custom"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts>function pm_standalone_selected() {
+<pkmkdoc spec="1.12"><properties><title>Plone 3.3</title><build>/Users/steve/nobackup/osx-3.3/Plone-3.3/Plone-3.3.mpkg</build><organization>org.plone.plone-3.3</organization><userSees ui="custom"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts>function pm_standalone_selected() {
     return choices.standalone.selected &amp;&amp;
         ! choices.zeo.selected
 }
@@ -84,12 +84,12 @@
 	return choices.zeo.selected &amp;&amp;
 		choices.installstartup.selected;
 }
-</scripts></distribution><description>Plone is a powerful and flexible open-source content management system powered by Zope and Python. http://plone.org</description><contents><choice title="Plone" id="plonetop" description="Installs Plone. Options include standalone versus cluster, server-mode, and startup item." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/Applications/Plone</customLoc><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>choices.standalone.selected || choices.zeo.selected</argument></requirement></choice-reqs><choice title="Python, Zope, Plone Base" id="base" description="Installs Python, Paster, ZopeSkel, Zope and the components of Plone." starts_selected="true" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.plone321.base.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_base_selected()</argument></requirement></choice-reqs></choice><choice title="Stand-Alone Instance" id="standalone" description="Choose this option to install a stand-alone Zope instance. This is a good testing and development installation method." starts_selected="true" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="true" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalone_selected()</argument></requirement></choice-reqs></choice><choice title="ZEO Cluster" id="zeo" description="Choose this option to install Zope in a client-server, Zope Enterprise Objects configuration. This is usually better for a production server install." starts_selected="false" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_zeo_selected()</argument></requirement></choice-reqs></choice><choice title="Production Mode Install" id="rootinstall" description="This uses administrative privileges to install Zope and Plone in a configuration that's more appropriate for a production server.  If you choose this option, you'll need to use the &quot;sudo&quot; command and an administrator's password to start Zope/Plone. This is more secure, but makes development and testing harder." starts_selected="false" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_rootinstall_selected()</argument></requirement><requirement id="java" operator="eq" value="false" selected="unchanged" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_rootinstall_enabled()</argument></requirement></choice-reqs></choice><choice title="Standalone / Non-Root" id="standalonenonroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zinstance_nr.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalonenonroot_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster / Non-Root" id="clusternonroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zeotemplate.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusternonroot_selected()</argument></requirement></choice-reqs></choice><choice title="Standalone / Root" id="standaloneroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.standalone_root.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standaloneroot_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster / Root" id="clusterroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zeoroot.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusterroot_selected()</argument></requirement></choice-reqs></choice><choice title="Install Startup Item" id="installstartup" description="Choose this option to install set up a startup item that will automatically start Plone when your Mac starts or restarts. This is only available for production-mode installations." starts_selected="false" starts_enabled="false" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_installstartup_selected()</argument></requirement><requirement id="java" operator="eq" value="false" selected="unchanged" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_installstartup_enabled()</argument></requirement></choice-reqs></choice><choice title="Standalone Start Item" id="standalonestartitem" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.initscripts.plonestandalone.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalonestartitem_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster Startup Item" id="clusterstartupitem" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.initscripts.plonecluster.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusterstartupitem_selected()</argument></requirement></choice-reqs></choice></choice></contents><resources bg-scale="none" bg-align="bottomleft"><locale lang="en"><resource relative="true" mod="true" type="background">generalResources/plone-icon-180.png</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf430
+</scripts></distribution><description>Plone is a powerful and flexible open-source content management system powered by Zope and Python. http://plone.org</description><contents><choice title="Plone" id="plonetop" description="Installs Plone. Options include standalone versus cluster, server-mode, and startup item." starts_selected="true" starts_enabled="true" starts_hidden="false"><customLoc>/Applications/Plone</customLoc><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>choices.standalone.selected || choices.zeo.selected</argument></requirement></choice-reqs><choice title="Python, Zope, Plone Base" id="base" description="Installs Python, Paster, ZopeSkel, Zope and the components of Plone." starts_selected="true" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.plone321.base.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_base_selected()</argument></requirement></choice-reqs></choice><choice title="Stand-Alone Instance" id="standalone" description="Choose this option to install a stand-alone Zope instance. This is a good testing and development installation method." starts_selected="true" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="true" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalone_selected()</argument></requirement></choice-reqs></choice><choice title="ZEO Cluster" id="zeo" description="Choose this option to install Zope in a client-server, Zope Enterprise Objects configuration. This is usually better for a production server install." starts_selected="false" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_zeo_selected()</argument></requirement></choice-reqs></choice><choice title="Production Mode Install" id="rootinstall" description="This uses administrative privileges to install Zope and Plone in a configuration that's more appropriate for a production server.  If you choose this option, you'll need to use the &quot;sudo&quot; command and an administrator's password to start Zope/Plone. This is more secure, but makes development and testing harder." starts_selected="false" starts_enabled="true" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_rootinstall_selected()</argument></requirement><requirement id="java" operator="eq" value="false" selected="unchanged" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_rootinstall_enabled()</argument></requirement></choice-reqs></choice><choice title="Standalone / Non-Root" id="standalonenonroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zinstance_nr.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalonenonroot_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster / Non-Root" id="clusternonroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zeotemplate.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusternonroot_selected()</argument></requirement></choice-reqs></choice><choice title="Standalone / Root" id="standaloneroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.standalone_root.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standaloneroot_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster / Root" id="clusterroot" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.zeoroot.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="no" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusterroot_selected()</argument></requirement></choice-reqs></choice><choice title="Install Startup Item" id="installstartup" description="Choose this option to install set up a startup item that will automatically start Plone when your Mac starts or restarts. This is only available for production-mode installations." starts_selected="false" starts_enabled="false" starts_hidden="false"><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_installstartup_selected()</argument></requirement><requirement id="java" operator="eq" value="false" selected="unchanged" enabled="yes" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_installstartup_enabled()</argument></requirement></choice-reqs></choice><choice title="Standalone Start Item" id="standalonestartitem" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.initscripts.plonestandalone.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_standalonestartitem_selected()</argument></requirement></choice-reqs></choice><choice title="Cluster Startup Item" id="clusterstartupitem" starts_selected="false" starts_enabled="false" starts_hidden="true"><pkgref id="org.plone.plone-3.2.1.initscripts.plonecluster.pkg"/><choice-reqs><requirement id="java" operator="eq" value="false" selected="yes" enabled="unchanged" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><argument>pm_clusterstartupitem_selected()</argument></requirement></choice-reqs></choice></choice></contents><resources bg-scale="none" bg-align="bottomleft"><locale lang="en"><resource relative="true" mod="true" type="background">generalResources/plone-icon-180.png</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
 
-\f0\b\fs32 \cf0 Plone 3.3rc5 Installer for OS X
+\f0\b\fs32 \cf0 Plone 3.3 Installer for OS X
 \fs26 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
@@ -100,4 +100,4 @@
 \
 Please note that the installer does a great deal of work preparing components. Expect it to take some time to run. The installer's progress indicators may not move during parts of the install.\
 \
-See the included README document for explanations of options.}]]></resource></locale></resources><requirements><requirement id="kilo" operator="ge" value="450"><message>Not enough space on destination volume.</message></requirement></requirements><flags/><item type="file">01standalone.xml</item><item type="file">02zeo.xml</item><item type="file">03standalone.xml</item><item type="file">04zeo.xml</item><item type="file">05standalone.xml</item><item type="file">06cluster.xml</item><item type="file">07python.xml</item><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>postinstallActions.actions</mod></pkmkdoc>
+See the included README document for explanations of options.}]]></resource></locale></resources><requirements><requirement id="kilo" operator="ge" value="450"><message>Not enough space on destination volume.</message></requirement></requirements><flags/><item type="file">01standalone.xml</item><item type="file">02zeo.xml</item><item type="file">03standalone.xml</item><item type="file">04zeo.xml</item><item type="file">05standalone.xml</item><item type="file">06cluster.xml</item><item type="file">07python.xml</item><mod>properties.userDomain</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>postinstallActions.actions</mod></pkmkdoc>

Modified: Installers/macosx/trunk/buildme.sh
==============================================================================
--- Installers/macosx/trunk/buildme.sh	(original)
+++ Installers/macosx/trunk/buildme.sh	Mon Aug 31 20:33:19 2009
@@ -8,7 +8,7 @@
 
 # specify version below; it should match the name of
 # the Unified Installer.
-VERSION=3.3rc5
+VERSION=3.3
 
 # override if you want to create the output folder somewhere else
 TARGET_DIR=Plone-${VERSION}

Modified: Installers/macosx/trunk/generalResources/ReadMe.html
==============================================================================
--- Installers/macosx/trunk/generalResources/ReadMe.html	(original)
+++ Installers/macosx/trunk/generalResources/ReadMe.html	Mon Aug 31 20:33:19 2009
@@ -233,16 +233,13 @@
   </style>
 </head>
 <body>
-<h1>Welcome to Plone<sup>®</sup> 3.3rc5 for Mac OS X<sup>®</sup></h1>
+<h1>Welcome to Plone<sup>®</sup> 3.3 for Mac OS X<sup>®</sup></h1>
 
 <p>Welcome to Plone, a powerful and flexible open-source content management system powered by Zope and Python.</p>
 
 <p>OS X version: This installer requires Mac OS X.4 (Tiger) or later, Intel or PPC.</p>
 
-<<<<<<< .mine
-<p>This Plone 3.3rc4 installer creates a base installation of Python, Zope<sup>®</sup> and Plone at /Applications/Plone. You may choose other installation destinations.</p>
-=======
-<p>This Plone 3.3rc5 installer creates a base installation of Python, Zope<sup>®</sup> and Plone at /Applications/Plone. You may choose other installation destinations.</p>
+<p>This Plone 3.3 installer creates a base installation of Python, Zope<sup>®</sup> and Plone at /Applications/Plone. You may choose other installation destinations.</p>
 >>>>>>> .r28697
 
 <h3>Components include:</h3>
@@ -250,17 +247,11 @@
 <ul>
   <li>Python 2.4.4, installed at InstallDestination/Python-2.4, including Paster and ZopeSkel.</li>
   <li>Zope 2.10.7, installed at InstallDestination/Zope-2.10.7-final</li>
-<<<<<<< .mine
-  <li>All the components of Plone 3.3rc4 in a buildout cache.</li>
-=======
-  <li>All the components of Plone 3.3rc5 in a buildout cache.</li>
+  <li>All the components of Plone 3.3 in a buildout cache.</li>
 >>>>>>> .r28697
 </ul>
 
-<<<<<<< .mine
-<p>The installer creates a buildout-based installation of Plone 3.3rc4 in either a stand-alone instance (default) or client-server (ZEO Cluster) configuration.</p>
-=======
-<p>The installer creates a buildout-based installation of Plone 3.3rc5 in either a stand-alone instance (default) or client-server (ZEO Cluster) configuration.</p>
+<p>The installer creates a buildout-based installation of Plone 3.3 in either a stand-alone instance (default) or client-server (ZEO Cluster) configuration.</p>
 >>>>>>> .r28697
 <p>The default install is appropriate for development or testing. Optionally, you may install components in "admin mode" to be owned by the system root and set up to run under a special, dedicated "plone" user id -- which is a more secure starting point for a server installation. The admin mode install requires you enter an administrative password to complete the installation, and whenever you run Plone.</p>
 <p>Information about the advantages and disadvantages of an administrative installation is available at: <a href="http://plone.org/documentation/tutorial/installing-plone-3-with-the-unified-installer/root-or-user-install">http://plone.org/documentation/tutorial/installing-plone-3-with-the-unified-installer/root-or-user-install</a>.</p>

Modified: Installers/macosx/trunk/generalResources/ReadMe.rtf
==============================================================================
--- Installers/macosx/trunk/generalResources/ReadMe.rtf	(original)
+++ Installers/macosx/trunk/generalResources/ReadMe.rtf	Mon Aug 31 20:33:19 2009
@@ -15,7 +15,7 @@
 \fs21\fsmilli10667 \expnd0\expndtw0\kerning0
 \super \'ae
 \fs32 \expnd0\expndtw0\kerning0
-\nosupersub  3.3rc5 for Mac OS X
+\nosupersub  3.3 for Mac OS X
 \fs21\fsmilli10667 \expnd0\expndtw0\kerning0
 \super \'ae
 \fs32 \expnd0\expndtw0\kerning0
@@ -50,10 +50,10 @@
 \ls1\ilvl0\kerning1\expnd0\expndtw0 {\listtext	\'95	}\expnd0\expndtw0\kerning0
 Zope 2.10.7, installed at InstallDestination/Zope-2.10.7-final\
 \ls1\ilvl0\kerning1\expnd0\expndtw0 {\listtext	\'95	}\expnd0\expndtw0\kerning0
-All the components of Plone 3.3rc5 in a buildout cache.\
+All the components of Plone 3.3 in a buildout cache.\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\sa240\ql\qnatural\pardirnatural
 \cf0 \expnd0\expndtw0\kerning0
-The installer creates a buildout-based installation of Plone 3.3rc5 in either a stand-alone instance (default) or client-server (ZEO Cluster) configuration.\
+The installer creates a buildout-based installation of Plone 3.3 in either a stand-alone instance (default) or client-server (ZEO Cluster) configuration.\
 The default install is appropriate for development or testing. Optionally, you may install components in "admin mode" to be owned by the system root and set up to run under a special, dedicated "plone" user id -- which is a more secure starting point for a server installation. The admin mode install requires you enter an administrative password to complete the installation, and whenever you run Plone.\
 Information about the advantages and disadvantages of an administrative installation is available at: {\field{\*\fldinst{HYPERLINK "http://plone.org/documentation/tutorial/installing-plone-3-with-the-unified-installer/root-or-user-install"}}{\fldrslt \cf2 \expnd0\expndtw0\kerning0
 \ul \ulc2 http://plone.org/documentation/tutorial/installing-plone-3-with-the-unified-installer/root-or-user-install}}.\

Modified: Installers/macosx/trunk/packageme.sh
==============================================================================
--- Installers/macosx/trunk/packageme.sh	(original)
+++ Installers/macosx/trunk/packageme.sh	Mon Aug 31 20:33:19 2009
@@ -6,7 +6,7 @@
 
 # specify version below; it should match the name of
 # the Unified Installer.
-VERSION=3.3rc5
+VERSION=3.3
 
 TARGET_DIR=Plone-${VERSION}
 


