INTEGRATION: CWS hc680fin (1.3.2); FILE MERGED

2005/11/23 08:31:25 ufi 1.3.2.1: *** empty log message ***

1 files changed, 49 insertions, 34 deletions

diff --git a/helpcontent2/source/text/shared/explorer/database/11000002.xhp b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
index 41c1cf867e..8bfe581540 100644
--- a/helpcontent2/source/text/shared/explorer/database/11000002.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/11000002.xhp
@@ -1,36 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
  *
- *  $RCSfile: 11000002.xhp,v $
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
  *
- *  $Revision: 1.3 $
+ *  Sun Microsystems Inc., October, 2000
  *
- *  last change: $Author: kz $ $Date: 2005-10-05 13:40:36 $
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
  *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
  *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
  *
  ************************************************************************-->
 	
@@ -42,29 +62,24 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-05-30T14:41:34">FPE: Removed mentioning of Adabas (#i10510#)</lastedited>
+<lastedited date="2005-11-18T15:43:09">FPE: Removed mentioning of Adabas (#i10510#)</lastedited>
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155449"><bookmark_value>databases;drag and drop</bookmark_value>
-</bookmark>
 <paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="93"><link href="text/shared/explorer/database/11000002.xhp" name="Data sources in $[officename]">Data sources in $[officename]</link></paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="94">You can register a database with $[officename] and then insert records from the database into a document.</paragraph>
 <section id="adressbuch">
 <paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="2" l10n="U" oldref="49">Selecting the Address Book</paragraph>
 <embed href="text/shared/guide/data_addressbook.xhp#adressbuch"/>
 <paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="101">To select the address book that you want to use, choose <link href="text/shared/01/01110101.xhp" name="File - Templates - Address Book Source"><emph>File - Templates - Address Book Source</emph></link>.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="26">Opening a Data Source</paragraph>
+<list type="unordered">
+<listitem>
 <paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="102">To open the data source view, press F4 in a text, spreadsheet or form document.</paragraph>
-<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="11">To view the contents of a database, click the plus sign (+) in front it name in the data source view.</paragraph>
-<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="U" oldref="28">Copying and Moving Database Objects</paragraph>
-<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="14">In the data source view, you can copy database objects by drag and drop, even within the same database.</paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="100">To quickly add a record from a table cell in a $[officename] Writer document, an HTML document or from $[officename] Calc, select the cell, and then drag it into a database table in data source view. You can also drag a record from a database table into a document.</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="52">To move a database object, hold down Shift while you drag.</paragraph>
-<paragraph role="note" id="par_id3147559" xml-lang="en-US" l10n="CHG" oldref="53">Field naming conventions are different for different database types. For example, in dBase tables, field names can only be 10 characters long.</paragraph>
-<paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="3" l10n="U" oldref="40">Copying database queries</paragraph>
-<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="31">To create a new query that is similar to an existing one, simply drag the existing query onto the Queries container in the data source view.</paragraph>
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="34">If you drag the query onto a table container, the query is treated as a table.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="11">To view the contents of a database, click the plus sign (+) in front of the name in the data source view.</paragraph>
+</listitem>
+</list>
 </body>
 </helpdocument>