--- a/Symbian3/PDK/Source/GUID-7B275129-5EF7-4B27-B603-3BDE2C650A93.dita	Tue Mar 30 11:42:04 2010 +0100
+++ b/Symbian3/PDK/Source/GUID-7B275129-5EF7-4B27-B603-3BDE2C650A93.dita	Tue Mar 30 11:56:28 2010 +0100
@@ -4,49 +4,71 @@
 "Eclipse Public License v1.0" which accompanies this distribution, 
 and is available at the URL "http://www.eclipse.org/legal/epl-v10.html". -->
 <!-- Initial Contributors:
-	Nokia Corporation - initial contribution.
+    Nokia Corporation - initial contribution.
 Contributors: 
--->  <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd"><concept id="GUID-7B275129-5EF7-4B27-B603-3BDE2C650A93" xml:lang="en"><title>Queries</title><prolog><metadata><keywords></keywords></metadata></prolog><conbody>
+-->
+<!DOCTYPE concept
+  PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
+<concept id="GUID-7B275129-5EF7-4B27-B603-3BDE2C650A93" xml:lang="en"><title>Queries</title><prolog><metadata><keywords/></metadata></prolog><conbody>
 <p>A query is a state where the software waits for user input. Queries are
 used in situations with more than one ways to proceed, when the application
 needs data from the user, or when it is necessary to make sure the user knows
 what is happening. A query must be exited before the application can proceed.</p>
 <p>Queries are displayed in pop-up windows. The following query types can
 be used:</p>
-<ul>
-<li><p><xref href="GUID-48482288-B60B-477A-8E28-132F7CBE2C94.dita">Confirmation
-query</xref>: a question or notice with one or two possible responses. </p></li>
-<li><p><xref href="GUID-13DEE42F-3EAB-4EB7-9CE1-C4930BCACE01.dita">List query</xref>:
-a question with a selection of more than two possible (predefined) responses
-in a list. </p></li>
-<li><p><xref href="GUID-434F2412-59A1-4BCB-885D-5E708EAA6AB6.dita">Grid query</xref>:
-a question with a selection of more than two possible (predefined) responses
-in a grid. </p></li>
-<li><p><xref href="GUID-DAD40CCE-EA59-4DCA-8922-824B18F0387A.dita">Multi-selection
-list query</xref>: presents a list of items; the user can select any number
-of them. </p></li>
-<li><p><xref href="GUID-F77CC49A-904D-486B-8D16-972525EC34D5.dita">Data query</xref>:
-used for numeric or textual input. </p></li>
-<li><p><xref href="GUID-7235E4E9-0046-4BE1-91CF-BD52CE4489DF.dita">Message query</xref>:
-used for various purposes in queries that are longer than one screen.</p></li>
-</ul>
-<section><title>Using queries in C++
-applications</title><p>The APIs to use for queries are the Queries
-API, Dialogs
-API, and the Popups
-API. For implementation information, see Using
-the Dialogs API.</p><p>Query dialogs are dialogs that can be used to
-require user input or user selection. All query dialogs derive from <xref href="jar:GUID-759FBC7F-5384-4487-8457-A8D4B76F6AA6.jar!/html/classCAknQueryDialog.html" format="application/java-archive"><codeph>CAknQueryDialog</codeph></xref>,
-which inherits <xref href="jar:GUID-759FBC7F-5384-4487-8457-A8D4B76F6AA6.jar!/html/classCAknDialog.html" format="application/java-archive"><codeph>CAknDialog</codeph></xref>.
+<table id="GUID-90850312-4A91-46D7-AC86-DC6F1B7E4BA9">
+<tgroup cols="2"><colspec colname="col1" colwidth="0.39*"/><colspec colname="col2" colwidth="1.61*"/>
+<thead>
+<row>
+<entry valign="top"><p>Query types</p></entry>
+<entry valign="top"><p>Description</p></entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry><p>Confirmation query</p></entry>
+<entry><p>A question or notice with one or two possible responses. </p></entry>
+</row>
+<row>
+<entry><p>List query</p></entry>
+<entry><p>A question with a selection of more than two possible (pre-defined)
+responses in a list. </p></entry>
+</row>
+<row>
+<entry><p>Grid query</p></entry>
+<entry><p>A question with a selection of more than two possible (pre-defined)
+responses in a grid.</p></entry>
+</row>
+<row>
+<entry><p>Multi-selection list query</p></entry>
+<entry><p>Presents a list of items; the user can select any number of them. </p></entry>
+</row>
+<row>
+<entry><p>Data query</p></entry>
+<entry><p>Used for numeric or textual input.</p></entry>
+</row>
+<row>
+<entry><p>Message query</p></entry>
+<entry><p>Used for various purposes in queries that are longer than one screen.</p></entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+<section id="GUID-53619735-6F0F-401F-AE62-154EDF75A0C3"><title>Using
+queries in C++ applications</title><p>The APIs to use for queries are the
+Queries API, <xref format="html" href="specs/guides/Dialogs_API_Specification/Dialogs_API_Specification.html" scope="peer">Dialogs API</xref>, and the <xref format="html" href="specs/guides/Popups_API_Specification/Popups_API_Specification.html" scope="peer">Popups API</xref>. For implementation information, see <xref format="html" href="specs/guides/Dialogs_API_Specification/Dialogs_API_Specification.html#Dialogs_API_Specification.topic3" scope="peer">Using the Dialogs API</xref>.</p><p>Query dialogs are dialogs
+that can be used to require user input or user selection. All query dialogs
+derive from <xref href="GUID-DD9C643C-223D-3B70-AEBA-5BF5C5E181ED.dita"><apiname>CAknQueryDialog</apiname></xref>, which inherits <xref href="GUID-FBE5021B-FA5C-3306-B836-601E4BCB11E4.dita"><apiname>CAknDialog</apiname></xref>.
 There are two types of queries: local and global queries. Local query dialogs
 are local to a certain application. That means they are only displayed within
 this application. Global query dialogs are system-wide queries, and are shown
 topmost even when another application moves to the foreground. Query dialogs
