Author: smukhina Date: 2008-05-20 10:50:47 -0400 (Tue, 20 May 2008) New Revision: 8212 Modified: branches/jbosstools-2.1.x/hibernatetools/docs/ branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/master.xml branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/modules/plugins.xml branches/jbosstools-2.1.x/hibernatetools/docs/reference/pom.xml Log: http://jira.jboss.com/jira/browse/JBDS-324 Merged revisions 8060,8083,8106,8114,8141,8147 via svnmerge from https://svn.jboss.org/repos/jbosstools/trunk/hibernatetools/docs ........ r8060 | ochikvina | 2008-05-13 16:06:23 +0300 (Tue, 13 May 2008) | 1 line http://jira.jboss.com/jira/browse/JBDS-320 - marking the sections that are new or updated ........ r8083 | smukhina | 2008-05-14 18:48:37 +0300 (Wed, 14 May 2008) | 2 lines http://jira.jboss.com/jira/browse/JBDS-320 comments are corrected to the corresponding docbook tags with attributes ........ r8106 | ochikvina | 2008-05-15 18:28:31 +0300 (Thu, 15 May 2008) | 1 line http://jira.jboss.com/jira/browse/JBDS-285 - authors info is added ........ r8114 | smukhina | 2008-05-15 19:49:38 +0300 (Thu, 15 May 2008) | 2 lines http://jira.jboss.com/jira/browse/JBDS-326 folders En-us and publish and staging are removed from nightly docs build, variables for links will be checked then ........ r8141 | smukhina | 2008-05-16 19:18:45 +0300 (Fri, 16 May 2008) | 1 line new styles 1.1.0 and 1.0.0. are correspondingly added to the guides ........ r8147 | ochikvina | 2008-05-16 20:07:43 +0300 (Fri, 16 May 2008) | 1 line http://jira.jboss.com/jira/browse/JBDS-286 - correcting errors found by XML validator ........ Property changes on: branches/jbosstools-2.1.x/hibernatetools/docs ___________________________________________________________________ Name: svnmerge-integrated + /trunk/hibernatetools/docs:1-7998,8060-8147 Modified: branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/master.xml =================================================================== --- branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/master.xml 2008-05-20 14:42:25 UTC (rev 8211) +++ branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/master.xml 2008-05-20 14:50:47 UTC (rev 8212) @@ -10,25 +10,27 @@ <!ENTITY reveng SYSTEM "modules/reverseengineering.xml"> <!ENTITY codegen SYSTEM "modules/codegen.xml"> -<!ENTITY seamlink "../../../../seam/publish/en-US/html_single/index.html"> -<!ENTITY aslink "../../../../as/publish/en-US/html_single/index.html"> -<!ENTITY esblink "../../../../esb_ref_guide/publish/en-US/html_single/index.html"> -<!ENTITY gsglink "../../../../GettingStartedGuide/publish/en-US/html_single/index.html"> -<!ENTITY hibernatelink "../../../../hibernatetools/publish/en-US/html_single/index.html"> -<!ENTITY jbpmlink "../../../../jbpm/publish/en-US/html_single/index.html"> -<!ENTITY jsflink "../../../../jsf/publish/en-US/html_single/index.html"> -<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/publish/en-US/html_single/index.html"> -<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/publish/en-US/html_single/index.html"> -<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/publish/en-US/html_single/index.html"> -<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/publish/en-US/html_single/index.html"> +<!ENTITY seamlink "../../../../seam/html_single/index.html"> +<!ENTITY aslink "../../../../as/html_single/index.html"> +<!ENTITY esblink "../../../../esb_ref_guide/html_single/index.html"> +<!ENTITY gsglink "../../../../GettingStartedGuide/html_single/index.html"> +<!ENTITY hibernatelink "../../../../hibernatetools/html_single/index.html"> +<!ENTITY jbpmlink "../../../../jbpm/html_single/index.html"> +<!ENTITY jsflink "../../../../jsf/html_single/index.html"> +<!ENTITY jsfreflink "../../../../jsf_tools_ref_guide/html_single/index.html"> +<!ENTITY jsftutoriallink "../../../../jsf_tools_tutorial/html_single/index.html"> +<!ENTITY strutsreflink "../../../../struts_tools_ref_guide/html_single/index.html"> +<!ENTITY strutstutoriallink "../../../../struts_tools_tutorial/html_single/index.html"> ]> <book lang="en"> <bookinfo> - <title>Hibernate Tools</title> + <title>Hibernate Tools Reference Guide</title> - <subtitle>Reference Guide</subtitle> - + <author&gt;&lt;firstname&gt;Max&lt;/firstname&gt;&lt;surname&gt;Andersen&lt;/surname&gt;&lt;email&gt;max.andersen(a)jboss.com&lt;/email&gt;&lt;/author&gt; + <author><firstname>Olga</firstname><surname>Chikvina</surname></author> + <author&gt;&lt;firstname&gt;Svetlana&lt;/firstname&gt;&lt;surname&gt;Mukhina&lt;/surname&gt;&lt;email&gt;smukhina(a)exadel.com&lt;/email&gt;&lt;/author&gt; + <pubdate>April 2008</pubdate> <copyright> <year>2007</year> @@ -37,7 +39,7 @@ </copyright> <releaseinfo> - <para>Version: 3.2.1.CR1</para> + Version: 3.2.1.CR1 </releaseinfo> Modified: branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/modules/plugins.xml =================================================================== --- branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/modules/plugins.xml 2008-05-20 14:42:25 UTC (rev 8211) +++ branches/jbosstools-2.1.x/hibernatetools/docs/reference/en/modules/plugins.xml 2008-05-20 14:50:47 UTC (rev 8212) @@ -26,7 +26,7 @@ </note> </section> - <section id="map_file_wizard"> + <section id="map_file_wizard" revisionflag="added"> <title>Creating a Hibernate Mapping File</title> <para>Hibernate mapping files are used to specify how your objects are related to database @@ -1024,7 +1024,6 @@ <figure> <title>Navigation Functionality</title> - <para> <mediaobject> <imageobject role="fo"> @@ -1036,7 +1035,7 @@ <imagedata align="center" fileref="images/plugins/plugins_10.png" format="PNG"/> </imageobject> </mediaobject> - </para> + </figure> <para>This is done via the standard hyperlink navigation functionality in Eclipse; per default @@ -1116,7 +1115,7 @@ </section> </section> - <section id="map_config_struct_editor"> + <section id="map_config_struct_editor" revisionflag="added"> <title>Structured Hibernate Mapping and Configuration File Editor</title> <para>The structured editor represents the file in the tree form. It also allows to modify the structure of the file and its elements with the help of tables provided on the right-hand @@ -1418,14 +1417,14 @@ </mediaobject> </figure> - <para>Finally, if you need to have your Diagram exported as <property> - <emphasis>.png</emphasis> - </property>, <property> - <emphasis>.jpeg</emphasis> - </property> or <property> - <emphasis>.bmp</emphasis> - </property>, you should right-click anywhere in the <property>Mapping Diagram - editor</property> and select <property><emphasis>Export as Image</emphasis>.</property></para> + <para>Finally, if you need to have your Diagram exported as + <emphasis><property>.png + </property>,</emphasis> + <emphasis><property>.jpeg</property></emphasis> + or + <emphasis><property>.bmp </property>,</emphasis> + you should right-click anywhere in the <property>Mapping Diagram + editor</property> and select <emphasis><property>Export as Image</property></emphasis>.</para> <figure> <title>Mapping Diagram Export</title> @@ -1437,17 +1436,17 @@ </mediaobject> </figure> - <para>As you can see on the figure above, <property> - <emphasis>Undo</emphasis>, </property> - <property> - <emphasis>Redo</emphasis> - </property> and <property> - <emphasis>Auto layout</emphasis> - </property> options are also available through the context menu.</para> + <para>As you can see on the figure above, + <emphasis><property>Undo</property>, </emphasis> + + <emphasis><property>Redo</property></emphasis> + and + <emphasis><property>Auto layout </property></emphasis> + options are also available through the context menu.</para> </section> </section> - <section> + <section revisionflag="changed"> <title>Prototyping Queries</title> <para>Queries can be prototyped by entering them in the <property>HQL</property> or Modified: branches/jbosstools-2.1.x/hibernatetools/docs/reference/pom.xml =================================================================== --- branches/jbosstools-2.1.x/hibernatetools/docs/reference/pom.xml 2008-05-20 14:42:25 UTC (rev 8211) +++ branches/jbosstools-2.1.x/hibernatetools/docs/reference/pom.xml 2008-05-20 14:50:47 UTC (rev 8212) @@ -21,12 +21,12 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0.Beta1</version> + <version>1.1.0</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0.Beta1</version> + <version>1.1.0</version> <type>jdocbook-style</type> </dependency> </dependencies>