summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2010-02-12 12:59:13 +0100
committerUwe Fischer <ufi@openoffice.org>2010-02-12 12:59:13 +0100
commit66c1e24214404dcd892a11f28b64dbc67187e827 (patch)
tree557f2fb06e34fe6735de337be3a27c0d0c1a23a5 /helpcontent2/source/text/swriter
parent9e80816a0681944a0aae2ee0cb8f179933d0f5e9 (diff)
hcshared25: intermediate build
Diffstat (limited to 'helpcontent2/source/text/swriter')
-rw-r--r--helpcontent2/source/text/swriter/01/01150000.xhp4
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120221.xhp6
-rw-r--r--helpcontent2/source/text/swriter/guide/nonprintable_text.xhp6
3 files changed, 7 insertions, 9 deletions
diff --git a/helpcontent2/source/text/swriter/01/01150000.xhp b/helpcontent2/source/text/swriter/01/01150000.xhp
index 22e0793be2..f2177eca1a 100644
--- a/helpcontent2/source/text/swriter/01/01150000.xhp
+++ b/helpcontent2/source/text/swriter/01/01150000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
</section>
<paragraph role="paragraph" id="par_id3154102" xml-lang="en-US" l10n="U" oldref="4">During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the <link href="text/swriter/01/04090006.xhp" name="Database"><emph>Database</emph></link> tab page under <emph>Insert - Fields - Other</emph>.</paragraph><comment>db browser explorer</comment>
<bookmark xml-lang="en-US" branch="hid/HID_TLB_TREELISTBOX" id="bm_id5399029" localize="false"/><paragraph role="paragraph" id="par_id8186895" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select a database and table.</ahelp></paragraph><comment>db browser records</comment>
-<bookmark xml-lang="en-US" branch="hid/HID_CTL_TABBROWSER" id="bm_id6056703" localize="false"/><paragraph role="paragraph" id="par_id7812433" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select database records. Drag-and-drop rows or cells to the document to insert contents. Drag-and-drop column headers to insert fields.</ahelp></paragraph><comment>save as single document</comment>
+
<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC" id="bm_id7246620" localize="false"/><paragraph role="paragraph" id="par_id3101901" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one big document containing all data records.</ahelp></paragraph><comment>save as individual documents</comment>
<bookmark xml-lang="en-US" branch="hid/SW_RADIOBUTTON_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL" id="bm_id6964323" localize="false"/><paragraph role="paragraph" id="par_id5345011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create one document for every one data record.</ahelp></paragraph><comment>generate file name from database</comment>
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE" id="bm_id6631672" localize="false"/><paragraph role="paragraph" id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Generate each file name from data contained in a database.</ahelp><comment>UFI: sorry, spec doc has no more info about the specifics</comment></paragraph><comment>file format</comment>
diff --git a/helpcontent2/source/text/swriter/01/04120221.xhp b/helpcontent2/source/text/swriter/01/04120221.xhp
index a19381d907..bcc1a7a4a4 100755
--- a/helpcontent2/source/text/swriter/01/04120221.xhp
+++ b/helpcontent2/source/text/swriter/01/04120221.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3145827" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04120221.xhp" name="Entries (table of contents)">Entries (table of contents)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents.
+<paragraph role="paragraph" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="2"><variable id="eintraege">Specify the format of the entries in the table of contents.
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#verz31"/>
@@ -76,7 +76,7 @@
</section>
<section id="chapterno">
<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO" id="bm_id3152962" localize="false"/><paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="11">Chapter number (E#)</paragraph>
-<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the complete chapter heading, including, if available, the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ENTRYNO">Inserts the chapter number. To assign chapter numbering to a heading style, choose<emph> Tools - Outline Numbering</emph>.</ahelp></paragraph>
</section>
<section id="eintragstext">
<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_TOX_ENTRY:PB_ENTRY" id="bm_id3154193" localize="false"/><paragraph role="heading" id="hd_id3149691" xml-lang="en-US" level="3" l10n="U" oldref="13">Entry text (E)</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
index 1c737cb8d5..2b0632183e 100644
--- a/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
+++ b/helpcontent2/source/text/swriter/guide/nonprintable_text.xhp
@@ -49,15 +49,13 @@
<paragraph xml-lang="en-US" id="par_id4685201" role="paragraph" l10n="NEW">To create text that is not to be printed do the following:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149789" role="listitem" l10n="U" oldref="14">Choose <item type="menuitem">Insert – Frame</item>
- <emph/>and click <item type="menuitem">OK</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149789" role="listitem" l10n="U" oldref="14">Choose <item type="menuitem">Insert - Frame</item> and click <item type="menuitem">OK</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3150224" role="listitem" l10n="U" oldref="15">Enter text in the frame and if you want, resize the frame.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150242" role="listitem" l10n="U" oldref="16">Choose <item type="menuitem">Format - Frame/Object</item>, and then click the<emph/>
- <item type="menuitem">Options</item> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150242" role="listitem" l10n="U" oldref="16">Choose <item type="menuitem">Format - Frame/Object</item>, and then click the <item type="menuitem">Options</item> tab.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3145227" role="listitem" l10n="U" oldref="17">In the <emph>Properties</emph> area, clear the <emph>Print</emph> check box.</paragraph>
generated by cgit (git 2.34.1) at 2025-01-10 07:18:40 +0000