Author: shawkins Date: 2010-08-31 13:55:27 -0400 (Tue, 31 Aug 2010) New Revision: 2508 Modified: branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/admin-console.xml branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/federated_planning.xml Log: minor doc fixes Modified: branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/admin-console.xml =================================================================== --- branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/admin-console.xml 2010-08-30 21:48:07 UTC (rev 2507) +++ branches/7.1.x/documentation/admin-guide/src/main/docbook/en-US/content/admin-console.xml 2010-08-31 17:55:27 UTC (rev 2508) @@ -6,6 +6,12 @@ Teiid's Admin Console is built using the <ulink url="http://www.jboss.org/embjopr">Embedded JOPR</ulink> library and adds a additional plugin into the Embeeded JOPR program already available in the <ulink url="http://www.jboss.org/jbossas">JBoss AS</ulink>.</para> + <mediaobject> + <imageobject> + <imagedata scalefit="1" fileref="../images/admin_console.png"/> + </imageobject> + </mediaobject> + <section> <title>What can be monitored and/or configured?</title> <para>Here are the steps to follow to install Teiid</para> @@ -31,12 +37,6 @@ <para>The creation/modification of the datasource is managed by the JBossAS plugin.</para> </note> - <mediaobject> - <imageobject> - <imagedata fileref="../images/admin_console.png"/> - </imageobject> - </mediaobject> - <section> <title>Configuration</title> <orderedlist> Modified: branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/federated_planning.xml =================================================================== --- branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/federated_planning.xml 2010-08-30 21:48:07 UTC (rev 2507) +++ branches/7.1.x/documentation/reference/src/main/docbook/en-US/content/federated_planning.xml 2010-08-31 17:55:27 UTC (rev 2508) @@ -697,7 +697,7 @@ <para>LIMIT (limit result set to a certain range of results)</para> </listitem> </orderedlist> - <para>These clause translate into the following types of planning + <para>These clauses translate into the following types of planning nodes:</para> <itemizedlist> <listitem> @@ -710,7 +710,7 @@ <para>GROUP BY: Group node</para> </listitem> <listitem> - <para>GROUP BY: Group node</para> + <para>HAVING: Select node</para> </listitem> <listitem> <para>SELECT: Project node and DupRemoval node (for SELECT DISTINCT)</para> @@ -719,7 +719,7 @@ <para>INTO: Project node with a SOURCE Node</para> </listitem> <listitem> - <para>INTO: Project node with a SOURCE Node</para> + <para>ORDER BY: Sort node</para> </listitem> <listitem> <para>LIMIT: Limit node</para>