From 1f9f48080652e39aa440a7aca00dafeabe6a2f49 Mon Sep 17 00:00:00 2001
From: Uwe Fischer <ufi@openoffice.org>
Date: Wed, 26 May 2010 14:14:35 +0200
Subject: hcshared26: before rebase

---
 .../text/shared/explorer/database/dabaadvpropdat.xhp      | 15 ++++++++++-----
 .../source/text/shared/explorer/database/rep_main.xhp     |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'helpcontent2/source/text/shared/explorer')

diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 15a408ea00..8c19978ba7 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
          <title xml-lang="en-US" id="tit">Special Settings</title>
@@ -49,7 +49,12 @@
       <paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+
+      <paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
+
+
+      <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id6151921" role="paragraph" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index 05116569b5..b84166e319 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -73,6 +73,9 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id208136" role="paragraph" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
+         </listitem>
+	          <listitem>
+            <paragraph xml-lang="en-US" id="par_id20813699" role="paragraph" l10n="NEW">Restart %PRODUCTNAME. If the Quickstarter is running, also close the Quickstarter.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
-- 
cgit