svn commit: r837685 [1/9] - in /websites/staging/cayenne/trunk/content: ./ 2010/11/29/ 2010/12/02/ 2011/03/08/ 2011/06/21/ 2011/09/26/ 2012/06/12/ doc/ doc/1.2/ doc/1.2/grammar/ doc/2.0/ doc/3.0/ doc/3.1/

[bu...@apache.org]

Author: buildbot
Date: Thu Nov  8 18:00:49 2012
New Revision: 837685

Log:
Staging update by buildbot for cayenne

Modified:
    websites/staging/cayenne/trunk/content/   (props changed)
    websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html
    websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html
    websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html
    websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html
    websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html
    websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html
    websites/staging/cayenne/trunk/content/about.html
    websites/staging/cayenne/trunk/content/building-cayenne.html
    websites/staging/cayenne/trunk/content/code-repository.html
    websites/staging/cayenne/trunk/content/collaboration.html
    websites/staging/cayenne/trunk/content/contributors.html
    websites/staging/cayenne/trunk/content/database-support.html
    websites/staging/cayenne/trunk/content/developer-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html
    websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html
    websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html
    websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html
    websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-datamaps.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-project-structure.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-projects.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-user-directory.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-and-eclipse.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdataport.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdbgen.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdeploy.html
    websites/staging/cayenne/trunk/content/doc/1.2/cgen.html
    websites/staging/cayenne/trunk/content/doc/1.2/classpath.html
    websites/staging/cayenne/trunk/content/doc/1.2/common-modeling-tasks.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-caching-behavior.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-deployment-settings.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-logging.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-object-validation.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-transactional-behavior.html
    websites/staging/cayenne/trunk/content/doc/1.2/converting-an-existing-business-framework.html
    websites/staging/cayenne/trunk/content/doc/1.2/create-datanode.html
    websites/staging/cayenne/trunk/content/doc/1.2/create-new-project.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing-configuration.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing.html
    websites/staging/cayenne/trunk/content/doc/1.2/data-rows.html
    websites/staging/cayenne/trunk/content/doc/1.2/datachannel.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontextdelegate.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontextfactory.html
    websites/staging/cayenne/trunk/content/doc/1.2/datanode.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobject-state-management.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobject-validation.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjects-example.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjects.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjectutils.html
    websites/staging/cayenne/trunk/content/doc/1.2/datasource.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataview-concepts.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataviews-in-action.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataviews.html
    websites/staging/cayenne/trunk/content/doc/1.2/dbadapter.html
    websites/staging/cayenne/trunk/content/doc/1.2/delete-rules.html
    websites/staging/cayenne/trunk/content/doc/1.2/deleting-objects.html
    websites/staging/cayenne/trunk/content/doc/1.2/deployment-with-ant.html
    websites/staging/cayenne/trunk/content/doc/1.2/deployment.html
    websites/staging/cayenne/trunk/content/doc/1.2/design.html
    websites/staging/cayenne/trunk/content/doc/1.2/documentation.html
    websites/staging/cayenne/trunk/content/doc/1.2/dvmodeler-gui-tool.html
    websites/staging/cayenne/trunk/content/doc/1.2/entityresolver.html
    websites/staging/cayenne/trunk/content/doc/1.2/event-package.html
    websites/staging/cayenne/trunk/content/doc/1.2/executing-a-stored-procedure.html
    websites/staging/cayenne/trunk/content/doc/1.2/expression-factory-utilities.html
    websites/staging/cayenne/trunk/content/doc/1.2/expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/extended-types.html
    websites/staging/cayenne/trunk/content/doc/1.2/flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/general-navigation.html
    websites/staging/cayenne/trunk/content/doc/1.2/general-preferences.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-database-schema.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-java-classes.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-primary-key-support.html
    websites/staging/cayenne/trunk/content/doc/1.2/generated-columns.html
    websites/staging/cayenne/trunk/content/doc/1.2/generic-persistent-class.html
    websites/staging/cayenne/trunk/content/doc/1.2/grammar/ExpressionParser.html
    websites/staging/cayenne/trunk/content/doc/1.2/guide-to-11-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/guide-to-12-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/handling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/1.2/in-memory-evaluation.html
    websites/staging/cayenne/trunk/content/doc/1.2/index.html
    websites/staging/cayenne/trunk/content/doc/1.2/installation.html
    websites/staging/cayenne/trunk/content/doc/1.2/introduction-to-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/1.2/introduction.html
    websites/staging/cayenne/trunk/content/doc/1.2/iterating-through-data-rows.html
    websites/staging/cayenne/trunk/content/doc/1.2/jar-files-and-dependencies.html
    websites/staging/cayenne/trunk/content/doc/1.2/java-interface-to-an-existing-database.html
    websites/staging/cayenne/trunk/content/doc/1.2/license.html
    websites/staging/cayenne/trunk/content/doc/1.2/local-datasources.html
    websites/staging/cayenne/trunk/content/doc/1.2/many-to-many-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeler-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-database-layer.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-object-layer.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-objentities.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-remote-persistence.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-tips.html
    websites/staging/cayenne/trunk/content/doc/1.2/moving-objects-between-contexts.html
    websites/staging/cayenne/trunk/content/doc/1.2/namedquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/nested-datacontexts.html
    websites/staging/cayenne/trunk/content/doc/1.2/new-system.html
    websites/staging/cayenne/trunk/content/doc/1.2/null-handling.html
    websites/staging/cayenne/trunk/content/doc/1.2/object-caching.html
    websites/staging/cayenne/trunk/content/doc/1.2/objectcontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/objectidquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/obtaining-datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/orm-case-study.html
    websites/staging/cayenne/trunk/content/doc/1.2/paginated-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/parameterized-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/path-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/performance-tuning.html
    websites/staging/cayenne/trunk/content/doc/1.2/persistent-object-lifecycle.html
    websites/staging/cayenne/trunk/content/doc/1.2/preferences-panel.html
    websites/staging/cayenne/trunk/content/doc/1.2/prefetching.html
    websites/staging/cayenne/trunk/content/doc/1.2/primary-key-generation.html
    websites/staging/cayenne/trunk/content/doc/1.2/qualifier-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/queries-stored-in-datamap.html
    websites/staging/cayenne/trunk/content/doc/1.2/queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/querychain.html
    websites/staging/cayenne/trunk/content/doc/1.2/quick-start.html
    websites/staging/cayenne/trunk/content/doc/1.2/relationshipquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-client-deployment.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-client.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-server.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-comparison.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-cws-deployment.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-installation.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-introduction.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-limitations.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-quick-start.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-security.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-authentication.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-code.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-project.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-webservice.html
    websites/staging/cayenne/trunk/content/doc/1.2/reverse-engineer-database.html
    websites/staging/cayenne/trunk/content/doc/1.2/running-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/1.2/running-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/runtime-components.html
    websites/staging/cayenne/trunk/content/doc/1.2/scripting-sqltemplate.html
    websites/staging/cayenne/trunk/content/doc/1.2/selecting-objects.html
    websites/staging/cayenne/trunk/content/doc/1.2/selectquery-customization.html
    websites/staging/cayenne/trunk/content/doc/1.2/selectquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/setting-datamap-defaults.html
    websites/staging/cayenne/trunk/content/doc/1.2/sqltemplate-query.html
    websites/staging/cayenne/trunk/content/doc/1.2/standalone-applications.html
    websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures-and-transactions.html
    websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures.html
    websites/staging/cayenne/trunk/content/doc/1.2/swing-applications.html
    websites/staging/cayenne/trunk/content/doc/1.2/system-requirements.html
    websites/staging/cayenne/trunk/content/doc/1.2/to-dep-pk-checkbox.html
    websites/staging/cayenne/trunk/content/doc/1.2/turning-off-context-synchronization.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-dataobjects.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-delete.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-generate-database-and-java-classes.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-mapping-query.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-object-relational-mapping.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-selectquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-starting-mapping-project.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-webapp.html
    websites/staging/cayenne/trunk/content/doc/1.2/understanding-transactions.html
    websites/staging/cayenne/trunk/content/doc/1.2/upgrade.html
    websites/staging/cayenne/trunk/content/doc/1.2/user-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/using-jndi.html
    websites/staging/cayenne/trunk/content/doc/1.2/using-orderings.html
    websites/staging/cayenne/trunk/content/doc/1.2/web-applications.html
    websites/staging/cayenne/trunk/content/doc/2.0/accessing-pk-and-fk-values.html
    websites/staging/cayenne/trunk/content/doc/2.0/acknowledgments.html
    websites/staging/cayenne/trunk/content/doc/2.0/ant-tasks.html
    websites/staging/cayenne/trunk/content/doc/2.0/bnf-for-expressionparser.html
    websites/staging/cayenne/trunk/content/doc/2.0/building-expressions.html
    websites/staging/cayenne/trunk/content/doc/2.0/caching-lookup-tables.html
    websites/staging/cayenne/trunk/content/doc/2.0/caching-query-results.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayenne-contract.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayenne-datamaps.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayenne-project-structure.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayenne-projects.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayenne-user-directory.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayennemodeler-and-eclipse.html
    websites/staging/cayenne/trunk/content/doc/2.0/cayennemodeler-flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/2.0/cdataport.html
    websites/staging/cayenne/trunk/content/doc/2.0/cdbgen.html
    websites/staging/cayenne/trunk/content/doc/2.0/cdeploy.html
    websites/staging/cayenne/trunk/content/doc/2.0/cgen.html
    websites/staging/cayenne/trunk/content/doc/2.0/classpath.html
    websites/staging/cayenne/trunk/content/doc/2.0/common-modeling-tasks.html
    websites/staging/cayenne/trunk/content/doc/2.0/configuring-caching-behavior.html
    websites/staging/cayenne/trunk/content/doc/2.0/configuring-deployment-settings.html
    websites/staging/cayenne/trunk/content/doc/2.0/configuring-logging.html
    websites/staging/cayenne/trunk/content/doc/2.0/configuring-object-validation.html
    websites/staging/cayenne/trunk/content/doc/2.0/configuring-transactional-behavior.html
    websites/staging/cayenne/trunk/content/doc/2.0/converting-an-existing-business-framework.html
    websites/staging/cayenne/trunk/content/doc/2.0/copy-of-bnf-for-expressionparser.html
    websites/staging/cayenne/trunk/content/doc/2.0/create-datanode.html
    websites/staging/cayenne/trunk/content/doc/2.0/create-new-project.html
    websites/staging/cayenne/trunk/content/doc/2.0/customizing-configuration.html
    websites/staging/cayenne/trunk/content/doc/2.0/customizing-queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/customizing.html
    websites/staging/cayenne/trunk/content/doc/2.0/data-rows.html
    websites/staging/cayenne/trunk/content/doc/2.0/datachannel.html
    websites/staging/cayenne/trunk/content/doc/2.0/datacontext.html
    websites/staging/cayenne/trunk/content/doc/2.0/datacontextdelegate.html
    websites/staging/cayenne/trunk/content/doc/2.0/datacontextfactory.html
    websites/staging/cayenne/trunk/content/doc/2.0/datanode.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataobject-state-management.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataobject-validation.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataobjects-example.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataobjects.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataobjectutils.html
    websites/staging/cayenne/trunk/content/doc/2.0/datasource.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataview-concepts.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataviews-in-action.html
    websites/staging/cayenne/trunk/content/doc/2.0/dataviews.html
    websites/staging/cayenne/trunk/content/doc/2.0/dbadapter.html
    websites/staging/cayenne/trunk/content/doc/2.0/dbcpdatasourcefactory.html
    websites/staging/cayenne/trunk/content/doc/2.0/delete-rules.html
    websites/staging/cayenne/trunk/content/doc/2.0/deleting-objects.html
    websites/staging/cayenne/trunk/content/doc/2.0/deployment-with-ant.html
    websites/staging/cayenne/trunk/content/doc/2.0/deployment.html
    websites/staging/cayenne/trunk/content/doc/2.0/design.html
    websites/staging/cayenne/trunk/content/doc/2.0/documentation.html
    websites/staging/cayenne/trunk/content/doc/2.0/dvmodeler-gui-tool.html
    websites/staging/cayenne/trunk/content/doc/2.0/entityresolver.html
    websites/staging/cayenne/trunk/content/doc/2.0/event-package.html
    websites/staging/cayenne/trunk/content/doc/2.0/executing-a-stored-procedure.html
    websites/staging/cayenne/trunk/content/doc/2.0/expression-factory-utilities.html
    websites/staging/cayenne/trunk/content/doc/2.0/expressions.html
    websites/staging/cayenne/trunk/content/doc/2.0/extended-types.html
    websites/staging/cayenne/trunk/content/doc/2.0/flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/2.0/general-navigation.html
    websites/staging/cayenne/trunk/content/doc/2.0/general-preferences.html
    websites/staging/cayenne/trunk/content/doc/2.0/generate-database-schema.html
    websites/staging/cayenne/trunk/content/doc/2.0/generate-java-classes.html
    websites/staging/cayenne/trunk/content/doc/2.0/generate-primary-key-support.html
    websites/staging/cayenne/trunk/content/doc/2.0/generated-columns.html
    websites/staging/cayenne/trunk/content/doc/2.0/generic-persistent-class.html
    websites/staging/cayenne/trunk/content/doc/2.0/guide-to-11-features.html
    websites/staging/cayenne/trunk/content/doc/2.0/guide-to-12-features.html
    websites/staging/cayenne/trunk/content/doc/2.0/handling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/2.0/in-memory-evaluation.html
    websites/staging/cayenne/trunk/content/doc/2.0/index.html
    websites/staging/cayenne/trunk/content/doc/2.0/installation.html
    websites/staging/cayenne/trunk/content/doc/2.0/introduction-to-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/2.0/introduction.html
    websites/staging/cayenne/trunk/content/doc/2.0/iterating-through-data-rows.html
    websites/staging/cayenne/trunk/content/doc/2.0/jar-files-and-dependencies.html
    websites/staging/cayenne/trunk/content/doc/2.0/java-interface-to-an-existing-database.html
    websites/staging/cayenne/trunk/content/doc/2.0/license.html
    websites/staging/cayenne/trunk/content/doc/2.0/local-datasources.html
    websites/staging/cayenne/trunk/content/doc/2.0/many-to-many-relationships.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeler-guide.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-database-layer.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-object-layer.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-objentities.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-remote-persistence.html
    websites/staging/cayenne/trunk/content/doc/2.0/modeling-tips.html
    websites/staging/cayenne/trunk/content/doc/2.0/moving-objects-between-contexts.html
    websites/staging/cayenne/trunk/content/doc/2.0/namedquery.html
    websites/staging/cayenne/trunk/content/doc/2.0/nested-datacontexts.html
    websites/staging/cayenne/trunk/content/doc/2.0/new-system.html
    websites/staging/cayenne/trunk/content/doc/2.0/null-handling.html
    websites/staging/cayenne/trunk/content/doc/2.0/object-caching.html
    websites/staging/cayenne/trunk/content/doc/2.0/objectcontext.html
    websites/staging/cayenne/trunk/content/doc/2.0/objectidquery.html
    websites/staging/cayenne/trunk/content/doc/2.0/obtaining-datacontext.html
    websites/staging/cayenne/trunk/content/doc/2.0/orm-case-study.html
    websites/staging/cayenne/trunk/content/doc/2.0/paginated-queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/parameterized-queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/path-expressions.html
    websites/staging/cayenne/trunk/content/doc/2.0/performance-tuning.html
    websites/staging/cayenne/trunk/content/doc/2.0/persistent-object-lifecycle.html
    websites/staging/cayenne/trunk/content/doc/2.0/preferences-panel.html
    websites/staging/cayenne/trunk/content/doc/2.0/prefetching.html
    websites/staging/cayenne/trunk/content/doc/2.0/primary-key-generation.html
    websites/staging/cayenne/trunk/content/doc/2.0/qualifier-expressions.html
    websites/staging/cayenne/trunk/content/doc/2.0/queries-stored-in-datamap.html
    websites/staging/cayenne/trunk/content/doc/2.0/queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/querychain.html
    websites/staging/cayenne/trunk/content/doc/2.0/quick-start.html
    websites/staging/cayenne/trunk/content/doc/2.0/relationshipquery.html
    websites/staging/cayenne/trunk/content/doc/2.0/relationships.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-client-deployment.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-coding-client.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-coding-server.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-comparison.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-cws-deployment.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-features.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-guide.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-installation.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-introduction.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-limitations.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-quick-start.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-security.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-tutorial-authentication.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-tutorial-client-code.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-tutorial-client-project.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/2.0/remote-object-persistence-tutorial-webservice.html
    websites/staging/cayenne/trunk/content/doc/2.0/reverse-engineer-database.html
    websites/staging/cayenne/trunk/content/doc/2.0/running-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/2.0/running-queries.html
    websites/staging/cayenne/trunk/content/doc/2.0/runtime-components.html
    websites/staging/cayenne/trunk/content/doc/2.0/scripting-sqltemplate.html
    websites/staging/cayenne/trunk/content/doc/2.0/selecting-objects.html
    websites/staging/cayenne/trunk/content/doc/2.0/selectquery-customization.html
    websites/staging/cayenne/trunk/content/doc/2.0/selectquery.html
    websites/staging/cayenne/trunk/content/doc/2.0/setting-datamap-defaults.html
    websites/staging/cayenne/trunk/content/doc/2.0/sqltemplate-query.html
    websites/staging/cayenne/trunk/content/doc/2.0/standalone-applications.html
    websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures-and-transactions.html
    websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures.html
    websites/staging/cayenne/trunk/content/doc/2.0/swing-applications.html
    websites/staging/cayenne/trunk/content/doc/2.0/to-dep-pk-checkbox.html
    websites/staging/cayenne/trunk/content/doc/2.0/turning-off-context-synchronization.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-datacontext.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-dataobjects.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-delete.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-generate-database-and-java-classes.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-mapping-query.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-object-relational-mapping.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-selectquery.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-starting-mapping-project.html
    websites/staging/cayenne/trunk/content/doc/2.0/tutorial-webapp.html
    websites/staging/cayenne/trunk/content/doc/2.0/understanding-transactions.html
    websites/staging/cayenne/trunk/content/doc/2.0/upgrade.html
    websites/staging/cayenne/trunk/content/doc/2.0/user-guide.html
    websites/staging/cayenne/trunk/content/doc/2.0/using-jndi.html
    websites/staging/cayenne/trunk/content/doc/2.0/using-orderings.html
    websites/staging/cayenne/trunk/content/doc/2.0/web-applications.html
    websites/staging/cayenne/trunk/content/doc/3.0/accessing-pk-and-fk-values.html
    websites/staging/cayenne/trunk/content/doc/3.0/advanced-sqltemplate.html
    websites/staging/cayenne/trunk/content/doc/3.0/ant-tasks.html
    websites/staging/cayenne/trunk/content/doc/3.0/bnf-for-expressionparser.html
    websites/staging/cayenne/trunk/content/doc/3.0/building-expressions.html
    websites/staging/cayenne/trunk/content/doc/3.0/caching-and-fresh-data.html
    websites/staging/cayenne/trunk/content/doc/3.0/caching-lookup-tables.html
    websites/staging/cayenne/trunk/content/doc/3.0/caching-query-results.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-and-maven.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-contract.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-datamaps.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-guide.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-project-structure.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-projects.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayenne-user-directory.html
    websites/staging/cayenne/trunk/content/doc/3.0/cayennemodeler-flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/3.0/cdataport.html
    websites/staging/cayenne/trunk/content/doc/3.0/cdbgen.html
    websites/staging/cayenne/trunk/content/doc/3.0/cdbimport.html
    websites/staging/cayenne/trunk/content/doc/3.0/cdeploy.html
    websites/staging/cayenne/trunk/content/doc/3.0/cgen.html
    websites/staging/cayenne/trunk/content/doc/3.0/classpath.html
    websites/staging/cayenne/trunk/content/doc/3.0/common-modeling-tasks.html
    websites/staging/cayenne/trunk/content/doc/3.0/comparing-dataobjects.html
    websites/staging/cayenne/trunk/content/doc/3.0/configuring-caching-behavior.html
    websites/staging/cayenne/trunk/content/doc/3.0/configuring-deployment-settings.html
    websites/staging/cayenne/trunk/content/doc/3.0/configuring-logging.html
    websites/staging/cayenne/trunk/content/doc/3.0/configuring-object-validation.html
    websites/staging/cayenne/trunk/content/doc/3.0/configuring-transactional-behavior.html
    websites/staging/cayenne/trunk/content/doc/3.0/converting-an-existing-business-framework.html
    websites/staging/cayenne/trunk/content/doc/3.0/create-datanode.html
    websites/staging/cayenne/trunk/content/doc/3.0/create-new-project.html
    websites/staging/cayenne/trunk/content/doc/3.0/custom-batchquerybuilder-factory.html
    websites/staging/cayenne/trunk/content/doc/3.0/custom-dbadapter.html
    websites/staging/cayenne/trunk/content/doc/3.0/custom-query-cache-provider.html
    websites/staging/cayenne/trunk/content/doc/3.0/customization.html
    websites/staging/cayenne/trunk/content/doc/3.0/customizing-configuration.html
    websites/staging/cayenne/trunk/content/doc/3.0/customizing-queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/data-rows.html
    websites/staging/cayenne/trunk/content/doc/3.0/database-support.html
    websites/staging/cayenne/trunk/content/doc/3.0/datachannel.html
    websites/staging/cayenne/trunk/content/doc/3.0/datacontext.html
    websites/staging/cayenne/trunk/content/doc/3.0/datacontextdelegate.html
    websites/staging/cayenne/trunk/content/doc/3.0/datacontextfactory.html
    websites/staging/cayenne/trunk/content/doc/3.0/datanode.html
    websites/staging/cayenne/trunk/content/doc/3.0/dataobject-state-management.html
    websites/staging/cayenne/trunk/content/doc/3.0/dataobject-validation.html
    websites/staging/cayenne/trunk/content/doc/3.0/dataobjects-example.html
    websites/staging/cayenne/trunk/content/doc/3.0/dataobjects.html
    websites/staging/cayenne/trunk/content/doc/3.0/dataobjectutils.html
    websites/staging/cayenne/trunk/content/doc/3.0/datasource.html
    websites/staging/cayenne/trunk/content/doc/3.0/dbadapter.html
    websites/staging/cayenne/trunk/content/doc/3.0/dbcpdatasourcefactory.html
    websites/staging/cayenne/trunk/content/doc/3.0/delete-rules.html
    websites/staging/cayenne/trunk/content/doc/3.0/deleting-objects.html
    websites/staging/cayenne/trunk/content/doc/3.0/deployment.html
    websites/staging/cayenne/trunk/content/doc/3.0/design.html
    websites/staging/cayenne/trunk/content/doc/3.0/ejbqlquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/entityresolver.html
    websites/staging/cayenne/trunk/content/doc/3.0/event-package.html
    websites/staging/cayenne/trunk/content/doc/3.0/executing-a-stored-procedure.html
    websites/staging/cayenne/trunk/content/doc/3.0/expression-factory-utilities.html
    websites/staging/cayenne/trunk/content/doc/3.0/expressions.html
    websites/staging/cayenne/trunk/content/doc/3.0/extended-types.html
    websites/staging/cayenne/trunk/content/doc/3.0/flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/3.0/general-navigation.html
    websites/staging/cayenne/trunk/content/doc/3.0/general-preferences.html
    websites/staging/cayenne/trunk/content/doc/3.0/generate-database-schema.html
    websites/staging/cayenne/trunk/content/doc/3.0/generate-java-classes.html
    websites/staging/cayenne/trunk/content/doc/3.0/generate-primary-key-support.html
    websites/staging/cayenne/trunk/content/doc/3.0/generated-columns.html
    websites/staging/cayenne/trunk/content/doc/3.0/generic-persistent-class.html
    websites/staging/cayenne/trunk/content/doc/3.0/guide-to-11-features.html
    websites/staging/cayenne/trunk/content/doc/3.0/guide-to-12-features.html
    websites/staging/cayenne/trunk/content/doc/3.0/guide-to-30-features.html
    websites/staging/cayenne/trunk/content/doc/3.0/handling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/3.0/in-memory-evaluation.html
    websites/staging/cayenne/trunk/content/doc/3.0/index.html
    websites/staging/cayenne/trunk/content/doc/3.0/individual-object-caching.html
    websites/staging/cayenne/trunk/content/doc/3.0/inheritance-overview.html
    websites/staging/cayenne/trunk/content/doc/3.0/installation.html
    websites/staging/cayenne/trunk/content/doc/3.0/introduction-to-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/3.0/introduction.html
    websites/staging/cayenne/trunk/content/doc/3.0/iterating-through-data-rows.html
    websites/staging/cayenne/trunk/content/doc/3.0/jar-files-and-dependencies.html
    websites/staging/cayenne/trunk/content/doc/3.0/java-interface-to-an-existing-database.html
    websites/staging/cayenne/trunk/content/doc/3.0/license.html
    websites/staging/cayenne/trunk/content/doc/3.0/lifecycle-callbacks.html
    websites/staging/cayenne/trunk/content/doc/3.0/local-datasources.html
    websites/staging/cayenne/trunk/content/doc/3.0/many-to-many-relationships.html
    websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbgen.html
    websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbimport.html
    websites/staging/cayenne/trunk/content/doc/3.0/maven2-cgen.html
    websites/staging/cayenne/trunk/content/doc/3.0/maven2-modeler.html
    websites/staging/cayenne/trunk/content/doc/3.0/maven2-plugins.html
    websites/staging/cayenne/trunk/content/doc/3.0/migrate-changes-between-model-and-database.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeler-guide.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-database-layer.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-embeddables.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-enumerations.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-object-layer.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-objentities.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-remote-persistence.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-single-table-inheritance.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-tips.html
    websites/staging/cayenne/trunk/content/doc/3.0/modeling-vertical-inheritance.html
    websites/staging/cayenne/trunk/content/doc/3.0/moving-objects-between-contexts.html
    websites/staging/cayenne/trunk/content/doc/3.0/namedquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/nested-contexts.html
    websites/staging/cayenne/trunk/content/doc/3.0/new-system.html
    websites/staging/cayenne/trunk/content/doc/3.0/null-handling.html
    websites/staging/cayenne/trunk/content/doc/3.0/objectcontext-memory-management.html
    websites/staging/cayenne/trunk/content/doc/3.0/objectcontext.html
    websites/staging/cayenne/trunk/content/doc/3.0/objectidquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/obtaining-datacontext.html
    websites/staging/cayenne/trunk/content/doc/3.0/orm-case-study.html
    websites/staging/cayenne/trunk/content/doc/3.0/overview.html
    websites/staging/cayenne/trunk/content/doc/3.0/paginated-queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/parameterized-queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/path-expressions.html
    websites/staging/cayenne/trunk/content/doc/3.0/performance-tuning.html
    websites/staging/cayenne/trunk/content/doc/3.0/persistent-object-lifecycle.html
    websites/staging/cayenne/trunk/content/doc/3.0/preferences-panel.html
    websites/staging/cayenne/trunk/content/doc/3.0/prefetching.html
    websites/staging/cayenne/trunk/content/doc/3.0/primary-key-generation.html
    websites/staging/cayenne/trunk/content/doc/3.0/qualifier-expressions.html
    websites/staging/cayenne/trunk/content/doc/3.0/queries-stored-in-datamap.html
    websites/staging/cayenne/trunk/content/doc/3.0/queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/query-result-caching.html
    websites/staging/cayenne/trunk/content/doc/3.0/querychain.html
    websites/staging/cayenne/trunk/content/doc/3.0/relationshipquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/relationships.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-client-deployment.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-coding-client.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-coding-server.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-comparison.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-customization.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-cws-deployment.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-features.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-guide.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-installation.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-introduction.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-lifecycle-callbacks.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-limitations.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-quick-start.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-security.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-authentication.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-client-code.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-client-project.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-prerequisites.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial-webservice.html
    websites/staging/cayenne/trunk/content/doc/3.0/remote-object-persistence-tutorial.html
    websites/staging/cayenne/trunk/content/doc/3.0/reverse-engineer-database.html
    websites/staging/cayenne/trunk/content/doc/3.0/running-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/3.0/running-queries.html
    websites/staging/cayenne/trunk/content/doc/3.0/runtime-components.html
    websites/staging/cayenne/trunk/content/doc/3.0/scripting-sqltemplate.html
    websites/staging/cayenne/trunk/content/doc/3.0/selecting-objects.html
    websites/staging/cayenne/trunk/content/doc/3.0/selectquery-customization.html
    websites/staging/cayenne/trunk/content/doc/3.0/selectquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/setting-datamap-defaults.html
    websites/staging/cayenne/trunk/content/doc/3.0/sqltemplate-basics.html
    websites/staging/cayenne/trunk/content/doc/3.0/sqltemplate-query.html
    websites/staging/cayenne/trunk/content/doc/3.0/sqltemplate-result-mapping.html
    websites/staging/cayenne/trunk/content/doc/3.0/standalone-applications.html
    websites/staging/cayenne/trunk/content/doc/3.0/stored-procedures-and-transactions.html
    websites/staging/cayenne/trunk/content/doc/3.0/stored-procedures.html
    websites/staging/cayenne/trunk/content/doc/3.0/to-dep-pk-checkbox.html
    websites/staging/cayenne/trunk/content/doc/3.0/turning-off-context-synchronization.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-dataobjects.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-delete.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-generate-database-and-java-classes.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-java-classes.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-mapping-query.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-object-relational-mapping.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-objectcontext.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-persistent-objects.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-selectquery.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-starting-project.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial-webapp.html
    websites/staging/cayenne/trunk/content/doc/3.0/tutorial.html
    websites/staging/cayenne/trunk/content/doc/3.0/understanding-transactions.html
    websites/staging/cayenne/trunk/content/doc/3.0/upgrade.html
    websites/staging/cayenne/trunk/content/doc/3.0/using-jndi.html
    websites/staging/cayenne/trunk/content/doc/3.0/using-orderings.html
    websites/staging/cayenne/trunk/content/doc/3.0/web-applications.html
    websites/staging/cayenne/trunk/content/doc/3.1/index.html
    websites/staging/cayenne/trunk/content/doc/index.html
    websites/staging/cayenne/trunk/content/download.html
    websites/staging/cayenne/trunk/content/eclipse.html
    websites/staging/cayenne/trunk/content/getting-started.html
    websites/staging/cayenne/trunk/content/how-can-i-help.html
    websites/staging/cayenne/trunk/content/how_development_happens.html
    websites/staging/cayenne/trunk/content/index.html
    websites/staging/cayenne/trunk/content/legacy-ant-build.html
    websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
    websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
    websites/staging/cayenne/trunk/content/legacy-eclipse.html
    websites/staging/cayenne/trunk/content/mailing-lists.html
    websites/staging/cayenne/trunk/content/privacy-policy.html
    websites/staging/cayenne/trunk/content/release-guide-2.0.html
    websites/staging/cayenne/trunk/content/release-guide.html
    websites/staging/cayenne/trunk/content/running-unit-tests.html
    websites/staging/cayenne/trunk/content/submit-patch.html
    websites/staging/cayenne/trunk/content/success-stories.html
    websites/staging/cayenne/trunk/content/support.html
    websites/staging/cayenne/trunk/content/why-cayenne.html

Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov  8 18:00:49 2012
@@ -1 +1 @@
-1407185
+1407187

