INTEGRATION: CWS hcshared18 (1.16.8); FILE MERGED

2008/05/28 18:14:57 fpe 1.16.8.5: remove DOCTYPE headers from source files to avoid performance problems in installed help
2008/05/23 11:09:30 ufi 1.16.8.4: building Sol
2008/05/21 09:12:05 ufi 1.16.8.3: vor testbuild
2008/04/18 07:58:29 ufi 1.16.8.2: RESYNC: (1.16-1.17); FILE MERGED
2008/04/18 07:17:09 ufi 1.16.8.1: resyncing

1 files changed, 7 insertions, 5 deletions

diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 9b9a1a7a3b..acde4d61f1 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+
+
 <!--
  ***********************************************************************
  *
@@ -10,7 +12,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: 02010100.xhp,v $
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -62,7 +64,7 @@
 <paragraph role="heading" id="hd_id3153394" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
 <paragraph role="paragraph" id="par_id3156411" xml-lang="en-US" l10n="U" oldref="288"><ahelp hid=".">The <emph>Query Design View </emph>allows you to create and edit a database query.</ahelp></paragraph>
 <section id="howtoget">
-  <embed href="text/shared/00/00000450.xhp#entwab"/>
+<embed href="text/shared/00/00000450.xhp#entwab"/>
 </section>
 <paragraph role="note" id="par_id7024140" xml-lang="en-US" l10n="NEW">Most databases use queries to filter or to sort database tables to display records on your computer. Views offer the same functionality as queries, but on the server side. If your database is on a server that supports views, you can use views to filter the records on the server to speed up the display time.</paragraph>
 <paragraph role="note" id="par_id3159176" xml-lang="en-US" l10n="CHG" oldref="276">Selecting the <emph>Create View</emph> command from the <emph>Tables</emph> tab page of a database document, you see the <emph>View Design</emph> window that resembles the <emph>Query Design</emph> window described here.</paragraph>
@@ -165,7 +167,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
 <switch select="distrib">
 <case select="COMMERCIAL"><paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
-<paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="NEW">If you are working with the Adabas database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
+<paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
 <table id="tbl_id3148461">
 <tablerow>
 <tablecell colspan="" rowspan="">
@@ -262,8 +264,8 @@
 <paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="U" oldref="190">SELECT FUNCTION(column) FROM table.</paragraph>
 <paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="191">For example, the function call in SQL for calculating a sum is:</paragraph>
 <paragraph role="paragraph" id="par_id3154591" xml-lang="en-US" l10n="U" oldref="192">SELECT SUM("Price") FROM "Article".</paragraph>
-<paragraph role="paragraph" id="par_id3159205" xml-lang="en-US" l10n="U" oldref="176">Except for the <emph>Group</emph> function, the above functions are so-called Aggregate functions. These are functions that calculate data to create summaries from the results. Additional functions that are not listed in the list box are also possible. These depend on the specific database system in use. To get information about driver specific functions refer to the documentation of your database system.</paragraph>
-<paragraph role="paragraph" id="par_id3148651" xml-lang="en-US" l10n="U" oldref="177">To use other functions not listed in the list box, you must enter them under <emph>Field</emph>. They will then appear automatically in the <emph>Function</emph> line.</paragraph>
+<paragraph role="paragraph" id="par_id3159205" xml-lang="en-US" l10n="CHG" oldref="176">Except for the <emph>Group</emph> function, the above functions are so-called Aggregate functions. These are functions that calculate data to create summaries from the results. Additional functions that are not listed in the list box might be also possible. These depend on the specific database system in use and on the current state of the Base driver.</paragraph>
+<paragraph role="paragraph" id="par_id3148651" xml-lang="en-US" l10n="CHG" oldref="177">To use other functions not listed in the list box, you must enter them under <emph>Field</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3155098" xml-lang="en-US" l10n="U" oldref="178">You can also assign aliases to function calls. If the query is not to be displayed in the column header, enter the desired name under <emph>Alias</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="199">The corresponding function in an SQL statement is:</paragraph>
 <paragraph role="paragraph" id="par_id3149425" xml-lang="en-US" l10n="U" oldref="200">SELECT FUNCTION() AS alias FROM table</paragraph>