AllLangHelp_sdatabase.mk | 3 AllLangHelp_shared.mk | 3 source/text/sdatabase/dabawiz00.xhp | 21 -- source/text/sdatabase/dabawiz01.xhp | 4 source/text/sdatabase/dabawiz03auth.xhp | 16 - source/text/sdatabase/main.xhp | 17 -- source/text/shared/01/01010000.xhp | 82 +++++----- source/text/shared/explorer/database/dabawiz02.xhp | 19 -- source/text/shared/explorer/database/dabawiz02access.xhp | 17 -- source/text/shared/explorer/database/dabawiz02ado.xhp | 24 +- source/text/shared/explorer/database/dabawiz02dbase.xhp | 16 - source/text/shared/explorer/database/dabawiz02jdbc.xhp | 31 +-- source/text/shared/explorer/database/dabawiz02mysql.xhp | 4 source/text/shared/explorer/database/dabawiz02odbc.xhp | 20 -- source/text/shared/explorer/database/dabawiz02oracle.xhp | 21 +- source/text/shared/explorer/database/dabawiz02spreadsheet.xhp | 16 - source/text/shared/explorer/database/dabawiz02text.xhp | 25 +-- source/text/shared/guide/data_im_export.xhp | 25 +-- source/text/shared/guide/data_new.xhp | 9 - 19 files changed, 161 insertions(+), 212 deletions(-)
New commits: commit 6ad6a7c10c2684a5fbdac4bea643a215c3bcb8ab Author: Olivier Hallot <[email protected]> AuthorDate: Sat Oct 2 13:50:24 2021 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Sat Oct 2 18:54:24 2021 +0200 Refactor database wizard help pages (part) Change-Id: Ifcd63a48ca5faa3fa55f19f2949cccc4bd4ccaf3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123002 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index 23346f8c9..e0c62d192 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -53,6 +53,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ helpcontent2/source/text/sdatabase/dabapropadd \ helpcontent2/source/text/sdatabase/dabapropcon \ helpcontent2/source/text/sdatabase/dabapropgen \ + helpcontent2/source/text/sdatabase/dabawiz00 \ + helpcontent2/source/text/sdatabase/dabawiz01 \ + helpcontent2/source/text/sdatabase/dabawiz03auth \ )) # vim: set noet sw=4 ts=4: diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 48266a686..ef2c1eb44 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -868,8 +868,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ )) $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ - helpcontent2/source/text/shared/explorer/database/dabawiz00 \ - helpcontent2/source/text/shared/explorer/database/dabawiz01 \ helpcontent2/source/text/shared/explorer/database/dabawiz02 \ helpcontent2/source/text/shared/explorer/database/dabawiz02access \ helpcontent2/source/text/shared/explorer/database/dabawiz02ado \ @@ -880,7 +878,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \ helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \ helpcontent2/source/text/shared/explorer/database/dabawiz02text \ - helpcontent2/source/text/shared/explorer/database/dabawiz03auth \ helpcontent2/source/text/shared/explorer/database/menubar \ helpcontent2/source/text/shared/explorer/database/menuedit \ helpcontent2/source/text/shared/explorer/database/menufile \ diff --git a/source/text/shared/explorer/database/dabawiz00.xhp b/source/text/sdatabase/dabawiz00.xhp similarity index 84% rename from source/text/shared/explorer/database/dabawiz00.xhp rename to source/text/sdatabase/dabawiz00.xhp index bb1cb6d64..bbb1492b7 100644 --- a/source/text/shared/explorer/database/dabawiz00.xhp +++ b/source/text/sdatabase/dabawiz00.xhp @@ -23,37 +23,32 @@ <meta> <topic id="textsharedexplorerdatabasedabawiz00xml" indexer="include"> <title id="tit" xml-lang="en-US">Database Wizard</title> -<filename>/text/shared/explorer/database/dabawiz00.xhp</filename> +<filename>/text/sdatabase/dabawiz00.xhp</filename> </topic> </meta> <body> <section id="dabawiz00"> -<bookmark xml-lang="en-US" branch="index" id="bm_id2026429"><bookmark_value>wizards;databases (Base)</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id2026429"> +<bookmark_value>wizards;databases (Base)</bookmark_value> <bookmark_value>Database Wizard (Base)</bookmark_value> <bookmark_value>databases; formats (Base)</bookmark_value> <bookmark_value>MySQL databases (Base)</bookmark_value> <bookmark_value>MariaDB databases (Base)</bookmark_value> <bookmark_value>dBASE; database settings (Base)</bookmark_value> +<bookmark_value>jdbc; database settings (Base)</bookmark_value> +<bookmark_value>odbc; database settings (Base)</bookmark_value> <bookmark_value>spreadsheets;as databases (base)</bookmark_value> </bookmark><comment>mw added "(Base)" to all entries</comment> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/PageGeneral" id="bm_id3952452" localize="false"/> -<h1 id="par_idN105B4"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></h1> -<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid="." visibility="hidden">The Database Wizard creates a database file that contains information about a database.</ahelp><comment>UFI: extended help text must no longer contain switches or links</comment></paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/@@nowidget@@" id="bm_id4952452" localize="false"/> +<h1 id="par_idN105B4"><variable id="databasewizardh1"><link href="text/sdatabase/dabawiz00.xhp">Database Wizard</link></variable></h1> <paragraph role="paragraph" id="par_id9856563" xml-lang="en-US">The Database Wizard creates a <link href="text/sdatabase/dabadoc.xhp">database file</link> that contains information about a database.</paragraph> </section> <paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US">Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps.</paragraph> -<list type="unordered"> -<listitem> <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US">If you create a new database file, the wizard contains two steps.</paragraph> -</listitem> -</list> -<embed href="text/shared/explorer/database/dabawiz01.xhp#dabaselection"/> +<embed href="text/sdatabase/dabawiz01.xhp#dabaselection"/> <embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/> -<list type="unordered"> -<listitem> <paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph> -</listitem> -</list> <paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file connection</link></paragraph> <switch select="sys"> <case select="WIN"> diff --git a/source/text/shared/explorer/database/dabawiz01.xhp b/source/text/sdatabase/dabawiz01.xhp similarity index 96% rename from source/text/shared/explorer/database/dabawiz01.xhp rename to source/text/sdatabase/dabawiz01.xhp index eae608cda..a6e22814a 100644 --- a/source/text/shared/explorer/database/dabawiz01.xhp +++ b/source/text/sdatabase/dabawiz01.xhp @@ -23,14 +23,14 @@ <meta> <topic id="textsharedexplorerdatabasedabawiz01xml" indexer="include"> <title id="tit" xml-lang="en-US">Database Selection</title> -<filename>/text/shared/explorer/database/dabawiz01.xhp</filename> +<filename>/text/sdatabase/dabawiz01.xhp</filename> </topic> </meta> <body> <section id="dabaselection"> <bookmark xml-lang="en-US" branch="index" id="bm_id2082583"><bookmark_value>databases; connecting (Base)</bookmark_value> </bookmark> -<h1 id="par_idN1054D"><link href="text/shared/explorer/database/dabawiz01.xhp">Select Database</link></h1> +<h1 id="par_idN1054D"><variable id="databaseselectionh1"><link href="text/sdatabase/dabawiz01.xhp">Select Database</link></variable></h1> <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Creates a new database, opens a database file, or connects to an existing database.</ahelp></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/generalpagewizard/createDatabase" id="bm_id2482985" localize="false"/> diff --git a/source/text/shared/explorer/database/dabawiz03auth.xhp b/source/text/sdatabase/dabawiz03auth.xhp similarity index 78% rename from source/text/shared/explorer/database/dabawiz03auth.xhp rename to source/text/sdatabase/dabawiz03auth.xhp index 252abd466..6be455599 100644 --- a/source/text/shared/explorer/database/dabawiz03auth.xhp +++ b/source/text/sdatabase/dabawiz03auth.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,31 +16,29 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz03authxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Set up user authentication</title> -<filename>/text/shared/explorer/database/dabawiz03auth.xhp</filename> +<filename>/text/sdatabase/dabawiz03auth.xhp</filename> </topic> <history> <created date="2004-07-28T16:40:10">UFI: Database Wizard Authentication page</created> </history> </meta> <body> -<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1">Set up user authentication</paragraph> +<h1 id="par_idN1053A">Set up user authentication</h1> <paragraph role="paragraph" id="par_idN1053E" xml-lang="en-US">Some databases require a user name and password.</paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/generalUserNameEntry" id="bm_id5520493" localize="false"/> -<paragraph role="heading" id="par_idN10541" xml-lang="en-US" level="2">User name</paragraph> +<h2 id="par_idN10541">User name</h2> <paragraph role="paragraph" id="par_idN10545" xml-lang="en-US"><ahelp hid=".">Enter the user name to access the database.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/passRequiredCheckbutton" id="bm_id6467787" localize="false"/> -<paragraph role="heading" id="par_idN10548" xml-lang="en-US" level="3">Password required</paragraph> +<h3 id="par_idN10548">Password required</h3> <paragraph role="paragraph" id="par_idN1054C" xml-lang="en-US"><ahelp hid=".">Select to prompt a user for a password to access the database.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/authentificationpage/testConnectionButton" id="bm_id6467788" localize="false"/> -<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="3">Test Connection</paragraph> +<h3 id="par_idN10549">Test Connection</h3> <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US"><ahelp hid=".">Check if the configured connection can be used to access the database.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></paragraph> -<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp index 2925265dc..806e88419 100644 --- a/source/text/sdatabase/main.xhp +++ b/source/text/sdatabase/main.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -19,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasemainxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">%PRODUCTNAME Database</title> @@ -33,8 +28,8 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id8622089"><bookmark_value>databases;main page (Base)</bookmark_value> <bookmark_value>$[officename] Base data sources</bookmark_value> <bookmark_value>data sources;$[officename] Base</bookmark_value> -</bookmark><comment>mw changed "Base,..."</comment><paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="1"><variable id="base"><link href="text/sdatabase/main.xhp">Using Databases in %PRODUCTNAME Base</link> -</variable></paragraph> +</bookmark><comment>mw changed "Base,..."</comment><h1 id="par_idN10579"><variable id="base"><link href="text/sdatabase/main.xhp">Using Databases in %PRODUCTNAME Base</link> +</variable></h1> <embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <paragraph role="paragraph" id="par_idN107BD" xml-lang="en-US">In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle.</paragraph> </section> @@ -50,14 +45,14 @@ <paragraph role="paragraph" id="par_id6747337" xml-lang="en-US">Address book data</paragraph> </listitem> </list> -<paragraph role="heading" id="par_idN107C0" xml-lang="en-US" level="2">Using a Database in %PRODUCTNAME</paragraph> +<h2 id="par_idN107C0">Using a Database in %PRODUCTNAME</h2> <list type="unordered"> <listitem> <paragraph role="paragraph" id="par_idN10838" xml-lang="en-US">To create a new database file, choose <emph>File - New - Database</emph>.</paragraph> </listitem> </list> -<paragraph role="paragraph" id="par_idN1083B" xml-lang="en-US">The <link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME.</paragraph> -<paragraph role="note" id="par_idN107E7" xml-lang="en-US">The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file.</paragraph> +<paragraph role="paragraph" id="par_idN1083B" xml-lang="en-US">The <link href="text/sdatabase/dabawiz01.xhp">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME.</paragraph> +<note id="par_idN107E7">The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file.</note> <list type="unordered"> <listitem> <paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US">To open a database file, choose <emph>File - Open</emph>. In the <emph>File type</emph> list box, select to view only "Database documents". Select a database document and click <emph>Open</emph>.</paragraph> diff --git a/source/text/shared/01/01010000.xhp b/source/text/shared/01/01010000.xhp index fb357cdd5..ae3aac364 100644 --- a/source/text/shared/01/01010000.xhp +++ b/source/text/shared/01/01010000.xhp @@ -30,7 +30,7 @@ <body> <section id="new"> <bookmark xml-lang="en-US" branch="hid/.uno:AddDirect" id="bm_id8961193" localize="false"/> -<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="1"><link href="text/shared/01/01010000.xhp" name="New">New</link></paragraph> +<h1 id="hd_id3154788"><link href="text/shared/01/01010000.xhp" name="New">New</link></h1> <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US"><ahelp hid=".uno:AddDirect">Creates a new $[officename] document.</ahelp></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/SFX2_HID_TBXCONTROL_FILENEW" id="bm_id3153748" localize="false"/> @@ -43,145 +43,145 @@ <paragraph role="paragraph" id="par_id3147009" xml-lang="en-US">A template is a file that contains the design elements for a document, including formatting styles, backgrounds, frames, graphics, fields, page layout, and text.</paragraph> <table id="tbl_id3149398"> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3147242" xml-lang="en-US"><emph>Icon</emph></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3149580" xml-lang="en-US"><emph>Name</emph></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3153258" xml-lang="en-US"><emph>Function</emph></paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3145317" xml-lang="en-US"><image id="img_id3153821" src="res/sx03251.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153821" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3153349" xml-lang="en-US">Text Document</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3156153" xml-lang="en-US">Creates a new text document in $[officename] Writer.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3145121" xml-lang="en-US"><image id="img_id3150503" src="res/sx03250.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">Spreadsheet</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154280" xml-lang="en-US">Creates a new spreadsheet document in $[officename] Calc.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3149456" xml-lang="en-US"><image id="img_id3148663" src="res/sx03249.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148663" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3153798" xml-lang="en-US">Presentation</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154946" xml-lang="en-US">Creates a new presentation document in $[officename] Impress.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3150495" xml-lang="en-US"><image id="img_id3154329" src="res/sx03246.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154329" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154217" xml-lang="en-US">Drawing</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3149167" xml-lang="en-US">Creates a new drawing document in $[officename] Draw.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_idN1089C" xml-lang="en-US"><image id="Graphic3" src="res/sx03245.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_idN108CB" xml-lang="en-US">Database</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> - <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US">Opens the <link href="text/shared/explorer/database/dabawiz00.xhp"><emph>Database Wizard</emph></link> to create a <link href="text/sdatabase/dabadoc.xhp"><emph>database file</emph></link>.</paragraph> + <tablecell> + <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US">Opens the <link href="text/sdatabase/dabawiz01.xhp"><emph>Database Wizard</emph></link> to create a <link href="text/sdatabase/dabadoc.xhp"><emph>database file</emph></link>.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3159149" xml-lang="en-US"><image id="img_id3150868" src="res/sx03139.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150868" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154298" xml-lang="en-US">HTML Document</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3152460" xml-lang="en-US">Creates a new HTML document.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_idN107BF" xml-lang="en-US"><image id="Graphic2" src="res/sx03251.png" width="0.222inch" height="0.222inch"><alt id="alt_" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_idN107F0" xml-lang="en-US">XML Form Document</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_idN107F5" xml-lang="en-US">Creates a new <link href="text/shared/guide/xforms.xhp">XForms</link> document.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3147426" xml-lang="en-US"><image id="img_id3163710" src="res/sx03248.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163710" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US">Master Document</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3150961" xml-lang="en-US">Creates a new <link href="text/shared/01/01010001.xhp" name="master document">master document</link>.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3155854" xml-lang="en-US"><image id="img_id3147317" src="res/sx03247.png" width="0.222inch" height="0.222inch"><alt id="alt_id3147317" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3155511" xml-lang="en-US">Formula</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3150872" xml-lang="en-US">Creates a new formula document in $[officename] Math.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154145" xml-lang="en-US"><image id="img_id3083443" src="res/sx03255.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083443" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3149417" xml-lang="en-US">Labels</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3148388" xml-lang="en-US">Opens the <link href="text/shared/01/01010200.xhp" name="Labels"><emph>Labels</emph></link> dialog where you can set the options for your labels, and then creates a new text document for the labels in $[officename] Writer.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3155415" xml-lang="en-US"><image id="img_id3156283" src="res/sx03255.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156283" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3150592" xml-lang="en-US">Business Cards</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3150968" xml-lang="en-US">Opens the <link href="text/shared/01/01010300.xhp" name="Business Cards"><emph>Business Cards</emph></link> dialog where you can set the options for your business cards, and then creates a new text document in $[officename] Writer.</paragraph> </tablecell> </tablerow> <tablerow> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154729" xml-lang="en-US"><image id="img_id3150422" src="res/sx03242.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150422" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3154510" xml-lang="en-US">Templates</paragraph> </tablecell> - <tablecell colspan="" rowspan=""> + <tablecell> <paragraph role="paragraph" id="par_id3155603" xml-lang="en-US">Creates a new document using an existing template.</paragraph> </tablecell> </tablerow> diff --git a/source/text/shared/explorer/database/dabawiz02.xhp b/source/text/shared/explorer/database/dabawiz02.xhp index c53d531a9..956e0d72e 100644 --- a/source/text/shared/explorer/database/dabawiz02.xhp +++ b/source/text/shared/explorer/database/dabawiz02.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -19,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02xml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Save and proceed</title> @@ -31,17 +26,17 @@ <body> <section id="nextsteps"> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/PageFinal" id="bm_id9310280" localize="false"/> -<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></paragraph> +<h1 id="par_idN10544"><link href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></h1> <paragraph role="paragraph" id="par_idN10554" xml-lang="en-US"><ahelp hid=".">Specifies whether you want to register the database, open the database for editing, or insert a new table.</ahelp></paragraph> </section> -<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/yesregister" id="bm_id9310281" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2">Yes, register the Database for me</paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/yesregister" id="bm_id9310281" localize="false"/><h2 id="par_idN10557">Yes, register the Database for me</h2> <paragraph role="paragraph" id="par_idN105B4" xml-lang="en-US"><ahelp hid=".">Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the <emph>View - Data Sources</emph> window. You must register a database to be able to insert the database fields in a document (Insert - Field - More Fields) or in a mail merge.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/noregister" id="bm_id8243354" localize="false"/><paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2">No, do not register the database</paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/noregister" id="bm_id8243354" localize="false"/><h2 id="par_idN105B7">No, do not register the database</h2> <paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US"><ahelp hid=".">Select to keep the database information only within the created database file.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/openediting" id="bm_id971404" localize="false"/><paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="2">Open the database for editing</paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/openediting" id="bm_id971404" localize="false"/><h2 id="par_idN1055B">Open the database for editing</h2> <paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US"><ahelp hid=".">Select to display the database file, where you can edit the database structure.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/usewizard" id="bm_id1763359" localize="false"/><paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2">Create tables using the table wizard</paragraph> +<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/usewizard" id="bm_id1763359" localize="false"/><h2 id="par_idN1055F">Create tables using the table wizard</h2> <paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"><ahelp hid=".">Select to call the <link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link> after the Database Wizard is finished.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02access.xhp b/source/text/shared/explorer/database/dabawiz02access.xhp index 38ba9b3df..b02a147a0 100644 --- a/source/text/shared/explorer/database/dabawiz02access.xhp +++ b/source/text/shared/explorer/database/dabawiz02access.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -19,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02accessxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Microsoft Access Connection</title> @@ -31,14 +26,14 @@ <body> <bookmark xml-lang="en-US" branch="index" id="bm_id2755516"><bookmark_value>Access databases (base)</bookmark_value> <bookmark_value>Microsoft Office;Access databases (base)</bookmark_value> -</bookmark><comment>mw added 2 new index entries</comment><paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1"><variable id="access"><link href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access Connection</link> -</variable></paragraph> +</bookmark><comment>mw added 2 new index entries</comment><h1 id="par_idN1053D"><variable id="access"><link href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access Connection</link> +</variable></h1> <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph> <paragraph role="paragraph" id="par_id1142772" xml-lang="en-US">See also the English Wiki page <link href="https://wiki.documentfoundation.org/MSA-Base_Faq"; name="wiki.documentfoundation.org MS Access Base FAQ">https://wiki.documentfoundation.org/MSA-Base_Faq</link>.</paragraph> -<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2">Microsoft Access database file</paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><h2 id="par_idN10544">Microsoft Access database file</h2> <paragraph role="paragraph" id="par_idN10548" xml-lang="en-US"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2">Browse</paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><h2 id="par_idN1054B">Browse</h2> <paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02ado.xhp b/source/text/shared/explorer/database/dabawiz02ado.xhp index d6a449982..467807719 100644 --- a/source/text/shared/explorer/database/dabawiz02ado.xhp +++ b/source/text/shared/explorer/database/dabawiz02ado.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,8 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02adoxml" indexer="include" status="PUBLISH"> @@ -35,15 +31,15 @@ <bookmark_value>MS ADO interface (Base)</bookmark_value> <bookmark_value>databases;ADO (Base)</bookmark_value> </bookmark><comment>mw copied 3 index entries from shared/explorer/database/1116000.xhp</comment> -<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1"><variable id="ado"><link href="text/shared/explorer/database/dabawiz02ado.xhp">ADO Connection</link> -</variable></paragraph> +<h1 id="par_idN1054C"><variable id="ado"><link href="text/shared/explorer/database/dabawiz02ado.xhp">ADO Connection</link> +</variable></h1> <paragraph role="paragraph" id="par_idN10550" xml-lang="en-US"><ahelp hid=".">Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.</ahelp><comment>UFI: copied text from shared\explorer\database\11160000</comment></paragraph> -<paragraph role="note" id="par_idN10565" xml-lang="en-US">The ADO interface is a Microsoft Windows proprietary container for connecting to databases.</paragraph> -<paragraph role="tip" id="par_idN10568" xml-lang="en-US">$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default.</paragraph> +<note id="par_idN10565">The ADO interface is a Microsoft Windows proprietary container for connecting to databases.</note> +<tip id="par_idN10568">$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default.</tip> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL" id="bm_id2960600" localize="false"/> -<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2">Data source URL</paragraph> +<h2 id="par_idN1056B">Data source URL</h2> <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"><ahelp hid=".">Enter the data source URL.</ahelp><comment>UFI: removed three lines in hcshared01 #58442</comment></paragraph> -<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3">Example URLs</paragraph> +<h3 id="par_idN10572">Example URLs</h3> <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US">To connect to an Access 2000 file, use the format:</paragraph> <paragraph role="example" id="par_idN10579" xml-lang="en-US">PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=c:\Access\nwind2000.mdb</paragraph> <paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US">To connect with a name to a catalog on a Microsoft SQL server that has a name turner, enter:</paragraph> @@ -51,10 +47,10 @@ <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US">To access an ODBC driver as a provider:</paragraph> <paragraph role="example" id="par_idN10585" xml-lang="en-US">DSN=SQLSERVER</paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL" id="bm_id7212439" localize="false"/> -<paragraph role="heading" id="par_idN10588" xml-lang="en-US" level="2">Browse</paragraph> +<h2 id="par_idN10588">Browse</h2> <paragraph role="paragraph" id="par_idN1058C" xml-lang="en-US"><ahelp hid=".">Click to open a database selection dialog.</ahelp></paragraph> -<paragraph role="note" id="par_idN10596" xml-lang="en-US">A user name can have a maximum of 18 characters.</paragraph> -<paragraph role="note" id="par_idN10599" xml-lang="en-US">A password must contain 3 to 18 characters.</paragraph> -<paragraph role="paragraph" id="par_idN1059C" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<note id="par_idN10596">A user name can have a maximum of 18 characters.</note> +<note id="par_idN10599">A password must contain 3 to 18 characters.</note> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02dbase.xhp b/source/text/shared/explorer/database/dabawiz02dbase.xhp index b515f3221..2a55dcc32 100644 --- a/source/text/shared/explorer/database/dabawiz02dbase.xhp +++ b/source/text/shared/explorer/database/dabawiz02dbase.xhp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- * This file is part of the LibreOffice project. * @@ -18,8 +18,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - + + <meta> <topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include"> <title id="tit" xml-lang="en-US">dBASE Connection </title> @@ -27,14 +27,14 @@ </topic> </meta> <body><comment>** Expression is faulty **</comment> -<paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="1"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link> -</variable></paragraph> +<h1 id="par_idN1054A"><variable id="dbase"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link> +</variable></h1> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" id="bm_id2821131" localize="false"/> -<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Path to the dBASE files</paragraph> +<h2 id="par_idN10556">Path to the dBASE files</h2> <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid=".">Enter the path to the dBASE *.dbf files.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" id="bm_id9754631" localize="false"/> -<paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="2">Browse</paragraph> +<h2 id="par_idN10571">Browse</h2> <paragraph role="paragraph" id="par_idN10575" xml-lang="en-US"><ahelp hid=".">Open a path selection dialog.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/source/text/shared/explorer/database/dabawiz02jdbc.xhp index ee9bbbde5..88b080463 100644 --- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp +++ b/source/text/shared/explorer/database/dabawiz02jdbc.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -19,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02jdbcxml" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">JDBC Connection</title> @@ -33,14 +28,14 @@ <bookmark_value>databases; JDBC (Base)</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/JDBCConnectionPage" id="bm_id6293219" localize="false"/> -<paragraph role="heading" id="par_idN105FC" xml-lang="en-US" level="1"><variable id="jdbc"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link> -</variable></paragraph> +<h1 id="par_idN105FC"><variable id="jdbc"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link> +</variable></h1> <paragraph role="paragraph" id="par_idN10600" xml-lang="en-US"><ahelp hid=".">Specifies the options to access a <link href="text/shared/00/00000005.xhp#jdbc" name="JDBC">JDBC</link> database.</ahelp><comment>copied text from shared\explorer\database\11110000</comment></paragraph> -<paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2">JDBC Examples</paragraph> +<h2 id="par_idN10623">JDBC Examples</h2> <paragraph role="paragraph" id="par_idN10627" xml-lang="en-US"> <item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph> -<paragraph role="note" id="par_idN1062D" xml-lang="en-US">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>.</paragraph> -<paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3">Oracle database</paragraph> +<note id="par_idN1062D">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>.</note> +<h3 id="par_idN10634">Oracle database</h3> <paragraph role="paragraph" id="par_idN10638" xml-lang="en-US">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph> <switch select="sys"> <case select="UNIX"><paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US">On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version from the Oracle web site.</paragraph> @@ -60,7 +55,7 @@ <paragraph role="listitem" id="par_idN1067C" xml-lang="en-US">database_name is the name of the Oracle database. Ask your database administrator for the correct name.</paragraph> </listitem> </list> -<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" id="bm_id3033539" localize="false"/><paragraph role="heading" id="par_idN1067F" xml-lang="en-US" level="3">MySQL database</paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" id="bm_id3033539" localize="false"/><h3 id="par_idN1067F">MySQL database</h3> <paragraph role="paragraph" id="par_idN10683" xml-lang="en-US">The driver for the MySQL database is available on the MySQL web site.<comment>removed link, see i54077</comment></paragraph> <paragraph role="paragraph" id="par_idN10689" xml-lang="en-US">The syntax for a MySQL database is:</paragraph> <paragraph role="example" id="par_idN1068C" xml-lang="en-US">mysql://hostname:port/database_name</paragraph> @@ -76,19 +71,19 @@ </listitem> </list> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/browseurl" id="bm_id6293221" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><paragraph role="heading" id="par_idN106A0" xml-lang="en-US" level="2">Data source URL</paragraph> +<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" id="bm_id3450117" localize="false"/><h2 id="par_idN106A0">Data source URL</h2> <paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US"><ahelp hid=".">Enter the URL for the database. For example, for the MySQL JDBC driver, enter "mysql://<Servername>/<name of the database>". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/connectionpage/javaDriverLabel" id="bm_id3153970" localize="false"/> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/jdbcEntry" id="bm_id3153969" localize="false"/> -<paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2">JDBC Driver Class</paragraph> +<h2 id="par_idN106BB">JDBC Driver Class</h2> <paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver.</ahelp></paragraph> <section id="classpath"> - <paragraph role="warning" id="par_id7953733" xml-lang="en-US">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>, and click the <widget>Class Path</widget> button. After you add the path information, restart %PRODUCTNAME.</paragraph> + <warning id="par_id7953733">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>, and click the <widget>Class Path</widget> button. After you add the path information, restart %PRODUCTNAME.</warning> </section> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/jdbcconnectionpage/jdbcButton" id="bm_id3153971" localize="false"/> -<paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2">Test Class</paragraph> +<h2 id="par_idN106CE">Test Class</h2> <paragraph role="paragraph" id="par_idN106E4" xml-lang="en-US"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" id="par_idN106E7" xml-lang="en-US"><link href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02mysql.xhp b/source/text/shared/explorer/database/dabawiz02mysql.xhp index 940ec5c04..83f8cc05b 100644 --- a/source/text/shared/explorer/database/dabawiz02mysql.xhp +++ b/source/text/shared/explorer/database/dabawiz02mysql.xhp @@ -67,7 +67,7 @@ <paragraph role="paragraph" id="par_idN10570" xml-lang="en-US">The next wizard page depends on your choice of ODBC or JDBC:</paragraph> <paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC Connection</link></paragraph> <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link></paragraph> -<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US"><link href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02odbc.xhp b/source/text/shared/explorer/database/dabawiz02odbc.xhp index c45a10f59..3efc70cc5 100644 --- a/source/text/shared/explorer/database/dabawiz02odbc.xhp +++ b/source/text/shared/explorer/database/dabawiz02odbc.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,8 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02odbcxml" indexer="include" status="PUBLISH"> @@ -34,22 +30,22 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3149031"><bookmark_value>ODBC;database (Base)</bookmark_value> <bookmark_value>databases;ODBC (Base)</bookmark_value> </bookmark><comment>mw added "(Base)" to all entries</comment> -<paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1"><variable id="odbc"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC Connection</link> -</variable></paragraph> +<h1 id="par_idN1053D"><variable id="odbc"><link href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC Connection</link> +</variable></h1> <paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp hid=".">Specifies the settings for <link href="text/shared/00/00000005.xhp#odbc" name="ODBC">ODBC</link> databases.</ahelp></paragraph> <paragraph role="paragraph" id="par_id8856776" xml-lang="en-US">To edit or add records to a database table in $[officename], the table must have a unique index field.</paragraph> <paragraph role="paragraph" id="par_id8034302" xml-lang="en-US">On Solaris and Linux platforms, try to use a JDBC driver instead of an ODBC driver. See http://www.unixodbc.org for an ODBC implementation on Solaris or Linux.</paragraph> <paragraph role="paragraph" id="par_id8560136" xml-lang="en-US">To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC.</paragraph> -<paragraph role="note" id="par_id2082583" xml-lang="en-US">Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard.</paragraph> +<note id="par_id2082583">Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard.</note> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE" id="bm_id9201025" localize="false"/> -<paragraph role="heading" id="par_idN10552" xml-lang="en-US" level="2">Name of the ODBC database</paragraph> +<h2 id="par_idN10552">Name of the ODBC database</h2> <paragraph role="paragraph" id="par_idN10556" xml-lang="en-US"><ahelp hid=".">Enter the path to the database file.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE" id="bm_id5588549" localize="false"/> -<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2">Browse</paragraph> +<h2 id="par_idN10559">Browse</h2> <paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Click to open an ODBC data source selection dialog:</ahelp></paragraph> -<paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="3">Choose a data source</paragraph> +<h3 id="par_idN10560">Choose a data source</h3> <paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US"><link href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02oracle.xhp b/source/text/shared/explorer/database/dabawiz02oracle.xhp index 8911c77c2..c098bbb12 100644 --- a/source/text/shared/explorer/database/dabawiz02oracle.xhp +++ b/source/text/shared/explorer/database/dabawiz02oracle.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02oraclexml" indexer="include" status="PUBLISH"> @@ -33,9 +30,9 @@ <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/SpecialJDBCConnectionPage" id="bm_id7325353" localize="false"/> <bookmark xml-lang="en-US" branch="index" id="bm_id5900753"><bookmark_value>Oracle databases (base)</bookmark_value> </bookmark><comment>mw added one index entry</comment> -<paragraph role="heading" id="par_idN105A4" xml-lang="en-US" level="1">Oracle Database Connection</paragraph> +<h1 id="par_idN105A4">Oracle Database Connection</h1> <paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US"><ahelp hid=".">Specifies the options to access an Oracle database.</ahelp><comment>copied text from shared\explorer\database\11110000</comment></paragraph> -<paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2">Oracle database</paragraph> +<h2 id="par_idN105BD">Oracle database</h2> <paragraph role="paragraph" id="par_idN105C1" xml-lang="en-US">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph> <switch select="sys"> <case select="UNIX"> @@ -43,21 +40,21 @@ </case> </switch> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/dbNameEntry" id="bm_id6442152" localize="false"/> -<paragraph role="heading" id="par_idN10608" xml-lang="en-US" level="2">Name of the Oracle database</paragraph> +<h2 id="par_idN10608">Name of the Oracle database</h2> <paragraph role="paragraph" id="par_idN1060C" xml-lang="en-US"><ahelp hid=".">Enter the name of the Oracle database. Ask your database administrator for the correct name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/hostNameEntry" id="bm_id7636036" localize="false"/> -<paragraph role="heading" id="par_idN1060F" xml-lang="en-US" level="2">Server URL</paragraph> +<h2 id="par_idN1060F">Server URL</h2> <paragraph role="paragraph" id="par_idN10613" xml-lang="en-US"><ahelp hid=".">Enter the URL for the database server. This is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/portNumEntry" id="bm_id7325357" localize="false"/> -<paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2">Port number</paragraph> +<h2 id="par_idN10616">Port number</h2> <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Enter the port number for the database server. Ask your database administrator for the correct port address.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/jdbcDriverEntry" id="bm_id7325358" localize="false"/> -<paragraph role="heading" id="par_idN1061D" xml-lang="en-US" level="2">Oracle JDBC Driver Class</paragraph> +<h2 id="par_idN1061D">Oracle JDBC Driver Class</h2> <paragraph role="paragraph" id="par_idN10621" xml-lang="en-US"><ahelp hid=".">Enter the name of the JDBC driver.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialjdbcconnectionpage/testDriverButton" id="bm_id732535" localize="false"/> -<paragraph role="heading" id="par_idN10630" xml-lang="en-US" level="2">Test Class</paragraph> +<h2 id="par_idN10630">Test Class</h2> <paragraph role="paragraph" id="par_idN10634" xml-lang="en-US"><ahelp hid=".">Tests the connection with the current settings.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN10646" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><link href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp b/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp index 618dfe304..40663ea56 100644 --- a/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp +++ b/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- * This file is part of the LibreOffice project. * @@ -18,8 +18,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - + + <meta> <topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml" indexer="include"> <title id="tit" xml-lang="en-US">Spreadsheet Database Connection</title> @@ -28,16 +28,16 @@ </meta> <body><comment>** Expression is faulty **</comment> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/DBWizSpreadsheetPage" id="bm_id5975217" localize="false"/> -<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1">Set up Spreadsheet connection</paragraph> +<h1 id="par_idN1053A">Set up Spreadsheet connection</h1> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/browseurl" id="bm_id5975218" localize="false"/> -<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="2">Location and file name</paragraph> +<h2 id="par_idN1053E">Location and file name</h2> <paragraph role="paragraph" id="par_idN10542" xml-lang="en-US"><ahelp hid=".">Enter the path and file name to the spreadsheet file.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/browse" id="bm_id2601702" localize="false"/> -<paragraph role="heading" id="par_idN10545" xml-lang="en-US" level="2">Browse</paragraph> +<h2 id="par_idN10545">Browse</h2> <paragraph role="paragraph" id="par_idN10549" xml-lang="en-US"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizspreadsheetpage/passwordrequired" id="bm_id4418774" localize="false"/> -<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="3">Password required</paragraph> +<h3 id="par_idN1054C">Password required</h3> <paragraph role="paragraph" id="par_idN10550" xml-lang="en-US"><ahelp hid=".">Select to request a password from the user of the database document.</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/explorer/database/dabawiz02text.xhp b/source/text/shared/explorer/database/dabawiz02text.xhp index 0bc3bbfbb..f2d4951da 100644 --- a/source/text/shared/explorer/database/dabawiz02text.xhp +++ b/source/text/shared/explorer/database/dabawiz02text.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <helpdocument version="1.0"> <meta> <topic id="textsharedexplorerdatabasedabawiz02textxml" indexer="include" status="PUBLISH"> @@ -34,37 +31,37 @@ <bookmark_value>text databases (Base)</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwiztextpage/DBWizTextPage" id="bm_id1533859" localize="false"/> -<paragraph role="heading" id="par_idN1054F" xml-lang="en-US" level="1">Set up a connection to text files</paragraph> +<h1 id="par_idN1054F">Set up a connection to text files</h1> <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specifies the settings for importing a database in text format.</ahelp><comment>UFI: most text copied without editing from shared\explorer\database\11040000</comment></paragraph> <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US">In a text format database, data is stored in an unformatted ASCII file, where each record comprises a row. The data fields are divided by separators. Text in the data fields is divided by quotation marks.</paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwiztextpage/browseurl" id="bm_id1533860" localize="false"/> -<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2">Path to text files</paragraph> +<h2 id="par_idN1056B">Path to text files</h2> <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"><ahelp hid=".">Enter the path to the text file or files. If you just want one text file, you can use any extension of the file name. If you enter a folder name, the text files in that folder must have the extension *.csv to be recognized as files of the text database.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwiztextpage/browse" id="bm_id1796624" localize="false"/> -<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2">Browse</paragraph> +<h2 id="par_idN10572">Browse</h2> <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp hid=".">Click to open a file selection dialog.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/textfile" id="bm_id3230994" localize="false"/> -<paragraph role="heading" id="par_idN10616" xml-lang="en-US" level="2">Plain text files (*.txt)</paragraph> +<h2 id="par_idN10616">Plain text files (*.txt)</h2> <paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Click to access txt files.</ahelp><comment>UFI: sorry, this is not in the spec.</comment></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/csvfile" id="bm_id1720023" localize="false"/> -<paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2">'Comma separated value' files (*.csv)</paragraph> +<h2 id="par_idN10643">'Comma separated value' files (*.csv)</h2> <paragraph role="paragraph" id="par_idN10647" xml-lang="en-US"><ahelp hid=".">Click to access csv files.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/custom" id="bm_id2862636" localize="false"/> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/extension" id="bm_id2447279" localize="false"/> -<paragraph role="heading" id="par_idN10666" xml-lang="en-US" level="2">Custom</paragraph> +<h2 id="par_idN10666">Custom</h2> <paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><ahelp hid=".">Click to access custom files. Enter the extension in the text box.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/fieldseparator" id="bm_id3149578" localize="false"/> -<paragraph role="heading" id="par_idN10581" xml-lang="en-US" level="2">Field separator</paragraph> +<h2 id="par_idN10581">Field separator</h2> <paragraph role="paragraph" id="par_idN10585" xml-lang="en-US"><ahelp hid=".">Enter or select the character that separates data fields in the text file.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/textseparator" id="bm_id3149795" localize="false"/> -<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="2">Text separator</paragraph> +<h2 id="par_idN1059C">Text separator</h2> <paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"><ahelp hid=".">Enter or select the character that identifies a text field in the text file.</ahelp> You cannot use the same character as the field separator.</paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/decimalseparator" id="bm_id3151385" localize="false"/> -<paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="2">Decimal separator</paragraph> +<h2 id="par_idN105B8">Decimal separator</h2> <paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/textpage/thousandsseparator" id="bm_id3153897" localize="false"/> -<paragraph role="heading" id="par_idN105D3" xml-lang="en-US" level="2">Thousands separator</paragraph> +<h2 id="par_idN105D3">Thousands separator</h2> <paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US"><ahelp hid=".">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp></paragraph> -<paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph> +<paragraph role="paragraph" localize="false" id="par_idN1061A" xml-lang="en-US"><embedvar href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph> </body> </helpdocument> diff --git a/source/text/shared/guide/data_im_export.xhp b/source/text/shared/guide/data_im_export.xhp index d0435ebf3..c610286d2 100644 --- a/source/text/shared/guide/data_im_export.xhp +++ b/source/text/shared/guide/data_im_export.xhp @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <!-- * This file is part of the LibreOffice project. * @@ -19,9 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - - <helpdocument version="1.0"> +<helpdocument version="1.0"> <meta> <topic id="textsharedguidedata_im_exportxhp" indexer="include" status="PUBLISH"> <title id="tit" xml-lang="en-US">Importing and Exporting Data in Base </title> @@ -36,10 +31,10 @@ <bookmark_value>spreadsheets;inserting database records</bookmark_value> <bookmark_value>data sources;copying records to spreadsheets</bookmark_value> <bookmark_value>pasting;from data sources to %PRODUCTNAME Calc</bookmark_value> -</bookmark><comment>MW reduced "databases;" entries into one entry and deleted "exporting;from.."</comment><paragraph role="heading" id="hd_id4547257" xml-lang="en-US" level="1"><variable id="data_im_export"><link href="text/shared/guide/data_im_export.xhp">Importing and Exporting Data in Base</link> -</variable></paragraph> +</bookmark><comment>MW reduced "databases;" entries into one entry and deleted "exporting;from.."</comment><h1 id="hd_id4547257"><variable id="data_im_export"><link href="text/shared/guide/data_im_export.xhp">Importing and Exporting Data in Base</link> +</variable></h1> <paragraph role="paragraph" id="par_id2761314" xml-lang="en-US">An easy method to import and export database tables uses Calc as a "helper application".</paragraph> -<paragraph role="heading" id="hd_id3912778" xml-lang="en-US" level="2">Exporting data from Base</paragraph> +<h2 id="hd_id3912778">Exporting data from Base</h2> <paragraph role="paragraph" id="par_id3163853" xml-lang="en-US">You copy a table from Base to a new Calc sheet, then you can save or export the data to any file format that Calc supports.</paragraph> <list type="ordered"> <listitem> @@ -56,14 +51,14 @@ </listitem> </list> <paragraph role="paragraph" id="par_id130619" xml-lang="en-US">Now you can save or export the data to many file types.</paragraph> -<paragraph role="heading" id="hd_id9999694" xml-lang="en-US" level="2">Importing data to Base</paragraph> -<paragraph role="note" id="par_id8494521" xml-lang="en-US">You can import text files, spreadsheet files, and your system address book in read-only mode only. </paragraph> -<paragraph role="note" id="par_id9579760" xml-lang="en-US">When you import from a text or spreadsheet file, the file must have a first row of header information. The second row of the file is the first valid data row. The format of every field in the second row determines the format for the entire column. Any format information from a spreadsheet file gets lost when importing to Base.</paragraph> -<paragraph role="note" id="par_id325632" xml-lang="en-US">For example, to ensure the first column has a text format, you must make sure that the first field of the first valid data row contains text. If a field in the first valid data row contains a number, the whole column is set to number format, and only numbers, no text, will be shown in that column. </paragraph> +<h2 id="hd_id9999694">Importing data to Base</h2> +<note id="par_id8494521">You can import text files, spreadsheet files, and your system address book in read-only mode only. </note> +<note id="par_id9579760">When you import from a text or spreadsheet file, the file must have a first row of header information. The second row of the file is the first valid data row. The format of every field in the second row determines the format for the entire column. Any format information from a spreadsheet file gets lost when importing to Base.</note> +<note id="par_id325632">For example, to ensure the first column has a text format, you must make sure that the first field of the first valid data row contains text. If a field in the first valid data row contains a number, the whole column is set to number format, and only numbers, no text, will be shown in that column. </note> <list type="ordered"> <listitem> <paragraph role="paragraph" id="par_id2216559" xml-lang="en-US">Open a Base file of the database type that you want. </paragraph> -<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US">Either create a new Base file using the <link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link>, or open any existing Base file that is not read-only.</paragraph> +<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US">Either create a new Base file using the <link href="text/sdatabase/dabawiz01.xhp">Database Wizard</link>, or open any existing Base file that is not read-only.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_id9852900" xml-lang="en-US">Open the Calc file that contains the data to be imported to Base. You can open a *.dbf dBASE file or many other file types. </paragraph> @@ -86,7 +81,7 @@ <paragraph role="paragraph" id="par_id4815820" xml-lang="en-US">You see the Copy Table dialog. Most databases need a primary key, so you may want to check the <emph>Create primary key</emph> box.</paragraph> </listitem> </list> -<paragraph role="tip" id="par_id2584002" xml-lang="en-US">On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys) instead of opening the Base window.</paragraph> +<tip id="par_id2584002">On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> + Shift + F4 keys) instead of opening the Base window.</tip> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id5871761" xml-lang="en-US" localize="false"> <embedvar href="text/sdatabase/main.xhp#base"/> diff --git a/source/text/shared/guide/data_new.xhp b/source/text/shared/guide/data_new.xhp index f5128a9ef..12b282096 100644 --- a/source/text/shared/guide/data_new.xhp +++ b/source/text/shared/guide/data_new.xhp @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> - - <!-- * This file is part of the LibreOffice project. * @@ -18,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <helpdocument version="1.0"> <meta> <topic id="textsharedguidedata_newxhp" indexer="include" status="PUBLISH"> @@ -33,12 +30,12 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id6911526"><bookmark_value>databases;creating</bookmark_value> <bookmark_value>new databases</bookmark_value> </bookmark><comment>mw deleted "creating;"</comment> -<paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="1"><variable id="data_new"><link href="text/shared/guide/data_new.xhp">Creating a New Database</link> -</variable></paragraph> +<h1 id="par_idN105A3"><variable id="data_new"><link href="text/shared/guide/data_new.xhp">Creating a New Database</link> +</variable></h1> <list type="ordered"> <listitem> <paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US">Choose <emph>File - New - Database</emph>.</paragraph> -<paragraph role="paragraph" id="par_idN105CB" xml-lang="en-US">This opens the <link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link>, where you create a new database file.</paragraph> +<paragraph role="paragraph" id="par_idN105CB" xml-lang="en-US">This opens the <link href="text/sdatabase/dabawiz01.xhp">Database Wizard</link>, where you create a new database file.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_idN105DD" xml-lang="en-US">In the Database Wizard, select the type of database, and select the option to open the Table Wizard as the next wizard.</paragraph>