Modified: websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html (original)
+++ websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html (original)
+++ websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html (original)
+++ websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/about.html
==============================================================================
--- websites/staging/cayenne/trunk/content/about.html (original)
+++ websites/staging/cayenne/trunk/content/about.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/building-cayenne.html
==============================================================================
--- websites/staging/cayenne/trunk/content/building-cayenne.html (original)
+++ websites/staging/cayenne/trunk/content/building-cayenne.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/code-repository.html
==============================================================================
--- websites/staging/cayenne/trunk/content/code-repository.html (original)
+++ websites/staging/cayenne/trunk/content/code-repository.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/collaboration.html
==============================================================================
--- websites/staging/cayenne/trunk/content/collaboration.html (original)
+++ websites/staging/cayenne/trunk/content/collaboration.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/contributors.html
==============================================================================
--- websites/staging/cayenne/trunk/content/contributors.html (original)
+++ websites/staging/cayenne/trunk/content/contributors.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/database-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/database-support.html (original)
+++ websites/staging/cayenne/trunk/content/database-support.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/developer-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/developer-guide.html (original)
+++ websites/staging/cayenne/trunk/content/developer-guide.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</a>
 				<ul>
-					<li><a href="/doc30/overview.html">Overview</a></li>
-					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
 				<ul>
-					<li><a href="/doc20/user-guide.html">User Guide</a></li>
-					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
 				<ul>
-					<li><a href="/doc12/user-guide.html">User Guide</a></li>
-					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html Thu Nov  8 18:00:49 2012
@@ -32,12 +32,12 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
 		<ul>
-			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
-			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
-			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>