-require resource definitions when they are used in your code. </p><note><p>In
-order to have a header pane, the <codeph>AVKON_HEADING</codeph> component
-should be specified as the first dialog line in the resource description.</p></note><p>At
-runtime, the dialog's header pane (<xref href="jar:GUID-759FBC7F-5384-4487-8457-A8D4B76F6AA6.jar!/html/classCAknPopupHeadingPane.html" format="application/java-archive"><codeph>CAknPopupHeadingPane</codeph></xref>) can be obtained by calling the method <xref href="jar:GUID-759FBC7F-5384-4487-8457-A8D4B76F6AA6.jar!/html/classCAknQueryDialog.html#8222b5679180543798d67db49abd4500" format="application/java-archive"><codeph>CAknQueryDialog::QueryHeading()</codeph></xref>.</p><p>The following
-parts are available for modification from the class <xref href="jar:GUID-759FBC7F-5384-4487-8457-A8D4B76F6AA6.jar!/html/classCAknQueryDialog.html" format="application/java-archive"><codeph>CAknQueryDialog</codeph></xref>:</p><ul>
+require resource definitions when they are used in your code. </p><note><p>To
+have a header pane, the <codeph>AVKON_HEADING</codeph> component should be
+specified as the first dialog line in the resource description.</p></note><p>At
+runtime, the dialog's header pane (<xref href="GUID-5FEC2E62-57DB-328C-8E13-4990F9308BF6.dita"><apiname>CAknPopupHeadingPane</apiname></xref>)
+can be obtained by calling the method <xref href="GUID-DD9C643C-223D-3B70-AEBA-5BF5C5E181ED.dita#GUID-DD9C643C-223D-3B70-AEBA-5BF5C5E181ED/GUID-B7AC6A1B-1C68-38AC-8B5F-D6199AA272D4"><apiname>CAknQueryDialog::QueryHeading()</apiname></xref>.</p><p>The
+following parts are available for modification from the class <codeph>CAknQueryDialog</codeph>:</p><ul>
 <li><p>Data query </p><ul>
 <li><p>Header text </p></li>
 <li><p>Header image/animation </p></li>
@@ -65,7 +87,8 @@
 </ul><p>The following example illustrates the resource definition for the
 Secret Editor Query, which contains a Secret Editor, resides inside the dialog.
 The values for flags, type, id, and control are specific to the query dialog.
-These values are enumerated in the file avkon.hrh, which is in the <codeph>./epoc32/include</codeph> folder.</p><codeblock xml:space="preserve">RESOURCE DIALOG r_aknexquery_code_query
+These values are enumerated in the file <codeph>avkon.hrh</codeph>, which
+is in the <codeph>./epoc32/include</codeph> folder.</p><codeblock xml:space="preserve">RESOURCE DIALOG r_aknexquery_code_query
     {
     flags = EGeneralQueryFlags
     buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
@@ -88,6 +111,5 @@
         };
     }
 </codeblock><p>The query in the above example includes a secret editor. For
-information on implementing secret editors, see the Editors
-API.  </p></section>
+information on implementing secret editors, see the <xref format="html" href="specs/guides/Editors_API_Specification/Editors_API_Specification.html" scope="peer">Editors API</xref>.  </p><p><b>See also</b>:</p></section>
 </conbody></concept>
\ No newline at end of file