summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/guide
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/guide')
-rwxr-xr-xhelpcontent2/source/text/shared/guide/aaa_start.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/accessibility.xhp24
-rwxr-xr-xhelpcontent2/source/text/shared/guide/active_help_on_off.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/activex.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/assistive.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/guide/autocorr_url.xhp98
-rw-r--r--helpcontent2/source/text/shared/guide/autohide.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/background.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/border_paragraph.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/border_table.xhp31
-rwxr-xr-xhelpcontent2/source/text/shared/guide/breaking_lines.xhp114
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/change_title.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_axis.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_barformat.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/chart_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/chart_legend.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/chart_title.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/guide/configure_overview.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/contextmenu.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/copytable2application.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/copytext2application.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_addressbook.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_dbase2office.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_enter_sql.xhp108
-rw-r--r--helpcontent2/source/text/shared/guide/data_forms.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_im_export.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_new.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_queries.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_register.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/guide/data_report.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_reports.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_search.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_search2.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_tabledefine.xhp99
-rw-r--r--helpcontent2/source/text/shared/guide/data_tables.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/data_view.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/database_main.xhp5
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/digital_signatures.xhp124
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_receive.xhp17
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_send.xhp185
-rwxr-xr-xhelpcontent2/source/text/shared/guide/doc_autosave.xhp13
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp12
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_gallery.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_graphic.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/dragdrop_table.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/edit_symbolbar.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/email.xhp12
-rw-r--r--helpcontent2/source/text/shared/guide/error_report.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/guide/export_ms.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fax.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/filternavigator.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/find_attributes.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/flat_icons.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/floating_toolbar.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fontwork.xhp192
-rwxr-xr-xhelpcontent2/source/text/shared/guide/formfields.xhp145
-rwxr-xr-xhelpcontent2/source/text/shared/guide/gallery_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/groups.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_edit.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_insert.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_search.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/imagemap.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp108
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp118
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/insert_specialchar.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/guide/integratinguno.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp779
-rwxr-xr-xhelpcontent2/source/text/shared/guide/labels.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/labels_database.xhp120
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp317
-rw-r--r--helpcontent2/source/text/shared/guide/line_intext.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/lineend_define.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/linestyle_define.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/linestyles.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/macro_recording.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/main.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/makefile.mk8
-rwxr-xr-xhelpcontent2/source/text/shared/guide/measurement_units.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/guide/microsoft_terms.xhp13
-rw-r--r--helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_doctypes.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp44
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp16
-rwxr-xr-xhelpcontent2/source/text/shared/guide/navigator.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/navigator_setcursor.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/navpane_on.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/numbering_stop.xhp133
-rwxr-xr-xhelpcontent2/source/text/shared/guide/pageformat_max.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp245
-rwxr-xr-xhelpcontent2/source/text/shared/guide/pasting.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_blackwhite.xhp190
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_faster.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/protection.xhp230
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining.xhp74
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_accept.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_doccompare.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_docmerge.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_enter.xhp99
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_protect.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_versions.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/round_corner.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp391
-rwxr-xr-xhelpcontent2/source/text/shared/guide/space_hyphen.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp114
-rwxr-xr-xhelpcontent2/source/text/shared/guide/standard_template.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/start_parameters.xhp10
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp107
-rw-r--r--helpcontent2/source/text/shared/guide/tabs.xhp17
-rw-r--r--helpcontent2/source/text/shared/guide/text_color.xhp97
-rwxr-xr-xhelpcontent2/source/text/shared/guide/textmode_change.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/undo_formatting.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/version_number.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/viewing_file_properties.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/workfolder.xhp79
-rwxr-xr-xhelpcontent2/source/text/shared/guide/xforms.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/guide/xsltfilter.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/xsltfilter_create.xhp5
-rw-r--r--helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp5
127 files changed, 2347 insertions, 2832 deletions
diff --git a/helpcontent2/source/text/shared/guide/aaa_start.xhp b/helpcontent2/source/text/shared/guide/aaa_start.xhp
index 186deae3c7..14126e9352 100755
--- a/helpcontent2/source/text/shared/guide/aaa_start.xhp
+++ b/helpcontent2/source/text/shared/guide/aaa_start.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: aaa_start.xhp,v $
- * $Revision: 1.5.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..45deab4bfe 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: accessibility.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -36,15 +33,8 @@
<title xml-lang="en-US" id="tit">Accessibility in %PRODUCTNAME</title>
<filename>/text/shared/guide/accessibility.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
<list type="unordered">
@@ -59,15 +49,15 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
- <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+ <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
</listitem>
</list>
- <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
+ <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/assistive.xhp#assistive"/>
- <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><link name="Tools - Options - %PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><link name="Tools - Options - %PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp"><item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp"><item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 13c0439eed..3ca6aba2ea 100755
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: active_help_on_off.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="3" l10n="U" oldref="3">To turn Extended Tips on and off:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph>Tools - Options - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="5">A check mark indicates that the extended tips are activated.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index dd57b5e942..2227463043 100755
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: activex.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,7 +94,8 @@
<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph>
</listitem>
</list>
-<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+<section id="relatedtopics">
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
<embed href="text/shared/guide/doc_open.xhp#doc_open"/>
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
diff --git a/helpcontent2/source/text/shared/guide/assistive.xhp b/helpcontent2/source/text/shared/guide/assistive.xhp
index dabe745c9a..4694bb2d45 100644
--- a/helpcontent2/source/text/shared/guide/assistive.xhp
+++ b/helpcontent2/source/text/shared/guide/assistive.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: assistive.xhp,v $
- *
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -98,9 +94,9 @@
<paragraph role="note" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="11">When accessibility support in $[officename] is enabled, the Java Runtime Environment is loaded, and increases the startup time for $[officename].</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance">Tools - Options - $[officename] - Appearance</link></paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01013000.xhp" name="Tools - Options - $[officename] - Accessibility">Tools - Options - $[officename] - Accessibility</link></paragraph>
+<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance">$[officename] - Appearance</link></paragraph>
+<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp" name="$[officename] - Accessibility">$[officename] - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/autocorr_url.xhp b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
index 851d823829..a59255c60b 100755
--- a/helpcontent2/source/text/shared/guide/autocorr_url.xhp
+++ b/helpcontent2/source/text/shared/guide/autocorr_url.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autocorr_url.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,52 +32,53 @@
<meta>
-<topic id="textsharedguideautocorr_urlxml" indexer="include">
-<title id="tit" xml-lang="en-US">Turning off Automatic URL Recognition</title>
-<filename>/text/shared/guide/autocorr_url.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideautocorr_urlxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Turning off Automatic URL Recognition</title>
+ <filename>/text/shared/guide/autocorr_url.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>AutoCorrect function; URL recognition</bookmark_value>
-<bookmark_value>recognizing URLs automatically</bookmark_value>
-<bookmark_value>Internet; turning off recognition of addresses</bookmark_value>
-<bookmark_value>automatic hyperlink formatting</bookmark_value>
-<bookmark_value>URL;turning off URL recognition</bookmark_value>
-<bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
-<bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>recognizing URLs automatically</bookmark_value>
+ <bookmark_value>automatic hyperlink formatting</bookmark_value>
+ <bookmark_value>URL;turning off URL recognition</bookmark_value>
+ <bookmark_value>hyperlinks;turning off automatic recognition</bookmark_value>
+ <bookmark_value>links;turning off automatic recognition</bookmark_value>
+ <bookmark_value>predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="6"><variable id="autocorr_url"><link href="text/shared/guide/autocorr_url.xhp" name="Turning off Automatic URL Recognition">Turning off Automatic URL Recognition</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
-<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
-<paragraph role="heading" id="hd_id3154306" xml-lang="en-US" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152350" xml-lang="en-US" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
-<paragraph role="listitem" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153360" xml-lang="en-US" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
-<paragraph role="listitem" id="par_id3156423" xml-lang="en-US" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="7">When you enter text, $[officename] automatically recognizes a word that may be a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> and replaces the word with a hyperlink. $[officename] formats the hyperlink with direct font attributes (color and underline) the properties of which are obtained from certain Character Styles.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153561" role="paragraph" l10n="U" oldref="2">If you do not want $[officename] to automatically recognize URLs as you are typing, there are several ways of turning off this feature.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="2" l10n="U" oldref="8">Undo URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="U" oldref="3">When you are typing and notice that a text has just been automatically converted into a hyperlink, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Z to undo this formatting.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149235" role="listitem" l10n="CHG" oldref="4">If you do not notice this conversion until later, select the hyperlink and choose the menu command <emph>Format - Default Formatting</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152350" role="heading" level="2" l10n="U" oldref="9">Turn off URL Recognition</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="10">Load a document of the type for which you want to modify the URL recognition.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="listitem" l10n="U" oldref="11">If you want to modify the URL recognition for text documents, open a text document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="12">Choose <emph>Tools - AutoCorrect Options</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="listitem" l10n="U" oldref="13">In the <emph>AutoCorrect</emph> dialog, select the <emph>Options</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="listitem" l10n="U" oldref="14">If you unmark <emph>URL Recognition</emph>, words will no longer be automatically replaced with hyperlinks.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156423" role="listitem" l10n="U" oldref="15">In $[officename] Writer there are two check boxes in front of <emph>URL Recognition</emph>. The box in the first column is for later post-editing and the box in the second column is for AutoCorrect as you type.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/autohide.xhp b/helpcontent2/source/text/shared/guide/autohide.xhp
index ba649d369e..6ec0f9f0de 100644
--- a/helpcontent2/source/text/shared/guide/autohide.xhp
+++ b/helpcontent2/source/text/shared/guide/autohide.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: autohide.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/background.xhp b/helpcontent2/source/text/shared/guide/background.xhp
index eaf1a20f12..927f8b3b72 100755
--- a/helpcontent2/source/text/shared/guide/background.xhp
+++ b/helpcontent2/source/text/shared/guide/background.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: background.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_paragraph.xhp b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
index e8e17d00e2..3566abf3ce 100755
--- a/helpcontent2/source/text/shared/guide/border_paragraph.xhp
+++ b/helpcontent2/source/text/shared/guide/border_paragraph.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: border_paragraph.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/border_table.xhp b/helpcontent2/source/text/shared/guide/border_table.xhp
index e4467b81af..4455968b8e 100755
--- a/helpcontent2/source/text/shared/guide/border_table.xhp
+++ b/helpcontent2/source/text/shared/guide/border_table.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: border_table.xhp,v $
- * $Revision: 1.13 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -43,9 +40,9 @@
</topic>
</meta>
<body>
-
-
-
+
+
+
<bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>tables in text; defining borders</bookmark_value>
<bookmark_value>tables in spreadsheets;defining borders</bookmark_value>
<bookmark_value>borders; for tables</bookmark_value>
@@ -53,7 +50,7 @@
<bookmark_value>defining;table borders</bookmark_value>
</bookmark>
<comment>mw deleted "adding;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
+ <paragraph xml-lang="en-US" id="hd_id3155805" role="heading" level="1" l10n="U" oldref="16"><variable id="border_table"><link href="text/shared/guide/border_table.xhp" name="Defining Borders for Tables and Table Cells">Defining Borders for Tables and Table Cells</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="hd_id3147008" role="heading" level="2" l10n="U" oldref="1">Setting a Predefined Border Style</paragraph>
<list type="ordered">
@@ -79,6 +76,10 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id3159413" role="listitem" l10n="U" oldref="10">In the <emph>User-defined</emph> area select the edge(s) that you want to appear in a common layout. Click on an edge in the preview to toggle the selection of an edge.</paragraph>
</listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id31594132" role="listitem" l10n="NEW">If you select more than one row or column, you can change the middle lines between rows or columns. Select the middle markers in the <emph>User-defined</emph> area.</paragraph>
+ </listitem>
+
<listitem>
<paragraph xml-lang="en-US" id="par_id3153526" role="listitem" l10n="U" oldref="11">Select a line style and color for the selected border style in the <emph>Line</emph> area. These settings apply to all border lines that are included in the selected border style.</paragraph>
</listitem>
@@ -93,19 +94,19 @@
</listitem>
</list>
<section id="relatedtopics">
-
-
+
+
<switch select="appl">
-
+
<case select="WRITER">
<embed href="text/swriter/guide/border_object.xhp#border_object"/>
<embed href="text/swriter/guide/border_page.xhp#border_page"/>
-
+
</case>
-
+
</switch>
<embed href="text/shared/guide/border_paragraph.xhp#border_paragraph"/>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/breaking_lines.xhp b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
index 943d1988b5..6a896e43fc 100755
--- a/helpcontent2/source/text/shared/guide/breaking_lines.xhp
+++ b/helpcontent2/source/text/shared/guide/breaking_lines.xhp
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: breaking_lines.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,61 +29,58 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting Line Breaks in Cells</title>
-<filename>/text/shared/guide/breaking_lines.xhp</filename>
-</topic>
-<history>
-<created date="2004-04-27T13:22:20"/>
-<lastedited date="2006-04-19T14:46:12">UFI 04/04/27, added links to this file in scalc/guide/main.xhp and swriter/guide/main.xhp
-YJ: checked</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidebreaking_linesxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting Line Breaks in Cells</title>
+ <filename>/text/shared/guide/breaking_lines.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id6305734"><bookmark_value>line breaks; in cells</bookmark_value>
-<bookmark_value>cells; line breaks</bookmark_value>
-<bookmark_value>text flow; in cells</bookmark_value>
-<bookmark_value>text breaks in cells</bookmark_value>
-<bookmark_value>wrapping text; in cells</bookmark_value>
-<bookmark_value>words; wrapping in cells</bookmark_value>
-<bookmark_value>automatic line breaks</bookmark_value>
-<bookmark_value>new lines in cells</bookmark_value>
-<bookmark_value>inserting;line breaks in cells</bookmark_value>
-<bookmark_value>tables;inserting line breaks</bookmark_value>
+ <bookmark_value>cells; line breaks</bookmark_value>
+ <bookmark_value>text flow; in cells</bookmark_value>
+ <bookmark_value>text breaks in cells</bookmark_value>
+ <bookmark_value>wrapping text; in cells</bookmark_value>
+ <bookmark_value>words; wrapping in cells</bookmark_value>
+ <bookmark_value>automatic line breaks</bookmark_value>
+ <bookmark_value>new lines in cells</bookmark_value>
+ <bookmark_value>inserting;line breaks in cells</bookmark_value>
+ <bookmark_value>tables;inserting line breaks</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN106D5" xml-lang="en-US" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
+<paragraph xml-lang="en-US" id="par_idN106D5" role="heading" level="1" l10n="NEW"><variable id="breaking_lines"><link href="text/shared/guide/breaking_lines.xhp">Inserting Line Breaks in Cells</link>
</variable></paragraph>
-<paragraph role="heading" id="par_idN106D9" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106E0" xml-lang="en-US" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
-<paragraph role="paragraph" id="par_idN106E3" xml-lang="en-US" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN106E6" xml-lang="en-US" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106ED" xml-lang="en-US" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F1" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN106F9" xml-lang="en-US" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1070A" xml-lang="en-US" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN10718" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN106D9" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Calc spreadsheet cells</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106E0" role="paragraph" l10n="NEW">To insert a line break in a spreadsheet cell, press the <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E3" role="paragraph" l10n="NEW">This will work only with the text edit cursor inside the cell, not at the input line. So first double-click the cell, then single-click at the text position where you want the line break.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id0509200914160968" role="note" l10n="NEW">You can search for a newline character in the Find &amp; Replace dialog by searching for \n as a regular expression. You can use the text function CHAR(10) to insert a newline character into a text formula.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E6" role="heading" level="2" l10n="NEW">Formatting $[officename] Calc cells for automatic line wrapping</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106ED" role="paragraph" l10n="NEW">Select the cells for which you want an automatic line break.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F1" role="paragraph" l10n="NEW">Choose <emph>Format - Cells - Alignment</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="paragraph" l10n="CHG">Select <emph>Wrap text automatically</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10700" role="heading" level="2" l10n="NEW">Inserting line breaks in $[officename] Writer text document tables</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10707" role="paragraph" l10n="NEW">To insert a line break in a text document table cell, press the Enter key.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">An automatic line break will be performed while you type across the end of each cell.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN10718" role="paragraph" l10n="NEW"><link href="text/shared/01/05340300.xhp">Alignment</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/change_title.xhp b/helpcontent2/source/text/shared/guide/change_title.xhp
index 290dabe1d7..58527f35a4 100755..100644
--- a/helpcontent2/source/text/shared/guide/change_title.xhp
+++ b/helpcontent2/source/text/shared/guide/change_title.xhp
@@ -4,13 +4,10 @@
<!--***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: change_title.xhp,v $
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -30,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidechange_titlexml" indexer="include" status="PUBLISH">
@@ -51,7 +48,7 @@ YJ: checked</lastedited>
</bookmark>
<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="change_title"><link href="text/shared/guide/change_title.xhp" name="Changing the Title of a Document">Changing the Title of a Document</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.<comment>UFI: we don't show the title any more on the title bar - see http://specs.openoffice.org/appwide/module_name_in_caption_bar/module_name_in_caption_bar.sxw</comment></paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.</paragraph>
<paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="4">How to change the title of the current document</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/chart_axis.xhp b/helpcontent2/source/text/shared/guide/chart_axis.xhp
index bacf064b0b..2a8d55eea5 100755
--- a/helpcontent2/source/text/shared/guide/chart_axis.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_axis.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_axis.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_barformat.xhp b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
index 5b072486d9..cdf29addb4 100755
--- a/helpcontent2/source/text/shared/guide/chart_barformat.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_barformat.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_barformat.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_insert.xhp b/helpcontent2/source/text/shared/guide/chart_insert.xhp
index 16242d0d55..e830a22f2c 100644
--- a/helpcontent2/source/text/shared/guide/chart_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_insert.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_insert.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_legend.xhp b/helpcontent2/source/text/shared/guide/chart_legend.xhp
index 5801e0de05..6e17d903c4 100644
--- a/helpcontent2/source/text/shared/guide/chart_legend.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_legend.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_legend.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/chart_title.xhp b/helpcontent2/source/text/shared/guide/chart_title.xhp
index ee89c841a4..7b4c54a9b1 100755
--- a/helpcontent2/source/text/shared/guide/chart_title.xhp
+++ b/helpcontent2/source/text/shared/guide/chart_title.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: chart_title.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 928c7664c8..d0222dcbd6 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: collab.xhp,v $
- * $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -43,26 +40,22 @@
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
<bookmark_value>collaboration</bookmark_value>
</bookmark>
<comment>MW changed the index entries to one level entries.</comment>
- <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
+ <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph>
<comment>Tools - Share Document menu</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
<paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
<comment>Share Document dialog - Share this spreadsheet with other users</comment>
-
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
- <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph>Tools - Options - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
<paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph>
<paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph>
@@ -90,23 +83,23 @@
</listitem>
</list>
<comment>Resolve Conflicts dialog</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
<paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph>
<comment>Keep Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
<paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph>
<comment>Keep Other</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph>
<comment>Keep All Mine</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
<paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph>
<comment>Keep All Others</comment>
-
+
<bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
<paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph>
@@ -127,6 +120,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph>
+
<paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph>
<paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph>
<paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph>
@@ -144,10 +138,23 @@
<paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph>
</listitem>
</list>
+
+ <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph>
+
<section id="relatedtopics">
-
+
<paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-
+
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/configure_overview.xhp b/helpcontent2/source/text/shared/guide/configure_overview.xhp
index cbaaf0b898..0bf4e119f8 100755
--- a/helpcontent2/source/text/shared/guide/configure_overview.xhp
+++ b/helpcontent2/source/text/shared/guide/configure_overview.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: configure_overview.xhp,v $
- *
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/contextmenu.xhp b/helpcontent2/source/text/shared/guide/contextmenu.xhp
index 3c8683bfa7..b096269f71 100755
--- a/helpcontent2/source/text/shared/guide/contextmenu.xhp
+++ b/helpcontent2/source/text/shared/guide/contextmenu.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: contextmenu.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
index b685a7bf2c..9098756ad3 100644
--- a/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
+++ b/helpcontent2/source/text/shared/guide/copy_drawfunctions.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copy_drawfunctions.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytable2application.xhp b/helpcontent2/source/text/shared/guide/copytable2application.xhp
index 3ca3e1144d..53c48ed5ba 100755
--- a/helpcontent2/source/text/shared/guide/copytable2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytable2application.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copytable2application.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/copytext2application.xhp b/helpcontent2/source/text/shared/guide/copytext2application.xhp
index f8cca36797..feaff89db2 100644
--- a/helpcontent2/source/text/shared/guide/copytext2application.xhp
+++ b/helpcontent2/source/text/shared/guide/copytext2application.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: copytext2application.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index a539c61509..fc83807b1f 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ctl.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,17 +29,12 @@
*
************************************************************************
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidectlxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Languages Using Complex Text Layout</title>
<filename>/text/shared/guide/ctl.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:43:30">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153662"><bookmark_value>CTL;complex text layout languages</bookmark_value>
@@ -88,7 +80,7 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01150300.xhp" name="Tools - Options - Language Settings - Complex Text Layout">Tools - Options - Language Settings - Complex Text Layout</link></paragraph>
+<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01150300.xhp" name="Language Settings - Complex Text Layout">Language Settings - Complex Text Layout</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/data_addressbook.xhp b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
index 21fa70e963..5a812d6cb5 100755
--- a/helpcontent2/source/text/shared/guide/data_addressbook.xhp
+++ b/helpcontent2/source/text/shared/guide/data_addressbook.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_addressbook.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -71,7 +68,7 @@
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Data source</emph> combo box, select the system address book or the data source you want to use as an address book.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Configure</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="11">If you have not yet registered the system address book in <item type="productname">%PRODUCTNAME</item> as the data source, click the <emph>Address Data Source ...</emph> button. This takes you to the <emph>Address Book Data Source Wizard</emph>, in which you can register your address book as a new data source in <item type="productname">%PRODUCTNAME</item>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="13">In the <emph>Table</emph> combo box, select the database table you want to use as the address book.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
index 50a78ed064..bd129a0482 100755
--- a/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
+++ b/helpcontent2/source/text/shared/guide/data_dbase2office.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_dbase2office.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
index 4708c94732..9809e47ae8 100644
--- a/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
+++ b/helpcontent2/source/text/shared/guide/data_enter_sql.xhp
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_enter_sql.xhp,v $
- * $Revision: 1.16 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,60 +30,57 @@
************************************************************************
-->
-<helpdocument version="1.0">
+
<meta>
-<topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Executing SQL Commands</title>
-<filename>/text/shared/guide/data_enter_sql.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-14T15:10:58">fpe: changed to match new database interface</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidedata_enter_sqlxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Executing SQL Commands</title>
+ <filename>/text/shared/guide/data_enter_sql.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152801"><bookmark_value>SQL; executing SQL commands</bookmark_value>
-<bookmark_value>queries;creating in SQL view</bookmark_value>
-<bookmark_value>commands;SQL</bookmark_value>
-<bookmark_value>executing;SQL commands</bookmark_value>
-</bookmark><comment>mw changed "SQL;executing commands"</comment>
-<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
+ <bookmark_value>queries;creating in SQL view</bookmark_value>
+ <bookmark_value>commands;SQL</bookmark_value>
+ <bookmark_value>executing SQL commands</bookmark_value>
+</bookmark><comment>mw changed "SQL;executing commands"</comment><comment>mw made "executing;" a one level entry</comment>
+<paragraph xml-lang="en-US" id="hd_id3152801" role="heading" level="1" l10n="U"
+ oldref="67"><variable id="data_enter_sql"><link href="text/shared/guide/data_enter_sql.xhp" name="Executing SQL Commands">Executing SQL Commands</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
-<paragraph role="note" id="par_id3153562" xml-lang="en-US" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
-<paragraph role="heading" id="hd_id9577929" xml-lang="en-US" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7923825" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9448530" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
-<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154071" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="68">With the help of SQL commands you can control the database directly, and can also create and edit tables and queries.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153562" role="note" l10n="U" oldref="72">Not all database types support all SQL instructions. If necessary, find out which SQL commands are supported by your database system.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9577929" role="heading" level="2" l10n="NEW">To execute an SQL statement directly</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7923825" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph> to open a database file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448530" role="paragraph" l10n="NEW">Choose <emph>Tools - SQL</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="91">Click the <emph>Create Query in SQL View</emph> icon
+<image id="img_id3154071" src="res/commandimagelist/sc_dbnewquerysql.png" width="0.1862in" height="0.1862in"><alt xml-lang="en-US" id="alt_id3154071">Icon</alt>
</image> or</paragraph>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
-<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156212" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3145786" role="paragraph" l10n="U" oldref="92">Select an existing query from the list and click the <emph>Edit</emph> icon
+<image id="img_id3156212" src="res/commandimagelist/sc_dbqueryedit.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3156212">Icon</alt>
</image>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="U" oldref="96">Click the <emph>Run</emph> icon
-<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152886" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="paragraph" l10n="U" oldref="94">In the <emph>Query</emph> window, choose <emph>View - Switch Design View On/Off</emph>. Edit the SQL command.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="U" oldref="96">Click the <emph>Run</emph> icon
+<image id="img_id3152886" src="res/commandimagelist/sc_sbanativesql.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3152886">Icon</alt>
</image>. The result of the query is displayed in the upper window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
-<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153159" xml-lang="en-US">Icon</alt>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149298" role="paragraph" l10n="U" oldref="98">Click the <emph>Save</emph> or <emph>Save As</emph> icon
+<image id="img_id3153159" src="res/commandimagelist/sc_save.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id3153159">Icon</alt>
</image> to save the query.</paragraph>
-</listitem>
-</list>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153223" xml-lang="en-US" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</section>
-</body>
-</helpdocument>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3153223" role="paragraph" l10n="U" oldref="105"><link href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query Design</link></paragraph>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_forms.xhp b/helpcontent2/source/text/shared/guide/data_forms.xhp
index aebc732d07..62266338a5 100644
--- a/helpcontent2/source/text/shared/guide/data_forms.xhp
+++ b/helpcontent2/source/text/shared/guide/data_forms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_forms.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_im_export.xhp b/helpcontent2/source/text/shared/guide/data_im_export.xhp
index 82fe49f2d8..3c7a9e194d 100644
--- a/helpcontent2/source/text/shared/guide/data_im_export.xhp
+++ b/helpcontent2/source/text/shared/guide/data_im_export.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_im_export.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_new.xhp b/helpcontent2/source/text/shared/guide/data_new.xhp
index 3982a178ad..8f5c003b7a 100644
--- a/helpcontent2/source/text/shared/guide/data_new.xhp
+++ b/helpcontent2/source/text/shared/guide/data_new.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_new.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_queries.xhp b/helpcontent2/source/text/shared/guide/data_queries.xhp
index aaac2a2282..0a19014f07 100644
--- a/helpcontent2/source/text/shared/guide/data_queries.xhp
+++ b/helpcontent2/source/text/shared/guide/data_queries.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_queries.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_register.xhp b/helpcontent2/source/text/shared/guide/data_register.xhp
index 313003ed0b..25517a221c 100644
--- a/helpcontent2/source/text/shared/guide/data_register.xhp
+++ b/helpcontent2/source/text/shared/guide/data_register.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_register.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidedata_registerxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Registering and Deleting a Database </title>
@@ -54,7 +50,7 @@
<paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3" l10n="NEW">To register an existing database file:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="CHG">Click <emph>New</emph> and select the database file.<comment>i60224</comment></paragraph>
@@ -63,7 +59,7 @@
<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="3" l10n="NEW">To remove a registered database from %PRODUCTNAME</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW">Select the database file and click <emph>Delete</emph>. </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/data_report.xhp b/helpcontent2/source/text/shared/guide/data_report.xhp
index abf6e9459f..e325125dc2 100755
--- a/helpcontent2/source/text/shared/guide/data_report.xhp
+++ b/helpcontent2/source/text/shared/guide/data_report.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_report.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_reports.xhp b/helpcontent2/source/text/shared/guide/data_reports.xhp
index a0863872ee..5949820331 100644
--- a/helpcontent2/source/text/shared/guide/data_reports.xhp
+++ b/helpcontent2/source/text/shared/guide/data_reports.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_reports.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search.xhp b/helpcontent2/source/text/shared/guide/data_search.xhp
index 570b08bebc..f0a797cdae 100644
--- a/helpcontent2/source/text/shared/guide/data_search.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_search.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_search2.xhp b/helpcontent2/source/text/shared/guide/data_search2.xhp
index 05a10019eb..dcbe7f9aa7 100644
--- a/helpcontent2/source/text/shared/guide/data_search2.xhp
+++ b/helpcontent2/source/text/shared/guide/data_search2.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_search2.xhp,v $
- * $Revision: 1.12.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
index 4fb9917c12..80bff489dd 100644
--- a/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tabledefine.xhp
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_tabledefine.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,47 +29,50 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Design</title>
-<filename>/text/shared/guide/data_tabledefine.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view</bookmark_value>
-<bookmark_value>designing; database tables</bookmark_value>
-<bookmark_value>properties;fields in databases</bookmark_value>
-<bookmark_value>fields;database tables</bookmark_value>
-<bookmark_value>AutoValue;database tables</bookmark_value>
-<bookmark_value>primary key;database tables</bookmark_value>
-</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><paragraph role="paragraph" id="par_id3155448" xml-lang="en-US" l10n="E" oldref="103" localize="false"/>
-<paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
+ <topic id="textsharedguidedata_tabledefinexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Design</title>
+ <filename>/text/shared/guide/data_tabledefine.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3155448"><bookmark_value>tables in databases; creating in design view (manually)</bookmark_value>
+ <bookmark_value>designing; database tables</bookmark_value>
+ <bookmark_value>properties;fields in databases</bookmark_value>
+ <bookmark_value>fields;database tables</bookmark_value>
+ <bookmark_value>AutoValue (Base)</bookmark_value>
+ <bookmark_value>primary keys;design view</bookmark_value>
+</bookmark><comment>MW deleted "database tables;" and changed "tables in databases;"</comment><comment>UFI added AutoValue and Primary Key entry - i48831</comment><comment>MW changed Tables in databases, AutoValue and Primary Key entries</comment>
+<paragraph xml-lang="en-US" id="par_id3155448" role="paragraph" l10n="E" oldref="103"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U"
+ oldref="104"><variable id="data_tabledefine"><link href="text/shared/guide/data_tabledefine.xhp" name="Table Design">Table Design</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153349" xml-lang="en-US" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id1595507" xml-lang="en-US" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
-<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
-<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U" oldref="42">Field Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
-<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
-<paragraph role="paragraph" id="par_id3150869" xml-lang="en-US" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
-<paragraph role="paragraph" id="par_id3154908" xml-lang="en-US" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/database_main.xhp#database_main"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3155535" role="paragraph" l10n="U" oldref="2">This section contains information about how to create a new database table in the <link href="text/shared/explorer/database/05010000.xhp" name="design view">design view</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="CHG" oldref="3">Open the database file of the database where you want a new table. Click the <emph>Tables</emph> icon. Choose <emph>Create Table in Design View</emph> to create a new table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146798" role="paragraph" l10n="U" oldref="4">In the Design view, you can now create the fields for your table.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153349" role="listitem" l10n="U" oldref="5">Enter new fields in rows from top to bottom. Click the <emph>Field Name</emph> cell and enter a field name for each data field.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1595507" role="listitem" l10n="NEW">Include a "primary key" data field. Base needs a primary key to be able to edit the table contents. A primary key has unique contents for each data record. For example, insert a numerical field, right-click the first column, and choose <emph>Primary Key</emph> from the context menu. Set <emph>AutoValue</emph> to "Yes", so Base can automatically increment the value for each new record.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="6">In the next cell to the right, define the <emph>Field Type</emph>. When you click in the cell, you can select a field type in the combo box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="note" l10n="U" oldref="38">Each field can only accept data corresponding to the specified field type. For example, it is not possible to enter text in a number field. Memo fields in dBASE III format are references to internally-managed text files which can hold up to 64KB text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="41">You can enter an optional <emph>Description</emph> for each field. The text of the description will appear as a tip on the column headings in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153379" role="heading" level="2" l10n="U"
+ oldref="42">Field Properties</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="45">Enter properties for each selected data field. Depending on the database type, some input facilities may not be available.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144762" role="paragraph" l10n="U" oldref="46">In the <emph>Default value</emph> box, enter the default contents for every new record. This contents can be edited later.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150869" role="paragraph" l10n="U" oldref="47">In the <emph>Entry required</emph> box, specify whether or not the field may remain empty.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="7">For the <emph>Length</emph> box, a combo box may be shown that provides the available choices.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/database_main.xhp#database_main"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/data_tables.xhp b/helpcontent2/source/text/shared/guide/data_tables.xhp
index de0cf9c869..43d0cde3f4 100644
--- a/helpcontent2/source/text/shared/guide/data_tables.xhp
+++ b/helpcontent2/source/text/shared/guide/data_tables.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_tables.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/data_view.xhp b/helpcontent2/source/text/shared/guide/data_view.xhp
index 843fdc6fe0..f2fff1fa7d 100644
--- a/helpcontent2/source/text/shared/guide/data_view.xhp
+++ b/helpcontent2/source/text/shared/guide/data_view.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: data_view.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/database_main.xhp b/helpcontent2/source/text/shared/guide/database_main.xhp
index 1d49cc5eec..2039a3175f 100755
--- a/helpcontent2/source/text/shared/guide/database_main.xhp
+++ b/helpcontent2/source/text/shared/guide/database_main.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: database_main.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index f1369473ab..9812393661 100755..100644
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
<!--
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: digital_signatures.xhp,v $
- * $Revision: 1.14.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,41 +28,89 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguidedigital_signaturesxhp" indexer="include">
-<title id="tit" xml-lang="en-US">About Digital Signatures</title>
-<filename>/text/shared/guide/digital_signatures.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">About Digital Signatures</title>
+ <filename>/text/shared/guide/digital_signatures.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>certificates</bookmark_value>
-<bookmark_value>digital signatures;overview</bookmark_value>
-<bookmark_value>security;digital signatures</bookmark_value>
+ <bookmark_value>digital signatures;overview</bookmark_value>
+ <bookmark_value>security;digital signatures</bookmark_value>
</bookmark><comment>mw moved 1 entry to digitalsign_send.xhp and made "digital signatures" a two level entry and added a new entry</comment>
-<paragraph role="heading" id="hd_id2767418" xml-lang="en-US" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
+<paragraph xml-lang="en-US" id="hd_id2767418" role="heading" level="1" l10n="NEW"><variable id="digital_signatures"><link href="text/shared/guide/digital_signatures.xhp">About Digital Signatures</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
-<paragraph role="heading" id="hd_id6564531" xml-lang="en-US" level="2" l10n="NEW">Certificates</paragraph>
-<paragraph role="paragraph" id="par_idN10639" xml-lang="en-US" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
-<paragraph role="heading" id="par_idN1066D" xml-lang="en-US" level="2" l10n="NEW">Save and sign the document</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
-<paragraph role="heading" id="par_idN10674" xml-lang="en-US" level="2" l10n="NEW">Open a signed document</paragraph>
-<paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
-<paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
-<paragraph role="paragraph" id="par_idN1067E" xml-lang="en-US" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
-<paragraph role="heading" id="hd_id9354228" xml-lang="en-US" level="2" l10n="NEW">Security Warnings</paragraph>
-<paragraph role="paragraph" id="par_id2372508" xml-lang="en-US" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
-<paragraph role="paragraph" id="par_id7953123" xml-lang="en-US" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
-<paragraph role="paragraph" id="par_id6195257" xml-lang="en-US" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
-<paragraph role="warning" id="par_id8635517" xml-lang="en-US" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
-<paragraph role="paragraph" id="par_id6075624" xml-lang="en-US" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
-<paragraph role="warning" id="par_id6819971" xml-lang="en-US" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3204443" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id486465" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
-<paragraph role="paragraph" id="par_id3448591" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10632" role="paragraph" l10n="NEW">In %PRODUCTNAME, you can digitally sign your documents and macros. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id6564531" role="heading" level="2" l10n="NEW">Certificates</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10639" role="paragraph" l10n="NEW">To sign a document digitally, you need a personal key, the certificate. A personal key is stored on your computer as a combination of a private key, which must be kept secret, and a public key, which you add to your documents when you sign them.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="2" l10n="NEW">Save and sign the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">When you apply a digital signature to a document, a kind of checksum is computed from the document's content plus your personal key. The checksum and your public key are stored together with the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10674" role="heading" level="2" l10n="NEW">Open a signed document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10678" role="paragraph" l10n="NEW">When someone later opens the document on any computer with a recent version of %PRODUCTNAME, the program will compute the checksum again and compare it with the stored checksum. If both are the same, the program will signal that you see the original, unchanged document. In addition, the program can show you the public key information from the certificate.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067B" role="paragraph" l10n="NEW">You can compare the public key with the public key that is published on the web site of the certificate authority.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067E" role="paragraph" l10n="NEW">Whenever someone changes something in the document, this change breaks the digital signature. After the change, there will be no sign that you see the original document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200911571878" role="paragraph" l10n="NEW">You can see any of the following icons and messages when you open a signed document.</paragraph>
+ <table id="tbl_id0821200912400398">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504050" role="tablehead" l10n="NEW">Icon in Status bar</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504061" role="tablehead" l10n="NEW">Signature status</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504010" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912421569" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912421569">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504189" role="tablecontent" l10n="NEW">The signature is valid.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id082120091250418" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912431081" src="xmlsecurity/res/notcertificate_16.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id0821200912431081">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent" l10n="NEW">The signature is OK, but the certificates could not be validated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504237" role="tablecontent" l10n="NEW">
+<image id="img_id0821200912435090" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id0821200912435090">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0821200912504233" role="tablecontent" l10n="NEW">The signature is invalid.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id0821200910191787" role="heading" level="3" l10n="NEW">Signatures and software versions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191747" role="paragraph" l10n="NEW">The signing of contents got changed with OpenOffice.org 3.2 and StarOffice 9.2. Now all contents of the files, except the signature file itself (META-INF/documentsignatures.xml) are signed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id0821200910191774" role="paragraph" l10n="NEW">When you sign a document with OpenOffice.org 3.2 or StarOffice 9.2 or a later version, and you open that document in an older version of the software, the signature will be displayed as "invalid". Signatures created with older versions of the software will be marked with "only parts of the documents are signed" when loaded in the newer software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2008200911583098" role="note" l10n="NEW">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2 and StarOffice 9.2 all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9354228" role="heading" level="2" l10n="NEW">Security Warnings</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph" l10n="NEW">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph" l10n="NEW">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph" l10n="NEW">Do not trust the icon. Inspect and verify the certificates.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8635517" role="warning" l10n="CHG">The validation of a signature is not a legally binding guarantee of any kind.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
index 21fca6ab59..8d917da300 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsign_receive.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@
<paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">You must use the %PRODUCTNAME file dialogs to use WebDAV over HTTPS.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1227759" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
@@ -78,24 +75,24 @@
</list>
<paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">If there is a mismatch of the domain name given in the certificate and the domain name you entered in the file dialog, then you see a dialog that allows you to choose from any of the following options:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/1311773189" id="bm_id9141819" localize="false"/>
+<!-- removed HID 1311773189 -->
<paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW"> <emph>View Certificate</emph> - <ahelp hid=".">Opens the View Certificate dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/1311773188" id="bm_id6354869" localize="false"/>
+<!-- removed HID 1311773188 -->
<paragraph xml-lang="en-US" id="par_id8111819" role="paragraph" l10n="NEW"> <emph>Continue</emph> - <ahelp hid=".">If you are sure both domains are the same, click the Continue button.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id9116794" role="paragraph" l10n="NEW"> <emph>Cancel Connection</emph> - Cancels the connection.</paragraph>
<paragraph xml-lang="en-US" id="par_id4381847" role="paragraph" l10n="NEW">If you click <emph>Continue</emph>, you may see a dialog that asks you to enter your user name and password.</paragraph>
<comment>user name</comment>
-<bookmark xml-lang="en-US" branch="hid/1311344666" id="bm_id2685323" localize="false"/>
+<!-- removed HID 1311344666 -->
<paragraph xml-lang="en-US" id="par_id1336710" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your user name to log on to the WebDAV server.</ahelp></paragraph>
<comment>password</comment>
-<bookmark xml-lang="en-US" branch="hid/1311344669" id="bm_id6042664" localize="false"/>
+<!-- removed HID 1311344669 -->
<paragraph xml-lang="en-US" id="par_id1221655" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enter your password.</ahelp></paragraph>
<comment>remember password till end of session</comment>
-<bookmark xml-lang="en-US" branch="hid/1311343648" id="bm_id7889950" localize="false"/>
+<!-- removed HID 1311343648 -->
<paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index 774e0f4069..0aa75256bf 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: digitalsign_send.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,109 +29,88 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
-<filename>/text/shared/guide/digitalsign_send.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidedigitalsign_sendxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Applying Digital Signatures</title>
+ <filename>/text/shared/guide/digitalsign_send.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id7430951"><bookmark_value>signing documents with digital signatures</bookmark_value>
-<bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
-</bookmark>
- <comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
- <paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
-</variable></paragraph>
- <comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
- <paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
-
+ <bookmark_value>digital signatures;getting/managing/applying</bookmark_value>
+</bookmark><comment>mw transferred one entry from digital_signatures.xhp and added a new entry</comment>
+<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
+</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
+<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
<switch select="sys">
-
<case select="WIN">
- <paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
-
+<paragraph xml-lang="en-US" id="par_idN1070A" role="paragraph" l10n="NEW">If you are using Microsoft Windows, you can manage your certificates from the Control Panel applet "Internet Options" on the "Contents" tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8311410" role="paragraph" l10n="NEW">Import your new root certificate into the Trusted Root Certification Authorities list.</paragraph>
</case>
-
<default>
- <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
- </listitem>
- </list>
-
+<paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph" l10n="NEW">If you are using Solaris or Linux, you must install a recent version of Thunderbird, Mozilla Suite, or Firefox software to install some system files that are needed for encryption.<comment>how about Mac OS X?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10720" role="tip" l10n="NEW">If you have created different profiles in Thunderbird, Mozilla, or Firefox, and you want %PRODUCTNAME to use one specified profile for certificates, then you can set the environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder of that specified profile.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id944242" role="paragraph" l10n="NEW">Open your Web browser's preferences dialog, select the Privacy &amp; Security tab page, click on Certificates - Manage Certificates. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6452223" role="paragraph" l10n="NEW">Import your new root certificate, then select and edit the certificate. Enable the root certificate to be trusted at least for web and email access. This ensures that the certificate can sign your documents. You may edit any intermediate certificate in the same way, but it is not mandatory for signing documents.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6486098" role="paragraph" l10n="NEW">When you have edited the new certificates, restart %PRODUCTNAME.</paragraph>
+ </listitem>
+ </list>
</default>
-
</switch>
- <paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
-<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id262764">icon</alt>
- </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
-<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.1665inch" height="0.1665inch"><alt xml-lang="en-US" id="alt_id9252296">icon</alt>
+<paragraph xml-lang="en-US" id="par_idN10681" role="heading" level="2" l10n="NEW">Signing a document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10688" role="paragraph" l10n="NEW">Choose <emph>File - Digital Signatures</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10690" role="paragraph" l10n="NEW">A message box advises you to save the document. Click <emph>Yes</emph> to save the file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph" l10n="NEW">After saving, you see the <link href="text/shared/01/digitalsignatures.xhp">Digital Signatures</link> dialog. Click <emph>Add</emph> to add a public key to the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="paragraph" l10n="NEW">In the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog, select your certificate and click OK. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C0" role="paragraph" l10n="NEW">You see again the Digital Signatures dialog, where you can add more certificates if you want. Click OK to add the public key to the saved file.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106C3" role="paragraph" l10n="NEW">A signed document shows an icon
+<image id="img_id262764" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id262764">Icon</alt>
</image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph>
- <comment>WebDAV see issue 32935</comment>
- <comment>main dialog IDs are here to lead the user initially to this help page</comment>
- <comment>Examine certificate button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311740419" id="bm_id2454298" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph>
- <comment>Accept this certificate temporarily for this session radio button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311736321" id="bm_id2307199" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph>
- <comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
-
-<bookmark xml-lang="en-US" branch="hid/1311736326" id="bm_id9983825" localize="false"/>
- <paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id2008200911381426" role="paragraph" l10n="NEW">The result of the signature validation is displayed in the status bar and within the Digital Signature dialog. Several documents and macro signatures can exist inside an ODF document. If there is a problem with one signature, then the validation result of that one signature is assumed for all signatures. That is, if there are ten valid signatures and one invalid signature, then the status bar and the status field in the dialog will flag the signature as invalid.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E0" role="heading" level="2" l10n="NEW">Signing the macros inside a document</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E4" role="paragraph" l10n="NEW">Normally, macros are part of a document. If you sign a document, the macros inside the document are signed automatically. If you want to sign only the macros, but not the document, proceed as follows:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106EA" role="paragraph" l10n="NEW">Choose <emph>Tools - Macros - Digital Signature</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="paragraph" l10n="NEW">Apply the signature as described above for documents.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106F5" role="paragraph" l10n="NEW">When you open the Basic IDE that contains signed macros, you see an icon
+<image id="img_id9252296" src="xmlsecurity/res/certificate_16.png" width="0.2228in" height="0.2228in"><alt xml-lang="en-US" id="alt_id9252296">Icon</alt>
+ </image> in the status bar. You can double-click the icon in the status bar to view the certificate.</paragraph><comment>WebDAV see issue 32935</comment><comment>main dialog IDs are here to lead the user initially to this help page</comment><comment>Examine certificate button</comment>
+<!-- removed HID 1311740419 -->
+<paragraph xml-lang="en-US" id="par_id5734733" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to open the View Certificate dialog.</ahelp></paragraph><comment>Accept this certificate temporarily for this session radio button</comment>
+<!-- removed HID 1311736321 -->
+<paragraph xml-lang="en-US" id="par_id561540" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to accept the certificate until you exit %PRODUCTNAME.</ahelp></paragraph><comment>Do not accept this certificate and do not connect to this Web site radio button</comment>
+<!-- removed HID 1311736326 -->
+<paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index f98667aeb4..cdea018b30 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_autosave.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,7 +59,7 @@
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -71,7 +68,7 @@
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="CHG" oldref="6">If the <emph>Always create backup copy</emph> option is selected, the old version of the file is saved to the backup directory whenever you save the current version of the file. </paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph>Tools - Options - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="8">The backup copy has the same name as the document, but the extension is .BAK. If the backup folder already contains such a file, it will be overwritten without warning.</paragraph>
@@ -80,7 +77,7 @@
<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
@@ -92,7 +89,7 @@
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
<paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report Tool</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index 745b7ebecf..e62f2c692f 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_open.xhp,v $
- * $Revision: 1.15.4.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,7 +72,7 @@
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
<paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
<paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph>.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
@@ -88,7 +85,7 @@
<paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 3a4fca1ed1..19f88f17d3 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: doc_save.xhp,v $
- * $Revision: 1.13.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,8 +60,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt>
- </image></paragraph>
+<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
@@ -72,7 +68,7 @@
</tablerow>
</table>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
<paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
<paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
@@ -139,7 +135,7 @@
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/dragdrop.xhp b/helpcontent2/source/text/shared/guide/dragdrop.xhp
index fc6d407bce..ac2f4041fa 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
index c2a327abc9..62849a2c1a 100644
--- a/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_beamer.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_beamer.xhp,v $
- * $Revision: 1.10.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
index 9601093494..4c793cf502 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_fromgallery.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_fromgallery.xhp,v $
- * $Revision: 1.11.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
index c4baa16d10..c795bf2f61 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_gallery.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_gallery.xhp,v $
- * $Revision: 1.7.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
index 0f1f0a7034..c3beacc89d 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_graphic.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_graphic.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
index 81fb5cf138..a8ef05a7e0 100755
--- a/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
+++ b/helpcontent2/source/text/shared/guide/dragdrop_table.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dragdrop_table.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
index e046bebe34..b00ca693e2 100755
--- a/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/edit_symbolbar.xhp
@@ -7,14 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: edit_symbolbar.xhp,v $
- *
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index 021f2daa68..dcdabf8f5c 100755
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: email.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,14 +50,13 @@
<bookmark_value>drawings; sending as e-mail</bookmark_value>
<bookmark_value>presentations; sending as e-mail</bookmark_value>
<bookmark_value>attachments in e-mails</bookmark_value>
-</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link>
-</variable></paragraph>
+</bookmark>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Tools - Options - Internet - E-mail</emph>.
-</caseinline></switchinline></paragraph>
+<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/error_report.xhp b/helpcontent2/source/text/shared/guide/error_report.xhp
index bef3d05e18..2eb0204da4 100644
--- a/helpcontent2/source/text/shared/guide/error_report.xhp
+++ b/helpcontent2/source/text/shared/guide/error_report.xhp
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: error_report.xhp,v $
- * $Revision: 1.7 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,46 +29,36 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Error Report Tool</title>
-<filename>/text/shared/guide/error_report.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:54:29">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Error Report Tool</title>
+ <filename>/text/shared/guide/error_report.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150616"><bookmark_value>Error Report Tool</bookmark_value>
-<bookmark_value>reports;error reports</bookmark_value>
-<bookmark_value>crash reports</bookmark_value>
-<bookmark_value>activating;Error Report Tool</bookmark_value>
+ <bookmark_value>reports;error reports</bookmark_value>
+ <bookmark_value>crash reports</bookmark_value>
+ <bookmark_value>activating;Error Report Tool</bookmark_value>
</bookmark><comment>MW changed "reporting..." to "reports;"</comment>
-<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="1" l10n="U" oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
+<paragraph xml-lang="en-US" id="hd_id3150616" role="heading" level="1" l10n="U"
+ oldref="17"><variable id="error_report"><link href="text/shared/guide/error_report.xhp" name="Error Report Tool">Error Report Tool</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs. If the program enters into an endless loop, so that it does not respond to mouse-clicks or keypresses, you can also start the Error Report Tool manually.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="3">Sun Microsystems is committed to respecting your online privacy and recognizes your need for appropriate protection and management of any personally identifiable information you share with us. See the statement at http://www.sun.com/privacy/ on your online data privacy at Sun Microsystems.</paragraph>
-<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
-<paragraph role="paragraph" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically. However, if the program seems to be stuck and the tool does not start automatically, you can start the tool manually:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="6">Go to the {office_install_path}<switchinline select="sys"><caseinline select="WIN">\
-</caseinline><defaultinline>/</defaultinline></switchinline>program folder and start the crashrep<switchinline select="sys"><caseinline select="WIN">.exe
-</caseinline></switchinline> file.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
-<paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
-<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
-<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
-<paragraph role="warning" id="par_id3149670" xml-lang="en-US" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
-<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
-<paragraph role="heading" id="hd_id3150792" xml-lang="en-US" level="2" l10n="U" oldref="13">What Data is Sent?</paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs.<comment>removed sentene about manually - i96770</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147335" role="paragraph" l10n="U" oldref="8">On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159399" role="heading" level="2" l10n="U" oldref="9">Sending the Error Report</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150504" role="paragraph" l10n="U" oldref="10">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149670" role="warning" l10n="U" oldref="11">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153526" role="paragraph" l10n="U" oldref="12">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you allow to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150792" role="heading" level="2" l10n="U"
+ oldref="13">What Data is Sent?</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154366" role="paragraph" l10n="U" oldref="14">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151177" role="paragraph" l10n="U" oldref="15">In addition, relevant memory contents and stack traces are gathered by some system standard tools ("dbhhelp.dll" on Windows systems, "pstack" on UNIX systems). This information will be sent also.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 44fb30f082..e9d5e1909e 100755
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: export_ms.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -69,7 +66,7 @@
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Standard file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index aae5cd1ff7..30c42f8c56 100755
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: fax.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -65,7 +62,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/filternavigator.xhp b/helpcontent2/source/text/shared/guide/filternavigator.xhp
index 716e6d5cd4..88dfc2e075 100644
--- a/helpcontent2/source/text/shared/guide/filternavigator.xhp
+++ b/helpcontent2/source/text/shared/guide/filternavigator.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: filternavigator.xhp,v $
- * $Revision: 1.8.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/find_attributes.xhp b/helpcontent2/source/text/shared/guide/find_attributes.xhp
index c825e9ade7..f48d268976 100644
--- a/helpcontent2/source/text/shared/guide/find_attributes.xhp
+++ b/helpcontent2/source/text/shared/guide/find_attributes.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: find_attributes.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index b01bc6ebdc..c119756122 100755
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: flat_icons.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,7 +55,7 @@ checked -yj</lastedited>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="CHG" oldref="4">You can change the icon view between small and large icons.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - Options - $[officename]</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>View</emph> tab page, select the <emph>Toolbar icon size</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
index 2c4c253758..ced9492191 100644
--- a/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
+++ b/helpcontent2/source/text/shared/guide/floating_toolbar.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: floating_toolbar.xhp,v $
- * $Revision: 1.16.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index d7f5a07157..90247d93ce 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: fontwork.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,97 +31,97 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
-<filename>/text/shared/guide/fontwork.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguidefontworkxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Fontwork For Graphical Text Art</title>
+ <filename>/text/shared/guide/fontwork.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3696707"><bookmark_value>graphical text art</bookmark_value>
-<bookmark_value>designing; fonts</bookmark_value>
-<bookmark_value>TextArt, see Fontwork</bookmark_value>
-<bookmark_value>WordArt, see Fontwork</bookmark_value>
-<bookmark_value>Fontwork icons</bookmark_value>
-<bookmark_value>text effects</bookmark_value>
-<bookmark_value>effects; Fontwork icons</bookmark_value>
-<bookmark_value>text; Fontwork icons</bookmark_value>
-<bookmark_value>3D text creation</bookmark_value>
-<bookmark_value>rotating;3D text</bookmark_value>
-<bookmark_value>editing;Fontwork objects</bookmark_value>
-<bookmark_value>inserting;Fontwork objects</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
+ <bookmark_value>designing; fonts</bookmark_value>
+ <bookmark_value>TextArt, see Fontwork</bookmark_value>
+ <bookmark_value>WordArt, see Fontwork</bookmark_value>
+ <bookmark_value>Fontwork</bookmark_value>
+ <bookmark_value>text effects</bookmark_value>
+ <bookmark_value>effects; Fontwork icons</bookmark_value>
+ <bookmark_value>text; Fontwork icons</bookmark_value>
+ <bookmark_value>3D text creation</bookmark_value>
+ <bookmark_value>rotating;3D text</bookmark_value>
+ <bookmark_value>editing;Fontwork objects</bookmark_value>
+ <bookmark_value>inserting;Fontwork objects</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="par_idN1066D" role="heading" level="1" l10n="NEW"><variable id="fontwork"><link href="text/shared/guide/fontwork.xhp">Fontwork For Graphical Text Art</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
-<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1701inch" height="0.1701inch"><alt xml-lang="en-US" id="alt_id7040009">Fontwork icon</alt>
+ <paragraph xml-lang="en-US" id="par_idN1068B" role="paragraph" l10n="NEW">You can use Fontwork to create graphical text art objects.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="heading" level="2" l10n="NEW">To create a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0202200911373965" role="paragraph" l10n="NEW">If you don't see the Drawing toolbar or the Fontwork toolbar, choose <item type="menuitem">View - Toolbars</item> to enable the toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1069C" role="paragraph" l10n="CHG">On the <emph>Drawing</emph> toolbar or on the <emph>Fontwork</emph> toolbar, click the <emph>Fontwork Gallery</emph> icon.
+<image id="img_id7040009" src="res/commandimagelist/sc_fontworkgalleryfloater.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id7040009">Icon</alt>
</image></paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="NEW">Click the Fontwork object.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="NEW">Click the Fontwork object to select it.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
- <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
-
- </section>
- </body>
-</helpdocument>
+ </listitem>
+ <listitem>
+
+ <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+
+ <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="paragraph" l10n="NEW">Replace the default Fontwork text with your own text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106A8" role="paragraph" l10n="NEW">Press Esc to exit text edit mode.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2" l10n="NEW">To edit a Fontwork object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph" l10n="NEW">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106BC" role="paragraph" l10n="NEW">Click an icon in the <emph>Fontwork</emph> toolbar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10839" role="paragraph" l10n="NEW">The following icons are available:</paragraph>
+ </listitem>
+ </list>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="paragraph" l10n="CHG">Fontwork Gallery - adds another Fontwork object</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Fontwork Shape - edits the shape</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106CD" role="paragraph" l10n="NEW">Fontwork Same Letter Heights - changes the height of characters</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D5" role="paragraph" l10n="NEW">Fontwork Alignment - aligns the text</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106D9" role="paragraph" l10n="NEW">Fontwork Character Spacing - changes the character spacing and kerning</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2" l10n="NEW">To edit more Fontwork attributes</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph" l10n="CHG">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph" l10n="NEW">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
+ <embed href="text/shared/01/05280000.xhp#fntwrk"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp
index 9644516874..0dec8b59a3 100755
--- a/helpcontent2/source/text/shared/guide/formfields.xhp
+++ b/helpcontent2/source/text/shared/guide/formfields.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: formfields.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,79 +31,66 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
-<filename>/text/shared/guide/formfields.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
+ <filename>/text/shared/guide/formfields.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>command buttons, see push buttons</bookmark_value>
-<bookmark_value>controls;adding to documents</bookmark_value>
-<bookmark_value>inserting;push buttons</bookmark_value>
-<bookmark_value>keys;adding push buttons</bookmark_value>
-<bookmark_value>buttons;adding push buttons</bookmark_value>
-<bookmark_value>press buttons, see push buttons</bookmark_value>
-<bookmark_value>push buttons;adding to documents</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
+ <bookmark_value>controls;adding to documents</bookmark_value>
+ <bookmark_value>inserting;push buttons</bookmark_value>
+ <bookmark_value>keys;adding push buttons</bookmark_value>
+ <bookmark_value>buttons;adding push buttons</bookmark_value>
+ <bookmark_value>press buttons, see push buttons</bookmark_value>
+ <bookmark_value>push buttons;adding to documents</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="2">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="3">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/gallery_insert.xhp b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
index b23cc2f0b9..42ffad6a96 100755
--- a/helpcontent2/source/text/shared/guide/gallery_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/gallery_insert.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: gallery_insert.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/groups.xhp b/helpcontent2/source/text/shared/guide/groups.xhp
index d40b58e664..1c403a5832 100644
--- a/helpcontent2/source/text/shared/guide/groups.xhp
+++ b/helpcontent2/source/text/shared/guide/groups.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: groups.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
index ec560220f6..9b30ae6c30 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_edit.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
index 079c8d999e..086c1678c2 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_insert.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index f10a2fcbb1..f94ada5bef 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_rel_abs.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -53,16 +50,16 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="46">When you include hyperlinks, two factors must be taken into account: whether they are set as relative or absolute on saving, and whether or not the file is present.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
+<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.sun.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
+<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.example.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="51">$[officename] also reacts differently, depending on whether the file referred to in the link exists, and where it is located. $[officename] checks every new link and sets a target and protocol automatically. The result can be seen in the generated HTML code after saving the source document.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
index 7d8f67dbdd..d97a2dc8b9 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: hyperlink_search.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,7 +63,7 @@ checked - yj</lastedited>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar"><emph>Tools - Options - Internet - Search</emph></link> to define the search options.</paragraph>
+<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</link></emph> to define the search options.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4204c518e..b4a3f896e1 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: imagemap.xhp,v $
- * $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,26 +31,21 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
-<filename>/text/shared/guide/imagemap.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
+ <filename>/text/shared/guide/imagemap.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>ImageMap; editor</bookmark_value>
-<bookmark_value>editors; ImageMap editor</bookmark_value>
-<bookmark_value>images; ImageMap</bookmark_value>
-<bookmark_value>pictures; ImageMap</bookmark_value>
-<bookmark_value>hotspots</bookmark_value>
-<bookmark_value>URL;in pictures</bookmark_value>
-</bookmark>
- <comment>mw added 2 index entries</comment>
- <paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
+ <bookmark_value>editors; ImageMap editor</bookmark_value>
+ <bookmark_value>images; ImageMap</bookmark_value>
+ <bookmark_value>pictures; ImageMap</bookmark_value>
+ <bookmark_value>hotspots;adding to images</bookmark_value>
+ <bookmark_value>URL;in pictures</bookmark_value>
+</bookmark><comment>mw added 2 index entries</comment><comment>MW made "hotspots" a two level entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW">An ImageMap allows you to attach URLs to specific areas, called hotspots, on a picture in your document. An image map is a group of one or more hotspots.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW">You can draw three types of hotspots: rectangles, ellipses, and polygons. When you click a hotspot, the URL is opened in the browser window or frame that you specify. You can also specify the text that appears when your mouse rests on the hotspot.</paragraph>
@@ -71,7 +62,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">Use the icons in the ImageMap Editor to draw a hotspot shape, for example a rectangle, over the image at the background.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106AB" role="paragraph" l10n="NEW">Enter the "Address" URL that will be shown in a Web browser when the user clicks the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index ed09d43352..ae56c248b3 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: import_ms.xhp,v $
- * $Revision: 1.14 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,31 +31,33 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Opening documents saved in other formats</title>
-<filename>/text/shared/guide/import_ms.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+ <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title>
+ <filename>/text/shared/guide/import_ms.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="chapter_all">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153988"><bookmark_value>Microsoft Office;opening Microsoft documents</bookmark_value>
-<bookmark_value>documents; importing</bookmark_value>
-<bookmark_value>importing; documents in other formats</bookmark_value>
-<bookmark_value>opening; documents from other formats</bookmark_value>
-<bookmark_value>loading; documents from other formats</bookmark_value>
-<bookmark_value>converting;Microsoft documents</bookmark_value>
-<bookmark_value>saving; default file formats</bookmark_value>
-<bookmark_value>defaults; file formats in file dialogs</bookmark_value>
-<bookmark_value>file formats; saving always in other formats</bookmark_value>
-<bookmark_value>Microsoft Office; as standard file format</bookmark_value>
-<bookmark_value>files;importing</bookmark_value>
-<bookmark_value>XML converters</bookmark_value>
-<bookmark_value>converters; XML</bookmark_value>
-<bookmark_value>Document Converter Wizard</bookmark_value>
-<bookmark_value>wizards; document converter</bookmark_value>
-</bookmark><comment>MW made file import a two level entry ("files;importing")</comment><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
+ <bookmark_value>documents; importing</bookmark_value>
+ <bookmark_value>importing; documents in other formats</bookmark_value>
+ <bookmark_value>opening; documents from other formats</bookmark_value>
+ <bookmark_value>loading; documents from other formats</bookmark_value>
+ <bookmark_value>converting;Microsoft documents</bookmark_value>
+ <bookmark_value>saving; default file formats</bookmark_value>
+ <bookmark_value>defaults;document formats in file dialogs</bookmark_value>
+ <bookmark_value>file formats; saving always in other formats</bookmark_value>
+ <bookmark_value>Microsoft Office; as default file format</bookmark_value>
+ <bookmark_value>files;importing</bookmark_value>
+ <bookmark_value>XML converters</bookmark_value>
+ <bookmark_value>converters; XML</bookmark_value>
+ <bookmark_value>Document Converter Wizard</bookmark_value>
+ <bookmark_value>wizards; document converter</bookmark_value>
+ <bookmark_value>converters; document converter</bookmark_value>
+ <bookmark_value>files, see also documents</bookmark_value>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
<list type="ordered">
@@ -73,7 +71,7 @@
<paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Standard file format</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
<list type="unordered">
@@ -82,27 +80,29 @@
</listitem>
</list>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id4563127" xml-lang="en-US" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id9207434" xml-lang="en-US" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
-<paragraph role="listitem" id="par_id7215491" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id2299874" xml-lang="en-US" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<paragraph role="listitem" id="par_id1727347" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9207434" role="listitem" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7215491" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2299874" role="listitem" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1727347" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
+ </listitem>
+ </list>
</case>
-</switch></section>
-<section id="relatedtopics">
-<embed href="text/shared/00/00000021.xhp#xmlformat"/>
-<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+</switch>
</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/shared/00/00000021.xhp#xmlformat"/>
+ <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index c0f06f2f30..f40f0da77f 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: insert_bitmap.xhp,v $
- * $Revision: 1.14.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,8 +76,7 @@
<paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
<paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
<paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
-<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
index 1a69bdf849..8a238e241b 100644
--- a/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_graphic_drawit.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: insert_graphic_drawit.xhp,v $
- * $Revision: 1.17.4.3 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,70 +32,71 @@
<meta>
-<topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
-<title id="tit" xml-lang="en-US">Editing Graphic Objects </title>
-<filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideinsert_graphic_drawitxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Editing Graphic Objects </title>
+ <filename>/text/shared/guide/insert_graphic_drawit.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145136"><bookmark_value>resizing, see also scaling/zooming</bookmark_value>
-<bookmark_value>scaling, see also zooming</bookmark_value>
-<bookmark_value>drawings, see also draw objects</bookmark_value>
-<bookmark_value>graphic objects, see also draw objects</bookmark_value>
-<bookmark_value>text; drawing pictures</bookmark_value>
-<bookmark_value>inserting; drawings</bookmark_value>
-<bookmark_value>pictures; drawing</bookmark_value>
-<bookmark_value>objects; copying when moving in presentations</bookmark_value>
-<bookmark_value>draw objects; adding/editing/copying</bookmark_value>
-<bookmark_value>circle drawings</bookmark_value>
-<bookmark_value>square drawings</bookmark_value>
-<bookmark_value>handles; scaling</bookmark_value>
-<bookmark_value>scaling; objects</bookmark_value>
-<bookmark_value>objects;moving and resizing with mouse</bookmark_value>
-<bookmark_value>resizing;objects, by mouse</bookmark_value>
-<bookmark_value>copying; draw objects</bookmark_value>
-<bookmark_value>pasting;draw objects</bookmark_value>
-<bookmark_value>editing;draw objects</bookmark_value>
-<bookmark_value>pictures;scaling/resizing</bookmark_value>
+ <bookmark_value>scaling, see also zooming</bookmark_value>
+ <bookmark_value>drawings, see also draw objects</bookmark_value>
+ <bookmark_value>graphic objects, see draw objects</bookmark_value>
+ <bookmark_value>text; drawing pictures</bookmark_value>
+ <bookmark_value>inserting; drawings</bookmark_value>
+ <bookmark_value>pictures; drawing</bookmark_value>
+ <bookmark_value>objects; copying when moving in presentations</bookmark_value>
+ <bookmark_value>draw objects; adding/editing/copying</bookmark_value>
+ <bookmark_value>circle drawings</bookmark_value>
+ <bookmark_value>square drawings</bookmark_value>
+ <bookmark_value>handles; scaling</bookmark_value>
+ <bookmark_value>scaling; objects</bookmark_value>
+ <bookmark_value>objects;moving and resizing with mouse</bookmark_value>
+ <bookmark_value>resizing;objects, by mouse</bookmark_value>
+ <bookmark_value>copying; draw objects</bookmark_value>
+ <bookmark_value>pasting;draw objects</bookmark_value>
+ <bookmark_value>editing;draw objects</bookmark_value>
+ <bookmark_value>pictures;scaling/resizing</bookmark_value>
</bookmark><comment>MW added "graphic objects, see also..."</comment>
-<paragraph role="heading" id="hd_id3145136" xml-lang="en-US" level="1" l10n="U" oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
+<paragraph xml-lang="en-US" id="hd_id3145136" role="heading" level="1" l10n="U"
+ oldref="11"><variable id="insert_graphic_drawit"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Editing Graphic Objects">Editing Graphic Objects</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
-<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149164" xml-lang="en-US" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
+ <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="CHG" oldref="9">Choose <emph>View - Toolbars - Drawing</emph> to open the <emph>Drawing</emph> toolbar, if it is not already open.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="2">Drawing objects can be subsequently edited and modified. Drawing objects created in this way are vector graphics, which you can scale freely without any loss of quality.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="3">To create a rectangle, click the rectangle icon and move your cursor to the place in the document where you want one corner of the rectangle to be. Press the mouse button and hold it down while dragging to the opposite corner of the rectangle. When you release the mouse button, the rectangle is inserted in the document. It is selected, and you can edit its properties through the context menu.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149164" role="listitem" l10n="CHG" oldref="13"><switchinline select="appl"><caseinline select="DRAW">To draw multiple objects of the same type, double-click the icon.
</caseinline><caseinline select="IMPRESS">To draw multiple objects of the same type, double-click the icon.
</caseinline><defaultinline>Draw multiple objects of the same type. Click the document without moving the mouse to stop drawing objects.</defaultinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148473" role="listitem" l10n="U" oldref="4">If you want to open up draw objects from the center instead of dragging from one corner to the other, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while dragging. <switchinline select="sys"><caseinline select="UNIX">With some window managers, you may need to hold down also the meta key.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id9448225" xml-lang="en-US" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153626" xml-lang="en-US" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id224616" xml-lang="en-US" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9448225" role="listitem" l10n="CHG">Holding down the Shift key while dragging restricts the created object. For example, instead of a rectangle you get a square, instead of an ellipse you get a circle. When you drag a handle of an existing object with Shift held down, the aspect ratio of the object is retained.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153626" role="listitem" l10n="U" oldref="5">To scale the objects, first select them by clicking on them with the selection tool. You then see eight handles around the object. When you drag one of the four corner handles, the opposite corner remains fixed while the other three corners move. When you drag one of the side handles, the opposite side remains fixed.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id224616" role="listitem" l10n="NEW">To scale a draw object using the keyboard, first select the object, then press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key. Press Esc to leave the point edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149669" xml-lang="en-US" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id7199316" xml-lang="en-US" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149669" role="listitem" l10n="CHG" oldref="6">To move draw objects, first select them. To select more than one object, press the Shift key while clicking. Select text objects by clicking exactly on their edge. While holding down the mouse button, drag the objects to the new location.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7199316" role="listitem" l10n="NEW">To move a draw object using the keyboard, first select the object, then press an arrow key. To move in smaller steps, hold down the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> key while pressing an arrow key.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_id3156422" xml-lang="en-US" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3156422" role="note" l10n="CHG" oldref="8">To revert to normal text mode after creating and editing draw objects, click in an area of the document containing no draw or other objects. If you see a drawing cursor, first exit this mode by clicking the <emph>Select</emph> icon.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="10"><link href="text/shared/02/01140000.xhp" name="Information about the individual icons">Information about the individual icons</link></paragraph>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
</case>
@@ -124,5 +122,5 @@
</case>
</switch>
</section>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index eed0aeebac..ad1e8063e0 100755..100644
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -6,13 +6,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: insert_specialchar.xhp,v $
- * $Revision: 1.12.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -64,13 +61,13 @@
<paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find &amp; Replace</emph> dialog) you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
+<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Sun Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
+<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
</caseinline></switchinline></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/integratinguno.xhp b/helpcontent2/source/text/shared/guide/integratinguno.xhp
index f4057127b1..426c22d62b 100755
--- a/helpcontent2/source/text/shared/guide/integratinguno.xhp
+++ b/helpcontent2/source/text/shared/guide/integratinguno.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: integratinguno.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index df46aff9da..a578bc236b 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: keyboard.xhp,v $
- * $Revision: 1.15.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,370 +31,415 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Shortcuts (%PRODUCTNAME Accessibility)</title>
-<filename>/text/shared/guide/keyboard.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidekeyboardxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Shortcuts (%PRODUCTNAME Accessibility)</title>
+ <filename>/text/shared/guide/keyboard.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3158421"><bookmark_value>accessibility;general shortcuts</bookmark_value>
-<bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
+ <bookmark_value>shortcut keys; %PRODUCTNAME accessibility</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3158421" xml-lang="en-US" level="1" l10n="U" oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
+<paragraph xml-lang="en-US" id="hd_id3158421" role="heading" level="1" l10n="U"
+ oldref="52"><variable id="keyboard"><link href="text/shared/guide/keyboard.xhp" name="Shortcuts (%PRODUCTNAME Accessibility)">Shortcuts (<item type="productname">%PRODUCTNAME</item> Accessibility)</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3159201" xml-lang="en-US" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
-<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
-<embed href="text/shared/00/00000099.xhp#keys"/>
-<paragraph role="heading" id="hd_id3166460" xml-lang="en-US" level="2" l10n="U" oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
-<paragraph role="heading" id="hd_id3154749" xml-lang="en-US" level="3" l10n="U" oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
-<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="37">menu bar,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149234" xml-lang="en-US" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="35">every free window from left to right,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="34">document</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph>
-<paragraph role="paragraph" id="par_id3152473" xml-lang="en-US" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152360" xml-lang="en-US" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
-<paragraph role="heading" id="hd_id3161656" xml-lang="en-US" level="3" l10n="U" oldref="21">Calling a menu command</paragraph>
-<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
-<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
-<paragraph role="heading" id="hd_id3147086" xml-lang="en-US" level="3" l10n="U" oldref="17">Executing an icon command</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
-<paragraph role="paragraph" id="par_id3144433" xml-lang="en-US" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153968" xml-lang="en-US" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150449" xml-lang="en-US" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
-<paragraph role="heading" id="hd_id3150440" xml-lang="en-US" level="3" l10n="U" oldref="14">Special hints for toolbars</paragraph>
-<paragraph role="paragraph" id="par_id3149983" xml-lang="en-US" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
-<paragraph role="paragraph" id="par_id3145365" xml-lang="en-US" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="3" l10n="U" oldref="11">Selection from a combo box</paragraph>
-<table id="tbl_id3147427">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146986" xml-lang="en-US" l10n="E">
-<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.7602inch" height="0.4898inch" localize="true"><alt id="alt_id3148645" xml-lang="en-US">Combo box</alt>
+ <paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="25">You can control <item type="productname">%PRODUCTNAME</item> without using a mouse device, using only the keyboard.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="24">On each module's main help page (for example, the <item type="productname">%PRODUCTNAME</item> Writer or <item type="productname">%PRODUCTNAME</item> Calc main help page) there is a link to access the keyboard shortcuts' help for that module.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145382" role="paragraph" l10n="U" oldref="23">In addition, under the keyword "Accessibility" you find step-by-step instructions about how to control the selected module without a mouse device.</paragraph>
+ <embed href="text/shared/00/00000099.xhp#keys"/>
+ <paragraph xml-lang="en-US" id="hd_id3166460" role="heading" level="2" l10n="U"
+ oldref="22">Working with the <item type="productname">%PRODUCTNAME</item> user interface without mouse</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154749" role="heading" level="3" l10n="U"
+ oldref="39">Activating menu bar, toolbars, windows, and document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156329" role="paragraph" l10n="U" oldref="38">Repeatedly pressing F6 switches the focus and circles through the following objects:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150669" role="listitem" l10n="U" oldref="37">menu bar,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149234" role="listitem" l10n="U" oldref="36">every toolbar from top to bottom and from left to right,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="35">every free window from left to right,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="34">document</paragraph>
+ </listitem>
+ </list><comment>removed para about Ctrl+Tab</comment>
+<paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 to switch through objects in the opposite direction.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3161656" role="heading" level="3" l10n="U"
+ oldref="21">Calling a menu command</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151056" role="paragraph" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153381" role="paragraph" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147086" role="heading" level="3" l10n="U"
+ oldref="17">Executing an icon command</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144433" role="paragraph" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150449" role="listitem" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="26">If a toolbar is longer than can be displayed on screen, it shows an icon at the right or lower edge. Select the toolbar and press PageUp or PageDown to display the remaining icons.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150440" role="heading" level="3" l10n="U"
+ oldref="14">Special hints for toolbars</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149983" role="paragraph" l10n="U" oldref="13">Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="12">Close the toolbar with Esc. It is not possible to move the toolbar without a mouse.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="3" l10n="U"
+ oldref="11">Selection from a combo box</paragraph>
+ <table id="tbl_id3147427">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146986" role="paragraph" l10n="E">
+<image id="img_id3148645" src="res/helpimg/zellvor.png" width="1.15in" height="0.3165in" localize="true"><alt xml-lang="en-US" id="alt_id3148645">Combo box</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149666" xml-lang="en-US" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
-<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
-<paragraph role="paragraph" id="par_id3145749" xml-lang="en-US" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="heading" id="hd_id3150685" xml-lang="en-US" level="3" l10n="U" oldref="41">Selection in Tables</paragraph>
-<paragraph role="paragraph" id="par_id3154320" xml-lang="en-US" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="45">Shift+Spacebar: selection of the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153221" xml-lang="en-US" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
-<paragraph role="listitem" id="par_id3148456" xml-lang="en-US" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155083" xml-lang="en-US" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147497" xml-lang="en-US" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146988" xml-lang="en-US" level="3" l10n="U" oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154479" xml-lang="en-US" level="3" l10n="U" oldref="148">Selecting objects</paragraph>
-<paragraph role="paragraph" id="par_id3148993" xml-lang="en-US" l10n="CHG" oldref="149">Press <item type="keycode">Shift+F4</item> to select the first object in the current document. When an object is selected, press <item type="keycode">Tab</item> to select the next object, or press <item type="keycode">Esc</item> to go back to the text.</paragraph>
-<paragraph role="heading" id="hd_id3152962" xml-lang="en-US" level="3" l10n="U" oldref="54">Edit Objects</paragraph>
-<paragraph role="paragraph" id="par_id3156379" xml-lang="en-US" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
-<paragraph role="heading" id="hd_id3155766" xml-lang="en-US" level="3" l10n="U" oldref="55">Edit Position and Size of Objects</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
-<paragraph role="listitem" id="par_id3145619" xml-lang="en-US" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166450" xml-lang="en-US" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147345" xml-lang="en-US" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149565" xml-lang="en-US" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="61">Edit the Anchors of Objects</paragraph>
-<paragraph role="paragraph" id="par_id3148534" xml-lang="en-US" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="63">Select the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150646" xml-lang="en-US" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150940" xml-lang="en-US" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149666" role="paragraph" l10n="U" oldref="10">Select the combo box. Press Enter.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155366" role="paragraph" l10n="U" oldref="9">Use the down arrow or Page Down key to scroll down the combo box entries, or the up arrow or Page Up key to scroll upwards. The Home key takes you to the first entry and the End key takes you to the last entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" oldref="8">Press Enter to execute the selected entry.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="hd_id3150685" role="heading" level="3" l10n="U"
+ oldref="41">Selection in Tables</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154320" role="paragraph" l10n="U" oldref="42">In several windows, dialogs, and in the table control field, there are tables to select data, for instance, in the right part of the <link href="text/shared/guide/database_main.xhp" name="Data Source View">Data Source View</link>. The following keys are used for selections in these tables:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154014" role="listitem" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147396" role="listitem" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149488" role="listitem" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar: switches between selection of the current column and cancellation of this selection.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145251" role="listitem" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3150592" role="heading" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153221" role="listitem" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148456" role="listitem" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149400" role="listitem" l10n="U" oldref="4">Choose a command (down arrow, then Enter).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155083" role="listitem" l10n="U" oldref="3">Now you can use the arrow keys to move or resize the dialog or window.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147497" role="listitem" l10n="U" oldref="2">Press Enter to accept the change. Press Escape to cancel the changes.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146988" role="heading" level="3" l10n="U"
+ oldref="150">Docking and Undocking Windows and Toolbars</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147176" role="listitem" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="listitem" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3154479" role="heading" level="3" l10n="U"
+ oldref="148">Selecting objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press Shift+F4 to select the first object in the current document. When an object is selected, press Tab to select the next object, or press Esc to go back to the text.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152962" role="heading" level="3" l10n="U"
+ oldref="54">Edit Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="3" l10n="U"
+ oldref="55">Edit Position and Size of Objects</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148405" role="listitem" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147345" role="listitem" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="60">In the handle edit mode, the arrow keys move the selected handle, which changes the object size.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3147361" role="heading" level="3" l10n="U"
+ oldref="61">Edit the Anchors of Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148534" role="paragraph" l10n="U" oldref="62">You can move the anchor of an object with the arrow keys. First enter the handle edit mode and select the anchor. Depending on the type of anchor, you can then move the anchor in different directions.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163808" role="listitem" l10n="U" oldref="63">Select the object.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150646" role="listitem" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150940" role="listitem" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153919" xml-lang="en-US" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148393" xml-lang="en-US" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145256" xml-lang="en-US" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149527" xml-lang="en-US" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="133">Controlling the Dividing Lines</paragraph>
-<paragraph role="paragraph" id="par_id3158413" xml-lang="en-US" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149814" xml-lang="en-US" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163668" xml-lang="en-US" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148426" xml-lang="en-US" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150383" xml-lang="en-US" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150369" xml-lang="en-US" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
-</listitem>
-</list>
-<section id="datenquellentext">
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="112">Controlling the Data Source View</paragraph>
-<paragraph role="paragraph" id="par_id3150515" xml-lang="en-US" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
-<paragraph role="paragraph" id="par_id3159109" xml-lang="en-US" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
-<paragraph role="paragraph" id="par_id3153229" xml-lang="en-US" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3150312" xml-lang="en-US" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
-<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="3" l10n="U" oldref="118">Shortcuts in the Query Design Window</paragraph>
-<paragraph role="paragraph" id="par_id3152455" xml-lang="en-US" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
-<paragraph role="paragraph" id="par_id3151180" xml-lang="en-US" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
-<paragraph role="heading" id="hd_id3156288" xml-lang="en-US" level="3" l10n="U" oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
-<paragraph role="paragraph" id="par_id3156166" xml-lang="en-US" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
-<paragraph role="paragraph" id="par_id3147310" xml-lang="en-US" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3152986" xml-lang="en-US" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3145384" xml-lang="en-US" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
-<paragraph role="paragraph" id="par_id3154529" xml-lang="en-US" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
-<paragraph role="paragraph" id="par_id3159624" xml-lang="en-US" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
-<paragraph role="heading" id="hd_id3153816" xml-lang="en-US" level="3" l10n="U" oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
-<paragraph role="paragraph" id="par_id3159170" xml-lang="en-US" l10n="U" oldref="129">Shift+Space key: selects the column in the selection area, so you can open its context menu.</paragraph>
-<paragraph role="paragraph" id="par_id3156198" xml-lang="en-US" l10n="U" oldref="130">Space key: selects the row. Cancels previous selection.</paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
-<paragraph role="heading" id="hd_id3146152" xml-lang="en-US" level="3" l10n="U" oldref="131">Keys in the Table Design Window</paragraph>
-<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
-</section>
-<section id="imagemaptext">
-<paragraph role="heading" id="hd_id3145075" xml-lang="en-US" level="2" l10n="U" oldref="74">Controlling the ImageMap Editor</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3159096" xml-lang="en-US" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156016" xml-lang="en-US" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149587" xml-lang="en-US" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154343" xml-lang="en-US" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147073" xml-lang="en-US" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153285" xml-lang="en-US" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
-</listitem>
-</list>
-</section>
-<paragraph role="heading" id="hd_id3145377" xml-lang="en-US" level="2" l10n="U" oldref="46">Controlling the Help</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
-<paragraph role="heading" id="hd_id3154960" xml-lang="en-US" level="3" l10n="U" oldref="48">Navigating the main help pages</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151300" xml-lang="en-US" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155537" xml-lang="en-US" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154912" xml-lang="en-US" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3150894" xml-lang="en-US" level="2" l10n="U" oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
-<paragraph role="heading" id="hd_id3153975" xml-lang="en-US" level="3" l10n="U" oldref="82">Ruler</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152869" xml-lang="en-US" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151000" xml-lang="en-US" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159203" xml-lang="en-US" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154538" xml-lang="en-US" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155382" xml-lang="en-US" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155894" xml-lang="en-US" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154647" xml-lang="en-US" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154765" xml-lang="en-US" l10n="U" oldref="91">Delete key: delete a split</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154650" xml-lang="en-US" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145368" xml-lang="en-US" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155914" xml-lang="en-US" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147492" xml-lang="en-US" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145216" xml-lang="en-US" level="3" l10n="U" oldref="96">Preview</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155148" xml-lang="en-US" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150780" xml-lang="en-US" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146962" xml-lang="en-US" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147512" xml-lang="en-US" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153559" xml-lang="en-US" l10n="U" oldref="102">Space key: select the current column and deselect all of the other columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153804" xml-lang="en-US" l10n="U" oldref="103">Ctrl+Space key: select or deselect the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154733" xml-lang="en-US" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154171" xml-lang="en-US" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156368" xml-lang="en-US" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151192" xml-lang="en-US" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150416" xml-lang="en-US" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166442" xml-lang="en-US" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146103" xml-lang="en-US" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153298" xml-lang="en-US" level="2" l10n="U" oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153073" xml-lang="en-US" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153295" xml-lang="en-US" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153958" xml-lang="en-US" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/04/01010000.xhp#common_keys"/>
-<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-</body>
-</helpdocument>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153919" role="listitem" l10n="U" oldref="66">Use the arrow keys to move the anchor. The object follows the anchor as appropriate.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="67">You can change the anchor of the selected object for example in the object's context menu.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148393" role="listitem" l10n="U" oldref="68">If the object is anchored <emph>To Paragraph</emph>, the arrow keys move the object to the previous or next paragraph.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145615" role="listitem" l10n="U" oldref="69">If the object is anchored<emph> To page</emph>, the keys Page Up or Page Down move it to the previous or next page.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145135" role="listitem" l10n="U" oldref="70">If the object is anchored <emph>To character</emph>, the Arrow keys move it through the current paragraph.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145256" role="listitem" l10n="U" oldref="71">If the object is anchored<emph> As character</emph>, no anchor icon exists. You cannot move the object.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149527" role="listitem" l10n="U" oldref="72">If the object is anchored <emph>To frame</emph>, the Arrow keys move it to the next frame in the respective direction.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+ oldref="133">Controlling the Dividing Lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158413" role="paragraph" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149814" role="listitem" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3158444" role="listitem" l10n="U" oldref="136">Arrow keys: moves the current dividing line a big step in the arrow direction.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163668" role="listitem" l10n="U" oldref="137">Shift+Arrow keys: moves the current dividing line a small step in the arrow direction.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148426" role="listitem" l10n="U" oldref="138">Delete: deletes the current dividing line</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151277" role="listitem" l10n="U" oldref="139">Shift+Delete: deletes both dividing lines</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150383" role="listitem" l10n="U" oldref="140">Enter: fixes the current position of the dividing lines</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150369" role="listitem" l10n="U" oldref="141">Escape: resets the current dividing line to its default position</paragraph>
+ </listitem>
+ </list>
+ <section id="datenquellentext">
+ <paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U"
+ oldref="112">Controlling the Data Source View</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150515" role="paragraph" l10n="U" oldref="113">F4: opens and closes the data source view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159109" role="paragraph" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153229" role="paragraph" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150312" role="paragraph" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147171" role="heading" level="3" l10n="U"
+ oldref="118">Shortcuts in the Query Design Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152455" role="paragraph" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151180" role="paragraph" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156288" role="heading" level="3" l10n="U"
+ oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145384" role="paragraph" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154529" role="paragraph" l10n="U" oldref="126">Enter: when a connection is selected, the Enter key opens the <emph>Properties</emph> dialog of the connection.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153816" role="heading" level="3" l10n="U"
+ oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152896" role="paragraph" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146152" role="heading" level="3" l10n="U"
+ oldref="131">Keys in the Table Design Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151243" role="paragraph" l10n="CHG" oldref="132">F6: switches between toolbar, column view, and properties area.</paragraph>
+ </section>
+ <section id="imagemaptext">
+ <paragraph xml-lang="en-US" id="hd_id3145075" role="heading" level="2" l10n="U"
+ oldref="74">Controlling the ImageMap Editor</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159096" role="listitem" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156016" role="listitem" l10n="U" oldref="76">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149587" role="listitem" l10n="U" oldref="77">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154343" role="listitem" l10n="U" oldref="78">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147073" role="listitem" l10n="U" oldref="79">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153285" role="listitem" l10n="U" oldref="80">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3145377" role="heading" level="2" l10n="U"
+ oldref="46">Controlling the Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149441" role="paragraph" l10n="CHG" oldref="47">Press Shift+F1 to display the <link href="text/shared/main0108.xhp" name="Extended Tips">Extended Tips</link> for the currently selected command, icon or control.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154960" role="heading" level="3" l10n="U"
+ oldref="48">Navigating the main help pages</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151300" role="listitem" l10n="U" oldref="49">In the main help pages, use Tab to jump to the next hyperlink or Shift+Tab to jump to the previous link.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155537" role="listitem" l10n="U" oldref="50">Press Enter to execute the selected hyperlink.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154912" role="listitem" l10n="U" oldref="51">Press Backspace above the Enter key to return to the previous help page.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3150894" role="heading" level="2" l10n="U"
+ oldref="81">Controlling the Text Import dialog (CSV file import)</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153975" role="heading" level="3" l10n="U"
+ oldref="82">Ruler</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152869" role="listitem" l10n="U" oldref="83">Left or Right Arrow: go one position to the left or to the right</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151000" role="listitem" l10n="U" oldref="84">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159203" role="listitem" l10n="U" oldref="85">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154538" role="listitem" l10n="U" oldref="86">Home or End: jump to the first or the last possible position</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155382" role="listitem" l10n="U" oldref="87">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155894" role="listitem" l10n="U" oldref="88">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145195" role="listitem" l10n="U" oldref="89">Space key: insert or remove a split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154647" role="listitem" l10n="U" oldref="90">Insert key: insert a split (leave existing splits unchanged)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154765" role="listitem" l10n="U" oldref="91">Delete key: delete a split</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154650" role="listitem" l10n="U" oldref="92">Shift+Delete: delete all splits</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145368" role="listitem" l10n="U" oldref="93">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155914" role="listitem" l10n="U" oldref="94">Page Up or Page Down: scroll table down or up one page</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147492" role="listitem" l10n="U" oldref="95">Escape key (during mouse drag): cancel drag, move split to old position</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145216" role="heading" level="3" l10n="U"
+ oldref="96">Preview</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="U" oldref="97">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150780" role="listitem" l10n="U" oldref="98">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153811" role="listitem" l10n="U" oldref="99">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146962" role="listitem" l10n="U" oldref="100">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147512" role="listitem" l10n="U" oldref="101">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154733" role="listitem" l10n="U" oldref="104">Shift+Space key: select the range from the last selected column to the current column</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154171" role="listitem" l10n="U" oldref="105">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156368" role="listitem" l10n="U" oldref="106">Ctrl+A: select all columns</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151192" role="listitem" l10n="U" oldref="107">Shift+F10: open a context menu</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150416" role="listitem" l10n="U" oldref="108">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166442" role="listitem" l10n="U" oldref="109">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146103" role="listitem" l10n="U" oldref="110">Page Up or Page Down: scroll table down or up one page</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145116" role="listitem" l10n="U" oldref="111">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2" l10n="U"
+ oldref="142">Controlling the Insert - Special Character Dialog</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153073" role="listitem" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153295" role="listitem" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153958" role="listitem" l10n="U" oldref="145">Arrow buttons move through the main selection area. Spacebar adds the current character to the list of characters to be inserted.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/04/01010000.xhp#common_keys"/>
+ <embed href="text/shared/guide/accessibility.xhp#accessibility"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/labels.xhp b/helpcontent2/source/text/shared/guide/labels.xhp
index dd355b6918..3e343e0c0f 100755
--- a/helpcontent2/source/text/shared/guide/labels.xhp
+++ b/helpcontent2/source/text/shared/guide/labels.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: labels.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/labels_database.xhp b/helpcontent2/source/text/shared/guide/labels_database.xhp
index ea304c8e66..8f7f9f7e52 100644
--- a/helpcontent2/source/text/shared/guide/labels_database.xhp
+++ b/helpcontent2/source/text/shared/guide/labels_database.xhp
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: labels_database.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,67 +29,53 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing Address Labels</title>
-<filename>/text/shared/guide/labels_database.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelabels_databasexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Printing Address Labels</title>
+ <filename>/text/shared/guide/labels_database.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147399"><bookmark_value>address labels from databases</bookmark_value>
-<bookmark_value>labels; from databases</bookmark_value>
-<bookmark_value>stickers</bookmark_value>
-<bookmark_value>databases;creating labels</bookmark_value>
-</bookmark><comment>mw deleted "creating;"</comment><paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
+ <bookmark_value>labels; from databases</bookmark_value>
+ <bookmark_value>stickers</bookmark_value>
+ <bookmark_value>databases;creating labels</bookmark_value>
+</bookmark><comment>mw deleted "creating;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3147399" role="heading" level="1" l10n="U"
+ oldref="34"><variable id="labels_database"><link href="text/shared/guide/labels_database.xhp" name="Printing Address Labels">Printing Address Labels</link>
</variable></paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="CHG" oldref="37">Select the format of the label sheets you want to print on. Remember to mark <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10687" xml-lang="en-US" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="38">When you see the label document, open the data source view by choosing <emph>View - Data Sources</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3159413" xml-lang="en-US" l10n="U" oldref="58">In the data source view, select your address data source table.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="39">Drag the data fields needed for the Address individually into the top left label. For example, click on the column header NAME and, keeping the mouse button depressed, drag it into the label. This inserts a field. Put the fields in order to complete the address in the first label at top left.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="40">Place the cursor at the last text position (after the last field) in the first label.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="CHG" oldref="41">Choose <emph>Insert - Fields - Other</emph>, and go to the <emph>Database</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="42">Select the type <emph>Next record</emph>, click on <emph>Insert</emph> and then on <emph>Close</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="43">You can now synchronize the labels. Click on the <emph>Synchronize</emph>
-<emph>Labels</emph> button in the small window.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="44">In the data source view, select the records for which you would like address stickers, by clicking on the row headers to the left. Use the <item type="keycode">Shift</item> or <item type="keycode">Ctrl</item> key in the usual way to select several records at the same time.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3146972" xml-lang="en-US" l10n="CHG" oldref="45">On the Table Data bar, click the <emph>Data to Fields</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148484" xml-lang="en-US" l10n="CHG" oldref="25">You can then save and/or print the label document.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id8476821" xml-lang="en-US" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/labels.xhp#labels"/>
-</section>
-</body>
-</helpdocument>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="36">Choose <emph>File - New - Labels</emph> to open the <emph>Labels</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="37">On the <emph>Labels</emph> tab page, select the format of the label sheets you want to print on. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370863" role="paragraph" l10n="NEW">Choose the database and table from which to get the data.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id013020090337089" role="paragraph" l10n="NEW">Select a database field of which you want to print the contents. Click the button that shows a left arrow to insert the database field into the Label Text box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0130200903370930" role="paragraph" l10n="NEW">Continue to select and insert database fields if you want more fields on every label. You can press Enter to insert a new line, and you can type any character to insert fixed text.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0130200903370924" role="paragraph" l10n="NEW">Optionally, if you want to type more text, apply formatting, or insert images and line art, you should enable <emph>Synchronize contents</emph> on the <emph>Options</emph> tab. If you enable this, once you leave the Labels dialog box a small window opens with a Synchronize button. Now you only need to work on the first label on the labels document, then click the Synchronize button to copy your work to every label of the document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10687" role="paragraph" l10n="NEW">Click <emph>New Document</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148685" role="paragraph" l10n="CHG" oldref="38">When you see the label document, you might want to temporarily enable <item type="menuitem">View - Field Names</item>. This displays the fields in a more visible manner, so that you can arrange and edit label contents more easily.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148484" role="paragraph" l10n="CHG" oldref="25">You can save and/or print the label document.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id8476821" role="paragraph" l10n="NEW">When you choose to print the document, you will be asked if you want to print a form letter. Answer Yes to open the <link href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog. In the Mail Merge dialog, you can select the records for which you want to print labels.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/labels.xhp#labels"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 67297ff33f..bdccb0a0cc 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: language_select.xhp,v $
- * $Revision: 1.14 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,163 +29,154 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting the Document Language</title>
-<filename>/text/shared/guide/language_select.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidelanguage_selectxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Selecting the Document Language</title>
+ <filename>/text/shared/guide/language_select.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3083278"><bookmark_value>languages; selecting for text</bookmark_value>
-<bookmark_value>documents; languages</bookmark_value>
-<bookmark_value>characters; language selection</bookmark_value>
-<bookmark_value>character styles;language selection</bookmark_value>
-<bookmark_value>text; language selection</bookmark_value>
-<bookmark_value>paragraph styles; languages</bookmark_value>
-<bookmark_value>drawings; languages</bookmark_value>
-<bookmark_value>defaults;languages</bookmark_value>
-<bookmark_value>spellcheck; default languages</bookmark_value>
-<bookmark_value>dictionaries, see also languages</bookmark_value>
-</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment><paragraph role="heading" id="hd_id3083278" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
+ <bookmark_value>documents; languages</bookmark_value>
+ <bookmark_value>characters; language selection</bookmark_value>
+ <bookmark_value>character styles;language selection</bookmark_value>
+ <bookmark_value>text; language selection</bookmark_value>
+ <bookmark_value>paragraph styles; languages</bookmark_value>
+ <bookmark_value>drawings; languages</bookmark_value>
+ <bookmark_value>defaults;languages</bookmark_value>
+ <bookmark_value>spellcheck; default languages</bookmark_value>
+ <bookmark_value>dictionaries, see also languages</bookmark_value>
+</bookmark><comment>mw deleted "applying;" and changed "languages;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3083278" role="heading" level="1" l10n="U" oldref="1"><variable id="language_select"><link href="text/shared/guide/language_select.xhp" name="Selecting the Document Language">Selecting the Document Language</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153093" xml-lang="en-US" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152578" xml-lang="en-US" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3152886" xml-lang="en-US" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3083443" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149664" xml-lang="en-US" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3152938" xml-lang="en-US" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150872" xml-lang="en-US" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166413" xml-lang="en-US" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154942" xml-lang="en-US" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" l10n="U" oldref="15">Applying a language directly to selected text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159348" xml-lang="en-US" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155600" xml-lang="en-US" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
-<paragraph role="heading" id="hd_id3154272" xml-lang="en-US" level="2" l10n="U" oldref="21">Selecting a language for a Character Style</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3145649" xml-lang="en-US" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150753" xml-lang="en-US" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150321" xml-lang="en-US" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154756" xml-lang="en-US" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3155766" xml-lang="en-US" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
-</listitem>
-</list><comment>UFI: see i76182</comment><paragraph role="heading" id="hd_id8703268" xml-lang="en-US" level="2" l10n="NEW">Adding More Text Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id7919248" xml-lang="en-US" l10n="CHG">In OpenOffice.org software, you can choose <item type="menuitem">File - Wizards - Install new dictionaries</item> to open a Writer document which helps you to install more languages.<comment>this document is only available with OOo, not SO</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5174108" xml-lang="en-US" l10n="NEW">The document contains pages in many different languages. Click your own language on the first page to see the following instructions in your own language.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id2897427" xml-lang="en-US" l10n="NEW">Click the big button in the middle of the document page. This starts a macro to display more info and download the dictionary files.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3906979" xml-lang="en-US" l10n="NEW">Select to install the new files for the current user only or for all users (which requires write permission to the shared folder).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3998535" xml-lang="en-US" l10n="NEW">Click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6273995" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> button. After some short delay, you see a list of available Spelling dictionaries.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4401684" xml-lang="en-US" l10n="NEW">Select the languages for Spelling and click Next.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7082430" xml-lang="en-US" l10n="NEW">Click <item type="menuitem">Retrieve the list</item> and select languages for Hyphenation and for Thesaurus.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7718741" xml-lang="en-US" l10n="CHG">The macro downloads the files to the appropriate folder. After you click Finish, you must close OpenOffice.org software (including the Quickstarter), and restart.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9100924" xml-lang="en-US" level="2" l10n="NEW">Setting UI Language</paragraph>
-<paragraph role="paragraph" id="par_id2761314" xml-lang="en-US" l10n="NEW">A standard installation of OpenOffice.org software will give you a user interface (UI) of your chosen language.</paragraph>
-<paragraph role="paragraph" id="par_id3912778" xml-lang="en-US" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3163853" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id121158" xml-lang="en-US" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3806878" xml-lang="en-US" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id130619" xml-lang="en-US" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id9999694" xml-lang="en-US" level="2" l10n="NEW">Adding More UI Languages</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id2216559" xml-lang="en-US" l10n="NEW">Open your Web browser and enter <link href="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/">http://oootranslation.services.openoffice.org/pub/OpenOffice.org/</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id7869502" xml-lang="en-US" l10n="CHG">Select and download the correct language pack for your version of OpenOffice.org software.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id9852900" xml-lang="en-US" l10n="CHG">Close OpenOffice.org software (also close the Quickstarter, if you enabled it).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3791924" xml-lang="en-US" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
-</listitem>
-</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150043" xml-lang="en-US" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3152483" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="U" oldref="2">The language you select for your document determines the dictionary used for spellcheck, thesaurus and hyphenation, the decimal and thousands delimiter used and the default currency format.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153093" role="listitem" l10n="U" oldref="3">The language you select applies to the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152578" role="listitem" l10n="U" oldref="4">Within the document, you can apply a separate language to any paragraph style. This has priority over the language of the whole document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152886" role="listitem" l10n="U" oldref="5">You can assign a language to selected pieces of text in a paragraph, either by direct formatting or with a character style. This assignment has priority over the paragraph style and document language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3152938" role="heading" level="2" l10n="U" oldref="9">Selecting a language for a Paragraph Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150872" role="listitem" l10n="U" oldref="10">Place the cursor in the paragraph whose paragraph style you want to edit.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="listitem" l10n="U" oldref="11">Open the context menu and select <emph>Edit Paragraph Style</emph>. This opens the <emph>Paragraph Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="listitem" l10n="U" oldref="12">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156283" role="listitem" l10n="U" oldref="13">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154942" role="listitem" l10n="U" oldref="14">All paragraphs formatted with the current paragraph style will have the selected language.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145801" role="heading" level="2" l10n="U"
+ oldref="15">Applying a language directly to selected text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="listitem" l10n="U" oldref="16">Select the text to which you want to apply a language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159348" role="listitem" l10n="U" oldref="17">Choose <emph>Format - Character</emph>. This opens the <emph>Character</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155600" role="listitem" l10n="U" oldref="18">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="19">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154164" role="paragraph" l10n="U" oldref="20">In <item type="productname">%PRODUCTNAME</item> Calc, choose <emph>Format - Cells</emph> and proceed accordingly.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154272" role="heading" level="2" l10n="U"
+ oldref="21">Selecting a language for a Character Style</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145649" role="listitem" l10n="U" oldref="22">Open the Styles and Formatting window and click on the <emph>Character Styles</emph> icon.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="listitem" l10n="U" oldref="23">Click on the name of the character style to which you want to apply a different language.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150753" role="listitem" l10n="U" oldref="24">Then open the context menu in the Styles and Formatting window and select <emph>Modify</emph>. This opens the <emph>Character Style</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150321" role="listitem" l10n="U" oldref="25">Select the <emph>Font</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154756" role="listitem" l10n="U" oldref="26">Select the <emph>Language</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="listitem" l10n="U" oldref="27">Now you can apply the character style to your selected text.</paragraph>
+ </listitem>
+ </list><comment>UFI: see i76182</comment>
+<paragraph xml-lang="en-US" id="hd_id8703268" role="heading" level="2" l10n="NEW">Adding More Text Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7919248" role="paragraph" l10n="CHG">Dictionaries are supplied and installed as extensions. Choose <item type="menuitem">Tools - Language - More Dictionaries Online</item> to open the dictionaries page in your default web browser.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id5174108" role="paragraph" l10n="NEW">Select a dictionary in the list of descriptions. Click the heading in a dictionary description that you want to get.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2897427" role="paragraph" l10n="NEW">In the next page, click the Get It icon to download the dictionary extension. Note the folder name to which your browser downloads the file. Download additional dictionaries as you like.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3906979" role="paragraph" l10n="NEW">In %PRODUCTNAME, choose <item type="menuitem">Tools - Extension Manager</item> and click Add to install the downloaded extensions.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0220200911174493" role="paragraph" l10n="NEW">After you installed the extensions, you should close %PRODUCTNAME (including the Quickstarter), and restart.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9100924" role="heading" level="2" l10n="NEW">Setting UI Language</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2761314" role="paragraph" l10n="NEW">A standard installation of %PRODUCTNAME software will give you a user interface (UI) of your chosen language.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3806878" role="paragraph" l10n="NEW">Click OK and restart the OpenOffice.org software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id130619" role="paragraph" l10n="NEW">If the listbox doesn't list the language that you want, see "Adding More UI Languages".</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id9999694" role="heading" level="2" l10n="NEW">Adding More UI Languages</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2216559" role="paragraph" l10n="NEW">Open your Web browser and enter <link href="http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks">http://wiki.services.openoffice.org/wiki/Download_OpenOffice.org_LanguagePacks</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id7869502" role="paragraph" l10n="CHG">Select and download the correct language pack for your version of %PRODUCTNAME software.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9852900" role="paragraph" l10n="CHG">Close %PRODUCTNAME software (also close the Quickstarter, if you enabled it).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3791924" role="paragraph" l10n="NEW">Install the language pack. Either double-click the exe file, or unpack the tar.gz file according to standard practice on your platform.</paragraph>
+ </listitem>
+ </list>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/line_intext.xhp b/helpcontent2/source/text/shared/guide/line_intext.xhp
index 001bd5d320..b8077e2d27 100644
--- a/helpcontent2/source/text/shared/guide/line_intext.xhp
+++ b/helpcontent2/source/text/shared/guide/line_intext.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,10 +54,10 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="E">
-<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3166410" src="res/commandimagelist/sc_insertdraw.png" width="0.2228in" height="0.2228in"><alt id="alt_id3166410" xml-lang="en-US">Icon</alt>
</image></paragraph>
<paragraph role="paragraph" id="par_id3152780" xml-lang="en-US" l10n="E">
-<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3154285" src="res/commandimagelist/sc_line.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154285" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
@@ -83,7 +80,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="E">
-<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<image id="img_id3159413" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159413" xml-lang="en-US">Icon</alt>
</image></paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/lineend_define.xhp b/helpcontent2/source/text/shared/guide/lineend_define.xhp
index e0ead9a6f2..9f700c0f6d 100755
--- a/helpcontent2/source/text/shared/guide/lineend_define.xhp
+++ b/helpcontent2/source/text/shared/guide/lineend_define.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyle_define.xhp b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
index d952faeb16..f1b9ab30ee 100755
--- a/helpcontent2/source/text/shared/guide/linestyle_define.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyle_define.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/linestyles.xhp b/helpcontent2/source/text/shared/guide/linestyles.xhp
index e3e8eb2c6d..5077669185 100644
--- a/helpcontent2/source/text/shared/guide/linestyles.xhp
+++ b/helpcontent2/source/text/shared/guide/linestyles.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: linestyles.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/macro_recording.xhp b/helpcontent2/source/text/shared/guide/macro_recording.xhp
index c5485e5adf..433c1b06ed 100755
--- a/helpcontent2/source/text/shared/guide/macro_recording.xhp
+++ b/helpcontent2/source/text/shared/guide/macro_recording.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: macro_recording.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/main.xhp b/helpcontent2/source/text/shared/guide/main.xhp
index 6a803b8cf6..63189316da 100755
--- a/helpcontent2/source/text/shared/guide/main.xhp
+++ b/helpcontent2/source/text/shared/guide/main.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/makefile.mk b/helpcontent2/source/text/shared/guide/makefile.mk
index 3bfdd7593b..d7c15f231a 100644
--- a/helpcontent2/source/text/shared/guide/makefile.mk
+++ b/helpcontent2/source/text/shared/guide/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.14.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -178,4 +174,4 @@ XHPFILES = \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.INCLUDE : $(PRJ)$/makefile.pmk
+.INCLUDE : tg_help.mk
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index e0abf3e302..3c120e58e1 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: measurement_units.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@
<paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
@@ -74,6 +71,6 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="8"><link href="text/shared/00/00000003.xhp" name="Entering measurement units directly">Entering measurement units directly</link></paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General">Tools - Options - %PRODUCTNAME Writer - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - General">%PRODUCTNAME Writer - General</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 0c4b9f7ee5..8e96a8fc24 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: microsoft_terms.xhp,v $
- * $Revision: 1.10.4.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,14 +78,6 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/01/04050000.xhp" name="Notes">Notes</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
<paragraph role="tablecontent" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="10">Compare and Merge Documents</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
index ee361a7516..83a504f41d 100644
--- a/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
+++ b/helpcontent2/source/text/shared/guide/mobiledevicefilters.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mobiledevicefilters.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
index f80cce2b39..8bd6fd0ce7 100755
--- a/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_doctypes.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_doctypes.xhp,v $
- * $Revision: 1.5.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index f230251017..3953867cb0 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,24 +29,22 @@
*
************************************************************************
-->
-
-
+
<meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
-<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
-<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+ <title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+ <filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
-<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
-<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
+ <bookmark_value>import restrictions for Microsoft Office</bookmark_value>
+ <bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
-</variable></paragraph>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
<list type="ordered">
@@ -193,12 +188,11 @@
</tablecell>
</tablerow>
</table>
-
-<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
+<paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Starting from OpenOffice.org 3.2 or StarOffice 9.2, Microsoft Office files that are encrypted by AES128 can be opened. Other encryption methods are not supported.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 5525bec140..4be6b989a0 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_user.xhp,v $
- * $Revision: 1.9.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -103,10 +100,10 @@
<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Standard file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
+<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph>
@@ -125,14 +122,14 @@
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link></emph> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -141,8 +138,7 @@
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<switch select="sys">
-<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-</case>
+<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/></case>
</switch>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp
index f5845582ea..252bc73afd 100755
--- a/helpcontent2/source/text/shared/guide/navigator.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navigator.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -48,7 +45,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or notes.</paragraph>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="CHG" oldref="7">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
index 7279578f79..21480ff301 100644
--- a/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator_setcursor.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navigator_setcursor.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/navpane_on.xhp b/helpcontent2/source/text/shared/guide/navpane_on.xhp
index e32be5521b..48aa7503bc 100644
--- a/helpcontent2/source/text/shared/guide/navpane_on.xhp
+++ b/helpcontent2/source/text/shared/guide/navpane_on.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: navpane_on.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/numbering_stop.xhp b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
index 05d81143f9..28d5719ec6 100644
--- a/helpcontent2/source/text/shared/guide/numbering_stop.xhp
+++ b/helpcontent2/source/text/shared/guide/numbering_stop.xhp
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: numbering_stop.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,84 +29,86 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Turning off Bullets and Numbering for Individual Paragraphs</title>
-<filename>/text/shared/guide/numbering_stop.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-28T08:14:55">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguidenumbering_stopxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Turning off Bullets and Numbering for Individual Paragraphs</title>
+ <filename>/text/shared/guide/numbering_stop.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154186"><bookmark_value>numbering; turning off</bookmark_value>
-<bookmark_value>bullets; turning off</bookmark_value>
-<bookmark_value>removing, see also deleting</bookmark_value>
-<bookmark_value>removing;bullets and numbering</bookmark_value>
-<bookmark_value>keyboard;removing numbering</bookmark_value>
+ <bookmark_value>bullets; turning off</bookmark_value>
+ <bookmark_value>removing, see also deleting</bookmark_value>
+ <bookmark_value>removing;bullets and numbering</bookmark_value>
+ <bookmark_value>keyboard;removing numbering</bookmark_value>
</bookmark><comment>MW added "removing, see also deleting"</comment>
-<paragraph role="heading" id="hd_id3154186" xml-lang="en-US" level="1" l10n="U" oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
+<paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="1" l10n="U"
+ oldref="10"><variable id="numbering_stop"><link href="text/shared/guide/numbering_stop.xhp" name="Turning off Bullets and Numbering for Individual Paragraphs">Turning off Bullets and Numbering for Individual Paragraphs</link>
</variable></paragraph>
<switch select="appl">
+<case select="CALC"><comment>no bullets for Calc</comment>
+<paragraph xml-lang="en-US" id="par_id0202200910470118" role="note" l10n="NEW">Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw.</paragraph>
+</case>
+<case select="MATH"><comment>no bullets for Math</comment><comment>don't care for Math by now. Issue 98726</comment>
+</case>
<case select="WRITER">
<table id="tbl_id3155338">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="E">
-<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="5.64mm" height="5.64mm"><alt id="alt_id3153527" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="E">
+<image id="img_id3153527" src="res/commandimagelist/sc_removebullets.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153527">Icon</alt>
</image></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="E">
-<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3163802" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="E">
+<image id="img_id3163802" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3163802">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147618" role="paragraph" l10n="U" oldref="11">For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</case>
-<default>
+<default><comment>Impress, Draw</comment>
<table id="tbl_id3159157">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="E">
-<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="5.64mm" height="5.64mm"><alt id="alt_id3158432" xml-lang="en-US">Icon</alt>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155449" role="paragraph" l10n="E">
+<image id="img_id3158432" src="res/commandimagelist/sc_defaultbullet.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3158432">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3144511" xml-lang="en-US" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144511" role="paragraph" l10n="CHG" oldref="31">If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
</default>
</switch>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
+<paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER">To remove numbering from a paragraph using the keyboard:
</caseinline></switchinline></paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148663" role="listitem" l10n="U" oldref="13"><switchinline select="appl"><caseinline select="WRITER">Place the cursor at the beginning of a numbered paragraph and press the Backspace key.
</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150543" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="listitem" l10n="U" oldref="14"><switchinline select="appl"><caseinline select="WRITER">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph.
</caseinline></switchinline></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="WRITER">If you press the Enter key in an empty numbered paragraph, the numbering stops.
</caseinline></switchinline></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
-<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
-<embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
-<embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
-<embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
-<embed href="text/swriter/guide/captions.xhp#captions"/>
-<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3151043" role="paragraph" l10n="CHG" oldref="32"><link href="text/shared/01/06050000.xhp" name="Format - Bullets/Numbering">Format - Bullets and Numbering</link></paragraph>
+ <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
+ <embed href="text/swriter/guide/using_numbered_lists.xhp#using_numbered_lists"/>
+ <embed href="text/swriter/guide/using_numbered_lists2.xhp#using_numbered_lists2"/>
+ <embed href="text/swriter/guide/join_numbered_lists.xhp#join_numbered_lists"/>
+ <embed href="text/swriter/guide/captions.xhp#captions"/>
+ <embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pageformat_max.xhp b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
index 7e1a5c3b71..bca3d7b1d9 100755
--- a/helpcontent2/source/text/shared/guide/pageformat_max.xhp
+++ b/helpcontent2/source/text/shared/guide/pageformat_max.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pageformat_max.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index bbd77b9aba..7acfd8101a 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,127 +29,129 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include">
-<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
-<filename>/text/shared/guide/paintbrush.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="paintbrush">
+ <topic id="textsharedguidepaintbrushxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
+ <filename>/text/shared/guide/paintbrush.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="paintbrush">
<bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
-<bookmark_value>formatting;copying</bookmark_value>
-<bookmark_value>copying;formatting</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
+ <bookmark_value>formatting;copying</bookmark_value>
+ <bookmark_value>copying;formatting</bookmark_value>
+ <bookmark_value>Paintbrush</bookmark_value>
+</bookmark><comment>MW added "Paintbrush"</comment>
+<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
-<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">You can use the Format Paintbrush tool to copy formatting from a text selection or from an object and apply the formatting to another text selection or object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id101920091122570" role="note" l10n="NEW">In Calc, the Format Paintbrush only applies to cell formatting.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106DD" role="paragraph" l10n="NEW">Select the text or object whose formatting you want to copy.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered" startwith="2">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
-<table id="tbl_id599688">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
+ <table id="tbl_id599688">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="tablehead" l10n="NEW">Type of Selection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10697" role="tablehead" l10n="NEW">Comment</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1069E" role="tablecontent" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="tablecontent" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106AB" role="tablecontent" l10n="NEW">Text is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B1" role="tablecontent" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="tablecontent" l10n="NEW">Object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106CB" role="tablecontent" l10n="NEW">Copies the object formatting that is defined in the <item type="menuitem">Format - Graphics</item> or <item type="menuitem">Format - Drawing Object</item> dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D2" role="tablecontent" l10n="NEW">Form control is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D8" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Drawing object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106EC" role="tablecontent" l10n="CHG">Text within Calc cells is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="tablecontent" l10n="NEW">Writer table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106FF" role="tablecontent" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the <item type="menuitem">Format - Table</item> dialog. The paragraph and character formatting are also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10706" role="tablecontent" l10n="NEW">Calc table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1070C" role="tablecontent" l10n="NEW">Copies the formatting that is specified in the <item type="menuitem">Format - Cells</item> dialog as well as the formatting of the cell contents</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/pasting.xhp b/helpcontent2/source/text/shared/guide/pasting.xhp
index e1da77a404..10f7c8df53 100755
--- a/helpcontent2/source/text/shared/guide/pasting.xhp
+++ b/helpcontent2/source/text/shared/guide/pasting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: pasting.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index 6a430cb51f..dc3b8e2eab 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: print_blackwhite.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,110 +27,88 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Printing in Black and White</title>
-<filename>/text/shared/guide/print_blackwhite.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-08T12:15:36">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Printing in Black and White</title>
+ <filename>/text/shared/guide/print_blackwhite.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150125"><bookmark_value>printing; black and white</bookmark_value>
-<bookmark_value>black and white printing</bookmark_value>
-<bookmark_value>colors; not printing</bookmark_value>
-<bookmark_value>text; printing in black</bookmark_value>
+ <bookmark_value>black and white printing</bookmark_value>
+ <bookmark_value>colors; not printing</bookmark_value>
+ <bookmark_value>text; printing in black</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150125" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
+<paragraph xml-lang="en-US" id="hd_id3150125" role="heading" level="1" l10n="U" oldref="1"><variable id="print_blackwhite"><link href="text/shared/guide/print_blackwhite.xhp" name="Printing in Black and White">Printing in Black and White</link>
</variable></paragraph>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="2" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>Print</emph> dialog opens.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145313" xml-lang="en-US" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>OK</emph> in the <emph>Print</emph> dialog.</paragraph>
-<paragraph role="listitem" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Impress </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Draw</emph>, as appropriate.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154307" xml-lang="en-US" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - Options</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="15">
-<emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-<paragraph role="listitem" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="16">
-<emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153896" xml-lang="en-US" level="2" l10n="U" oldref="17">Printing only text in black and white</paragraph>
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="19">Printing all text documents with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Writer/Web</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147084" xml-lang="en-US" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154910" xml-lang="en-US" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3144762" xml-lang="en-US" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="3" l10n="U" oldref="24">Printing the current text document with black and white text</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="25">Choose <emph>File - Print</emph>. This opens the <emph>Print</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149560" xml-lang="en-US" l10n="U" oldref="26">Click the <emph>Options</emph> button. This opens the <emph>Printer Options</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149667" xml-lang="en-US" l10n="U" oldref="27">Under <emph>Contents</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="4">
-<listitem>
-<paragraph role="listitem" id="par_id3155308" xml-lang="en-US" l10n="U" oldref="28">The text document or HTML document now being printed will be printed in black text.</paragraph>
-</listitem>
+ <paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="3">Printing text and graphics in black and white</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="listitem" l10n="U" oldref="4">Choose <emph>File - Print</emph>. The <emph>General</emph> tab page of the dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155892" role="listitem" l10n="U" oldref="5">Click on <emph>Properties</emph>. This opens the Properties dialog for your printer.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145313" role="listitem" l10n="U" oldref="6">Select the option to print in black and white. For further information, refer to the user's manual of your printer.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153345" role="listitem" l10n="U" oldref="7">Confirm the <emph>Properties</emph> dialog and click <emph>Print</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="8">The current document will be printed in black and white.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="1" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149233" role="listitem" l10n="CHG" oldref="10">Choose Tools - Options - %PRODUCTNAME Impress or Tools - Options - %PRODUCTNAME Draw, as appropriate.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150275" role="listitem" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147573" role="listitem" l10n="U" oldref="12">Under <emph>Quality,</emph> select either <emph>Grayscale</emph> or <emph>Black &amp; white</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154307" role="listitem" l10n="U" oldref="13">When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the <emph>current</emph> print job, select the option in <emph>File - Print - %PRODUCTNAME Draw/Impress</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149786" role="listitem" l10n="U" oldref="15">
+ <emph>Grayscale</emph> converts all colors to a maximum of 256 gradations from black to white. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145610" role="listitem" l10n="U" oldref="16">
+ <emph>Black &amp; white</emph> converts all colors into the two values black and white. All borders around objects are printed black. All text will be printed in black. A background set by <emph>Format - Page - Background</emph> will not be printed.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153896" role="heading" level="1" l10n="U"
+ oldref="17">Printing only text in black and white</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="U" oldref="18">In <item type="productname">%PRODUCTNAME</item> Writer you can choose to print color-formatted text in black and white. You can specify this either for all subsequent text documents to be printed, or only for the current printing process.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="1" l10n="U"
+ oldref="19">Printing all text documents with black and white text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150541" role="listitem" l10n="U" oldref="20">Choose Tools - Options - %PRODUCTNAME Writer or Tools - Options - %PRODUCTNAME Writer/Web.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147084" role="listitem" l10n="U" oldref="21">Then choose <emph>Print</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154910" role="listitem" l10n="U" oldref="22">Under <emph>Contents,</emph> mark <emph>Print black</emph> and click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144762" role="listitem" l10n="U" oldref="23">All text documents or HTML documents will be printed with black text.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3148920" role="heading" level="1" l10n="U"
+ oldref="24">Printing the current text document with black and white text</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3152933" role="listitem" l10n="U" oldref="25">Choose <emph>File - Print</emph>. Then click the <emph>%PRODUCTNAME Writer</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149667" role="listitem" l10n="U" oldref="27">Choose <emph>Print text in black</emph> and click <emph>Print</emph>.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered">
</list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
-</body>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3153726" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154146" role="paragraph" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 6ae84df1a2..7701f5976c 100755
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: print_faster.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +57,7 @@
<paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">You can decide to reduce the data necessary to print your document. The settings can be defined differently for printing directly to the printer or for printing to a file.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - $[officename] - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click one of the following settings options: </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index b42a207520..d211c9ca54 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.xhp
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,121 +29,124 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguideprotectionxml" indexer="include">
-<title id="tit" xml-lang="en-US">Protecting Content in %PRODUCTNAME</title>
-<filename>/text/shared/guide/protection.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguideprotectionxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
+ <filename>/text/shared/guide/protection.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150620"><bookmark_value>protecting; contents</bookmark_value>
-<bookmark_value>protected contents</bookmark_value>
-<bookmark_value>contents protection</bookmark_value>
-<bookmark_value>encryption of contents</bookmark_value>
-<bookmark_value>passwords for protecting contents</bookmark_value>
-<bookmark_value>security;protecting contents</bookmark_value>
-<bookmark_value>form controls; protecting</bookmark_value>
-<bookmark_value>draw objects;protecting</bookmark_value>
-<bookmark_value>OLE objects;protecting</bookmark_value>
-<bookmark_value>graphics;protecting</bookmark_value>
-<bookmark_value>frames;protecting</bookmark_value>
+ <bookmark_value>protected contents</bookmark_value>
+ <bookmark_value>contents protection</bookmark_value>
+ <bookmark_value>encryption of contents</bookmark_value>
+ <bookmark_value>passwords for protecting contents</bookmark_value>
+ <bookmark_value>security;protecting contents</bookmark_value>
+ <bookmark_value>form controls; protecting</bookmark_value>
+ <bookmark_value>draw objects;protecting</bookmark_value>
+ <bookmark_value>OLE objects;protecting</bookmark_value>
+ <bookmark_value>graphics;protecting</bookmark_value>
+ <bookmark_value>frames;protecting</bookmark_value>
</bookmark><comment>mw moved 4 index entries to swriter/guide/protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="2"><variable id="protection"><link href="text/shared/guide/protection.xhp" name="Protecting Content in %PRODUCTNAME">Protecting Content in <item type="productname">%PRODUCTNAME</item></link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
-<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
-<table id="tbl_id3145071">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="6">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145121" xml-lang="en-US" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="3">The following is an overview of the different ways of protecting contents in <item type="productname">%PRODUCTNAME</item> from being modified, deleted or viewed.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146957" role="heading" level="2" l10n="U" oldref="4">Protecting All Documents When Saving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150775" role="paragraph" l10n="CHG" oldref="5">All documents that are saved in <link href="text/shared/00/00000021.xhp" name="OpenDocument format">OpenDocument format</link> can be saved with a password. Documents that are saved with a password cannot be opened without the password. The content is secured so that it cannot be read with an external editor. This applies to content, graphics and OLE objects.</paragraph>
+ <table id="tbl_id3145071">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166410" role="paragraph" l10n="U" oldref="6">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145121" role="paragraph" l10n="U" oldref="7">Choose <emph>File - Save As</emph> and mark the <emph>Save with password</emph> check box. Save the document.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="warning" id="par_id3145068" xml-lang="en-US" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
-<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="10">Protecting Revision Marking</paragraph>
-<paragraph role="paragraph" id="par_id3161646" xml-lang="en-US" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
-<table id="tbl_id3148797">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154684" xml-lang="en-US" l10n="U" oldref="12">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="14">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
-<paragraph role="heading" id="hd_id3155113" xml-lang="en-US" level="2" l10n="U" oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
-<paragraph role="paragraph" id="par_id3153703" xml-lang="en-US" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
-<table id="tbl_id3158447">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147131" xml-lang="en-US" l10n="U" oldref="54">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150088" xml-lang="en-US" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3147510" xml-lang="en-US" l10n="U" oldref="56">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153657" xml-lang="en-US" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Graphics - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id3145068" role="warning" l10n="U" oldref="64">Information entered in <emph>File - Properties</emph> is not encrypted. This includes the name of the author, creation date, word and character counts.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U"
+ oldref="10">Protecting Revision Marking</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161646" role="paragraph" l10n="U" oldref="11">With every change made in <item type="productname">%PRODUCTNAME</item> Calc and <item type="productname">%PRODUCTNAME</item> Writer, the review function records who made the change. This function can be turned on with protection, so that it can only be turned off when the correct password is entered. Until then, all changes will continue to be recorded. Acceptance or rejection of changes is not possible.</paragraph>
+ <table id="tbl_id3148797">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least 5 characters.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+<comment>MW moved contents of "Protecting Cell Ranges in Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U"
+ oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
+ <table id="tbl_id3158447">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147131" role="paragraph" l10n="U" oldref="54">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150088" role="paragraph" l10n="U" oldref="55">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, mark <emph>Contents</emph>, <emph>Position</emph> and/or <emph>Size</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147510" role="paragraph" l10n="U" oldref="56">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153657" role="paragraph" l10n="U" oldref="57">For example, for graphics inserted in Writer: Choose <emph>Format - Picture - Options</emph> tab. Under <emph>Protect</emph>, unmark as appropriate.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3152992" xml-lang="en-US" level="2" l10n="U" oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
-<paragraph role="paragraph" id="par_id3166429" xml-lang="en-US" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
-<table id="tbl_id3151062">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3153226" xml-lang="en-US" l10n="U" oldref="60">Turning on protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148815" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3156289" xml-lang="en-US" l10n="U" oldref="62">Turning off protection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3154991" xml-lang="en-US" l10n="CHG" oldref="63">Choose <emph>Format - Drawing Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3152992" role="heading" level="2" l10n="U"
+ oldref="58">Protecting Drawing Objects and Form Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166429" role="paragraph" l10n="CHG" oldref="59">The draw objects that you insert into your documents with the <emph>Drawing </emph>toolbar can be protected from being accidentally moved or changed in size. You can do the same with form objects inserted with the <emph>Form Controls</emph> toolbar.</paragraph>
+ <table id="tbl_id3151062">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153226" role="paragraph" l10n="U" oldref="60">Turning on protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148815" role="paragraph" l10n="CHG" oldref="61">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Mark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156289" role="paragraph" l10n="U" oldref="62">Turning off protection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154991" role="paragraph" l10n="CHG" oldref="63">Choose <emph>Format - Object - Position and Size </emph>- <emph>Position and Size</emph> tab. Unmark the <emph>Position</emph> or <emph>Size</emph> check box.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<comment>removed webdav text, see i71792</comment><comment>MW moved "Opening Microsoft Office Documents That Are Protected With a Password" to shared/guide/ms_import_export_limitations.xhp </comment><embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-<paragraph role="paragraph" id="par_idN10B8C" xml-lang="en-US" l10n="NEW">
+ <embed href="text/shared/guide/doc_save.xhp#doc_save"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ <paragraph xml-lang="en-US" id="par_idN10B8C" role="paragraph" l10n="NEW">
<embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/>
</paragraph>
-<paragraph role="paragraph" id="par_id4680928" xml-lang="en-US" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
-<paragraph role="paragraph" id="par_id9014252" xml-lang="en-US" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW"><link href="text/swriter/guide/protection.xhp">Protecting Content in %PRODUCTNAME Writer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW"><link href="text/scalc/guide/cell_protect.xhp">Protecting Cells in %PRODUCTNAME Calc</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp
index 0b50937dcf..eef290f303 100755
--- a/helpcontent2/source/text/shared/guide/redlining.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining.xhp
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
-
-<!--***********************************************************************
+<!--
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: redlining.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -29,39 +27,37 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording and Displaying Changes</title>
-<filename>/text/shared/guide/redlining.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:41:19">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording and Displaying Changes</title>
+ <filename>/text/shared/guide/redlining.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>marking changes</bookmark_value>
-<bookmark_value>changes; review function</bookmark_value>
-<bookmark_value>review function; recording changes example</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
+ <bookmark_value>highlighting changes</bookmark_value>
+ <bookmark_value>changes; review function</bookmark_value>
+ <bookmark_value>review function; recording changes example</bookmark_value>
+ <bookmark_value>Track Changes, see review function</bookmark_value>
+</bookmark><comment>MW addes a cross-reference</comment><comment>MW added "highlighting changes"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id4013794" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
-<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
-<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
-<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
-<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id4013794" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+ <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
+ <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+ <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+ <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining_accept.xhp b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
index 310e844612..64129ac46e 100755
--- a/helpcontent2/source/text/shared/guide/redlining_accept.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_accept.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_accept.xhp,v $
- * $Revision: 1.6.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
index b6bb0aa8eb..665e2d72da 100755
--- a/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_doccompare.xhp,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
index 54e47cad02..d275d18a14 100755
--- a/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_docmerge.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_docmerge.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index ba20ac7a54..112094d568 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: redlining_enter.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,60 +29,56 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording Changes</title>
-<filename>/text/shared/guide/redlining_enter.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:53:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording Changes</title>
+ <filename>/text/shared/guide/redlining_enter.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>changes; recording</bookmark_value>
-<bookmark_value>recording; changes</bookmark_value>
-<bookmark_value>comments; on changes</bookmark_value>
-<bookmark_value>settings;tracking changes</bookmark_value>
-</bookmark><comment>UFI: deleted index review function;recording changes</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
+ <bookmark_value>recording; changes</bookmark_value>
+ <bookmark_value>comments; on changes</bookmark_value>
+ <bookmark_value>review function;tracking changes</bookmark_value>
+</bookmark><comment>UFI: deleted index review function;recording changes</comment><comment>MW changed "settings;tracking changes" </comment>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id7271645" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
-<table id="tbl_id3147399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="17">1.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="18">2.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="19">3.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id7271645" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
+ <table id="tbl_id3147399">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="18">2.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="19">3.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/helpcontent2/source/text/shared/guide/redlining_protect.xhp b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
index d7d7a7133d..b38bc5ea64 100755
--- a/helpcontent2/source/text/shared/guide/redlining_protect.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_protect.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_protect.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/redlining_versions.xhp b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
index 43ef11c539..fe8fdaff61 100755
--- a/helpcontent2/source/text/shared/guide/redlining_versions.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_versions.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining_versions.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/round_corner.xhp b/helpcontent2/source/text/shared/guide/round_corner.xhp
index 6abf932189..cd5f1977f0 100644
--- a/helpcontent2/source/text/shared/guide/round_corner.xhp
+++ b/helpcontent2/source/text/shared/guide/round_corner.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: round_corner.xhp,v $
- * $Revision: 1.11 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 0b02734ac4..2f4c52037d 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: scripting.xhp,v $
- * $Revision: 1.17.4.1 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,200 +32,198 @@
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
-<filename>/text/shared/guide/scripting.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidescriptingxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Scripting %PRODUCTNAME</title>
+ <filename>/text/shared/guide/scripting.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id5277565"><bookmark_value>assigning scripts</bookmark_value>
-<bookmark_value>programming;scripting</bookmark_value>
-<bookmark_value>form controls;assigning macros</bookmark_value>
-<bookmark_value>pictures;assigning macros</bookmark_value>
-<bookmark_value>hyperlinks;assigning macros</bookmark_value>
-<bookmark_value>shortcut keys;assigning macros</bookmark_value>
-<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
-<bookmark_value>menus;assigning macros</bookmark_value>
-<bookmark_value>events;assigning scripts</bookmark_value>
+ <bookmark_value>programming;scripting</bookmark_value>
+ <bookmark_value>form controls;assigning macros</bookmark_value>
+ <bookmark_value>pictures;assigning macros</bookmark_value>
+ <bookmark_value>hyperlinks;assigning macros</bookmark_value>
+ <bookmark_value>shortcut keys;assigning macros</bookmark_value>
+ <bookmark_value>controls;assigning macros (Basic)</bookmark_value>
+ <bookmark_value>menus;assigning macros</bookmark_value>
+ <bookmark_value>events;assigning scripts</bookmark_value>
</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment>
-<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+<paragraph xml-lang="en-US" id="par_idN1070A" role="heading" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">JavaScript</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1091F" xml-lang="en-US" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1093D" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10770" xml-lang="en-US" l10n="NEW">A list of the script functions appears in the <emph>Functions</emph> list box. Select a function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10778" xml-lang="en-US" l10n="NEW">Click <emph>New</emph> to create a new menu assignment. The new menu entry appears in the <emph>Menu entries</emph> list box. Click the menu entry and enter text to rename the entry.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10783" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10787" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A61" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A65" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A69" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Functions</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A71" xml-lang="en-US" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
-<paragraph role="paragraph" id="par_idN10A74" xml-lang="en-US" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A78" xml-lang="en-US" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1078A" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1078E" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A16" xml-lang="en-US" l10n="NEW">Click <emph>Assign Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A9E" xml-lang="en-US" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAA" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAE" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Macros</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB9" xml-lang="en-US" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ABD" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEB" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEF" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>Assign</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10798" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1079C" xml-lang="en-US" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B15" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B19" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B21" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079F" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A3" xml-lang="en-US" l10n="NEW">Select the graphic in your document. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3B" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3F" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107A6" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a form control</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107AA" xml-lang="en-US" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B59" xml-lang="en-US" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B5D" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B61" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107AD" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107B1" xml-lang="en-US" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B7F" xml-lang="en-US" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B87" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B8B" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10728" role="paragraph" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">%PRODUCTNAME Basic</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">JavaScript</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1073D" role="paragraph" l10n="CHG">BeanShell</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10758" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1093D" role="paragraph" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10770" role="paragraph" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="paragraph" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="heading" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10787" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A61" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A65" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A69" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A71" role="paragraph" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A74" role="paragraph" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A78" role="paragraph" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1078A" role="heading" level="2" l10n="NEW">To assign a script to an event</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A16" role="paragraph" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A9E" role="paragraph" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AA6" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAA" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAE" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AB6" role="paragraph" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AB9" role="paragraph" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ABD" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AE7" role="paragraph" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEB" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEF" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AF7" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10798" role="heading" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1079C" role="paragraph" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B15" role="paragraph" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B19" role="paragraph" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B21" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1079F" role="heading" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107A3" role="paragraph" l10n="NEW">Select the graphic in your document. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3B" role="paragraph" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3F" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107A6" role="heading" level="2" l10n="NEW">To assign a script to a form control</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107AA" role="paragraph" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B59" role="paragraph" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B5D" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B61" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107AD" role="heading" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B1" role="paragraph" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B7F" role="paragraph" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B87" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B8B" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
index a67d920de0..943ae48bf2 100755
--- a/helpcontent2/source/text/shared/guide/space_hyphen.xhp
+++ b/helpcontent2/source/text/shared/guide/space_hyphen.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index bfcb8a69a3..23d61bb1e6 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -5,13 +5,10 @@
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: spadmin.xhp,v $
- * $Revision: 1.12 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
+<title id="tit" xml-lang="en-US">Setting up Printer and Fax Under UNIX Based Platforms</title>
<filename>/text/shared/guide/spadmin.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="chapter_all">
@@ -55,14 +48,14 @@
<bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
<bookmark_value>converters; PostScript, UNIX</bookmark_value>
<bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
-<bookmark_value>fonts; adding under UNIX</bookmark_value>
-<bookmark_value>typefaces; adding under UNIX</bookmark_value>
</bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
-<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
+<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer and Fax Under UNIX Based Platforms">Setting up Printer and Fax Under UNIX Based Platforms</link>
</variable></paragraph>
<section id="chapter_body">
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers, faxes and fonts for use with the $[officename] software.</paragraph>
+<paragraph role="paragraph" id="par_id3159876" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses the installed fonts of your system. In a text document you can select from all printable fonts. In an HTML document or in Web layout, only fonts that are visible on screen are offered. In spreadsheets and drawings you can select from all installed fonts.</paragraph>
+
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph>
<list type="unordered">
<listitem>
@@ -74,7 +67,7 @@
</list>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
-<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="285">The system administrator can also add fonts for all users in the server installation. However, these fonts are available only after restarting the $[officename] software.</paragraph>
+
<paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
@@ -171,8 +164,7 @@
<paragraph role="listitem" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="137">To delete the selected printer, click <emph>Remove</emph>. The default printer or a printer that has been created by the system administrator in a server installation cannot be removed using this dialog.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer </caseinline></switchinline></paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="31">To make the printer selected from the <emph>Installed printers</emph> list box the default printer, double-click its name or click the <emph>Default</emph> button.</paragraph>
@@ -207,7 +199,7 @@
<paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
-<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>
<paragraph role="heading" id="hd_id3146929" xml-lang="en-US" level="2" l10n="U" oldref="306">Connecting a PostScript to PDF Converter</paragraph>
@@ -230,89 +222,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
-<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
-<paragraph role="heading" id="hd_id3156195" xml-lang="en-US" level="2" l10n="U" oldref="143">Installing Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3153914" xml-lang="en-US" l10n="U" oldref="144">When you are working with the $[officename] software you might notice that a different number of fonts is provided depending on the document type being used. This is because not all of the fonts can be used in every case.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3152382" xml-lang="en-US" l10n="U" oldref="145">Therefore, only those fonts will be shown in the font selection box when working with a text document which can also be printed, as it is assumed that you will only want to use those fonts that you can actually have printed on paper.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3157982" xml-lang="en-US" l10n="CHG" oldref="146">In an HTML document or in Web layout, only fonts that are available on screen are offered.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149590" xml-lang="en-US" l10n="U" oldref="147">On the other hand, when working with spreadsheets and drawings you will be able to use all of the fonts that can be either printed or shown on the screen.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3159093" xml-lang="en-US" l10n="U" oldref="148">The $[officename] software tries to match the display on screen to the printout (WYSIWYG = what you see is what you get). Possible problems are shown in the bottom of the dialog <emph>Format - Character</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3156353" xml-lang="en-US" level="3" l10n="U" oldref="314">Adding Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3144503" xml-lang="en-US" l10n="U" oldref="315">You can integrate additional fonts in the $[officename] software. Fonts which you integrate are available exclusively to the $[officename] software and can be used with various Xservers without your having to install them there. To make the fonts available to other programs as well, proceed as usual by adding the fonts to your Xserver. The $[officename] software can display and print out PostScript Type1 fonts as well as TrueType fonts (including TrueType Collections).</paragraph>
-<paragraph role="paragraph" id="par_id3156174" xml-lang="en-US" l10n="U" oldref="316">To integrate additional fonts in the $[officename] software, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154825" xml-lang="en-US" l10n="U" oldref="357">Go to the {install_path}/program directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151127" xml-lang="en-US" l10n="U" oldref="317">Enter: ./spadmin</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149072" xml-lang="en-US" l10n="U" oldref="318">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156341" xml-lang="en-US" l10n="U" oldref="319">The dialog lists all fonts added for the $[officename] software. You can select and remove fonts using the <emph>Remove</emph> button or add new fonts with the <emph>Add</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155118" xml-lang="en-US" l10n="U" oldref="320">Click <emph>Add</emph>. The <emph>Add Fonts</emph> dialog appears.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149126" xml-lang="en-US" l10n="U" oldref="321">Enter the directory from which you want to add the fonts. Press the <emph>...</emph> button and select the directory from the path selection dialog or enter the directory directly.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154266" xml-lang="en-US" l10n="U" oldref="322">A list of the fonts from this directory appears. Select the fonts you want to add. To add all the fonts, click <emph>Select All</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154060" xml-lang="en-US" l10n="U" oldref="323">With the <emph>Create soft links only</emph> check box you can determine whether the fonts are to be copied into the $[officename] directory or only symbolic links are to be created there. If the fonts to be added are on a data medium that is not always available (such as a CD-ROM), you must copy the fonts.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155539" xml-lang="en-US" l10n="U" oldref="324">Click OK. The fonts will now be added.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3146776" xml-lang="en-US" l10n="U" oldref="325">In the case of a server installation, the fonts are installed in that installation if possible. If the user has no write access rights, the fonts will be installed in the corresponding user installation so that only the user who installed them can access them.</paragraph>
-<paragraph role="heading" id="hd_id3152869" xml-lang="en-US" level="3" l10n="U" oldref="326">Deleting Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3151302" xml-lang="en-US" l10n="U" oldref="327">To delete fonts, proceed as follows:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3150213" xml-lang="en-US" l10n="U" oldref="328">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154608" xml-lang="en-US" l10n="U" oldref="329">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145195" xml-lang="en-US" l10n="U" oldref="330">All fonts added to the $[officename] software are listed in the dialog that now appears. Select the fonts you want to delete and click <emph>Delete</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153242" xml-lang="en-US" l10n="U" oldref="331">You can delete only the fonts that have been added for the $[officename] software.</paragraph>
-<paragraph role="heading" id="hd_id3147487" xml-lang="en-US" level="3" l10n="U" oldref="332">Renaming Fonts</paragraph>
-<paragraph role="paragraph" id="par_id3148899" xml-lang="en-US" l10n="U" oldref="333">You can also rename fonts added for the $[officename] software. This is especially useful for fonts that contain several localized names.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154766" xml-lang="en-US" l10n="U" oldref="334">Start spadmin.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151009" xml-lang="en-US" l10n="U" oldref="335">Click <emph>Fonts</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151120" xml-lang="en-US" l10n="U" oldref="336">Select the fonts you want to rename and click <emph>Rename</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153008" xml-lang="en-US" l10n="U" oldref="337">Enter a new name in the dialog that appears. If the font contains several names, these names will serve as suggestions in the combo box where you enter the new name.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155521" xml-lang="en-US" l10n="U" oldref="338">Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3149802" xml-lang="en-US" l10n="U" oldref="339">If you select several fonts to rename, one dialog appears for each selected font.</paragraph>
-<paragraph role="paragraph" id="par_id3153487" xml-lang="en-US" l10n="U" oldref="340">If you have selected a TrueType Collection (TTC), one dialog appears for each of the fonts contained in it.</paragraph>
+
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index fc267590f9..0111208f5a 100755
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: standard_template.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,7 +69,7 @@
<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set As Default Template</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
@@ -91,7 +88,7 @@
<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="13">Using Custom Templates</paragraph>
<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="14">There are several ways to make your work easier by using your own custom templates. </paragraph>
<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="15">Templates in the Template Folder</paragraph>
-<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
<paragraph role="tip" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="33">You may need to update the view of the templates in the dialog before you can see a newly created template. In this case, choose <emph>File - Templates - Organize</emph> and in the submenu of the <emph>Commands</emph> button, choose <emph>Update</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - Templates - Edit</emph>.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/guide/start_parameters.xhp b/helpcontent2/source/text/shared/guide/start_parameters.xhp
index ec91bcb068..f419787800 100644
--- a/helpcontent2/source/text/shared/guide/start_parameters.xhp
+++ b/helpcontent2/source/text/shared/guide/start_parameters.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: start_parameters.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,10 +36,6 @@
<title id="tit" xml-lang="en-US">Starting the $[officename] Software With Parameters</title>
<filename>/text/shared/guide/start_parameters.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-25T12:22:48">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="start_parameters">
@@ -54,7 +47,6 @@
<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="1" l10n="U" oldref="52">Starting the $[officename] Software With Parameters</paragraph>
<paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="1">By starting the $[officename] software from the command line you can assign various parameters, with which you can influence the performance. The use of command line parameters is only recommended for experienced users.</paragraph>
<paragraph role="note" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="2">For normal handling, the use of command line parameters is not necessary. A few of the parameters require a deeper knowledge of the technical background of the $[officename] software technology.</paragraph>
-<paragraph role="note" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="3">More information on this topic can be found at <link href="http://www.openoffice.org" name="www.openoffice.org">www.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the $[officename] Software From the Command Line</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index cf4cc16071..ebecbb15c6 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: startcenter.xhp,v $
- * $Revision: 1.1.2.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -32,52 +29,62 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedguidestartcenterxhp" indexer="include">
-<title id="tit" xml-lang="en-US">Start Center</title>
-<filename/>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidestartcenterxhp" indexer="include">
+ <title xml-lang="en-US" id="tit">Start Center</title>
+ <filename>/text/shared/guide/startcenter.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id0820200802500562"><bookmark_value>backing window</bookmark_value>
-<bookmark_value>start center</bookmark_value>
+ <bookmark_value>start center</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_BACKINGWINDOW" id="bm_id0820200802550234" localize="false"/>
-<paragraph role="heading" id="hd_id0820200802524447" xml-lang="en-US" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
+<paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id0820200803204063" xml-lang="en-US" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
-<paragraph role="paragraph" id="par_id0820200802524413" xml-lang="en-US" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id0820200803104810" xml-lang="en-US" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104978" xml-lang="en-US" l10n="NEW">
-<emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104998" xml-lang="en-US" l10n="NEW">
-<emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104927" xml-lang="en-US" l10n="NEW">
-<emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803104948" xml-lang="en-US" l10n="NEW">
-<emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803105089" xml-lang="en-US" l10n="NEW">
-<emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id0820200803105015" xml-lang="en-US" l10n="NEW">
-<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id0820200803105045" xml-lang="en-US" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id082020080310500" xml-lang="en-US" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id0820200803105158" xml-lang="en-US" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document or a file dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:ImpressButton" id="bm_id102220091057270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DBButton" id="bm_id102220091057437" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:MathButton" id="bm_id1022200910575575" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW"><ahelp hid=".">The document icons each open a new document of the specified type.</ahelp></paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104978" role="paragraph" l10n="NEW">
+ <emph>Text Document</emph> opens %PRODUCTNAME <link href="text/swriter/main0000.xhp">Writer</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104998" role="paragraph" l10n="NEW">
+ <emph>Spreadsheet</emph> opens %PRODUCTNAME <link href="text/scalc/main0000.xhp">Calc</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104927" role="paragraph" l10n="NEW">
+ <emph>Presentation</emph> opens %PRODUCTNAME <link href="text/simpress/main0000.xhp">Impress</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803104948" role="paragraph" l10n="NEW">
+ <emph>Drawing</emph> opens %PRODUCTNAME <link href="text/sdraw/main0000.xhp">Draw</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803105089" role="paragraph" l10n="NEW">
+ <emph>Database</emph> opens %PRODUCTNAME <link href="text/shared/explorer/database/main.xhp">Base</link></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0820200803105015" role="paragraph" l10n="NEW">
+ <emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:TemplateButton" id="bm_id1022200910584084" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011855" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Templates icon opens the Templates and Documents dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
+
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 942c37de11..c1c0781ab5 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: tabs.xhp,v $
- * $Revision: 1.10 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,7 +65,7 @@ FPE: Deleted screenshot.</lastedited>
<paragraph role="paragraph" id="par_id1376079" xml-lang="en-US" l10n="NEW">On the horizontal ruler you can see the tab stops for the current paragraph. If you want to change the tab stops, you should first consider the scope to which you want to change tab stops as follows:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id274971" xml-lang="en-US" l10n="NEW">Change the tab stops for all paragraphs using the current Paragraph Style: Right-click the paragraph to open the context menu, choose <emph>Edit Paragraph Style</emph>, click <emph>Tabs</emph>.</paragraph>
@@ -154,11 +151,11 @@ FPE: Deleted screenshot.</lastedited>
</default>
</switch>
<paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="3" l10n="U" oldref="26">Changing the Defaults</paragraph>
-<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Text Document - General">Tools - Options - %PRODUCTNAME Writer - General</link>
-</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - General">Tools - Options - %PRODUCTNAME Calc - General</link>
-</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Drawing - General">Tools - Options - %PRODUCTNAME Draw - General</link>
-</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General">Tools - Options - %PRODUCTNAME Impress - General</link>
-</caseinline><defaultinline>Tools - Options - (module name) - General</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Text Document - General">%PRODUCTNAME Writer - General</link>
+</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - General">%PRODUCTNAME Calc - General</link>
+</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Drawing - General">%PRODUCTNAME Draw - General</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link>
+</caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box.</paragraph>
<switch select="appl">
<case select="CALC">
</case>
diff --git a/helpcontent2/source/text/shared/guide/text_color.xhp b/helpcontent2/source/text/shared/guide/text_color.xhp
index f00227b2f4..4ed5b1354f 100644
--- a/helpcontent2/source/text/shared/guide/text_color.xhp
+++ b/helpcontent2/source/text/shared/guide/text_color.xhp
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* 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
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
- * $RCSfile: text_color.xhp,v $
- * $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
@@ -35,50 +31,53 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Color of Text</title>
-<filename>/text/shared/guide/text_color.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>colors; fill format</bookmark_value>
-<bookmark_value>text; coloring</bookmark_value>
-<bookmark_value>characters; coloring</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3156014" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
+ <topic id="textsharedguidetext_colorxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changing the Color of Text</title>
+ <filename>/text/shared/guide/text_color.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156014"><bookmark_value>text; coloring</bookmark_value>
+ <bookmark_value>characters; coloring</bookmark_value>
+ <bookmark_value>colors; fonts</bookmark_value>
+ <bookmark_value>fonts;colors</bookmark_value>
+</bookmark><comment>MW added two entries from text/shared/01/05020200.xhp and deleted "colors;fill format"</comment>
+<paragraph xml-lang="en-US" id="hd_id3156014" role="heading" level="1" l10n="U"
+ oldref="42"><variable id="text_color"><link href="text/shared/guide/text_color.xhp" name="Changing the Color of Text">Changing the Color of Text</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
-<table id="tbl_id3152801">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="E">
-<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.222inch" height="0.222inch"><alt id="alt_id3159233" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3150040" role="paragraph" l10n="CHG" oldref="40">Click the arrow next to the <emph>Font Color</emph> icon to activate a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> from which you can choose from a range of colors.</paragraph>
+ <table id="tbl_id3152801">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="E">
+<image id="img_id3159233" src="res/commandimagelist/sc_color.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159233">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152781" xml-lang="en-US" l10n="U" oldref="45">Font Color</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<table id="tbl_id3146797">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="E">
-<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150503" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152781" role="paragraph" l10n="U" oldref="45">Font Color</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <table id="tbl_id3146797">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="E">
+<image id="img_id3150503" src="res/commandimagelist/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150503">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
+ </tablecell>
+ <tablecell>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149795"><bookmark_value>paint can symbol</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<paragraph role="paragraph" id="par_id3145120" xml-lang="en-US" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="41">The following only applies to <item type="productname">%PRODUCTNAME</item> Writer: If you click the icon with a short-click while no text is selected, then the mouse pointer changes its appearance and is displayed as a paint can. Use this paint can symbol with the mouse key pressed to drag across a text area. This text area takes the selected color. The function remains active for as long as the icon is pressed, or until you click without dragging, or until you press the Escape key.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <paragraph xml-lang="en-US" id="par_id3145120" role="paragraph" l10n="U" oldref="46">The following applies to all modules (<item type="productname">%PRODUCTNAME</item> Writer, Calc, Draw, Impress): Select the text that is to take another color, then click the color you want on the toolbar.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
+ <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="43"><link href="text/shared/01/05020100.xhp" name="Font color">Font color</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/textmode_change.xhp b/helpcontent2/source/text/shared/guide/textmode_change.xhp
index b21d6c7067..a342635a7f 100755
--- a/helpcontent2/source/text/shared/guide/textmode_change.xhp
+++ b/helpcontent2/source/text/shared/guide/textmode_change.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: textmode_change.xhp,v $
- * $Revision: 1.5 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/undo_formatting.xhp b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
index 9ac124c600..fb9a2761e1 100644
--- a/helpcontent2/source/text/shared/guide/undo_formatting.xhp
+++ b/helpcontent2/source/text/shared/guide/undo_formatting.xhp
@@ -6,13 +6,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: undo_formatting.xhp,v $
- * $Revision: 1.9 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/version_number.xhp b/helpcontent2/source/text/shared/guide/version_number.xhp
index 1f1c7b3d29..1b7e0b5447 100755
--- a/helpcontent2/source/text/shared/guide/version_number.xhp
+++ b/helpcontent2/source/text/shared/guide/version_number.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: version_number.xhp,v $
- * $Revision: 1.6 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
index 5018530876..731bb37e68 100755
--- a/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
+++ b/helpcontent2/source/text/shared/guide/viewing_file_properties.xhp
@@ -5,13 +5,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: viewing_file_properties.xhp,v $
- * $Revision: 1.7 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index f09f61d31e..a556b5bbc8 100755
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
@@ -1,19 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: workfolder.xhp,v $
- * $Revision: 1.12 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,39 +29,40 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing Your Working Directory </title>
-<filename>/text/shared/guide/workfolder.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+ <topic id="textsharedguideworkfolderxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changing Your Working Directory </title>
+ <filename>/text/shared/guide/workfolder.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="chapter_all">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150789"><bookmark_value>working directory change</bookmark_value>
-<bookmark_value>My Documents folder;changing work directory</bookmark_value>
-<bookmark_value>paths; changing work directory</bookmark_value>
-<bookmark_value>pictures; changing paths</bookmark_value>
-<bookmark_value>changing;work directory</bookmark_value>
-</bookmark><comment>work --&gt; working, i85615</comment><paragraph role="heading" id="hd_id3149346" xml-lang="en-US" level="1" l10n="CHG" oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
+ <bookmark_value>My Documents folder;changing work directory</bookmark_value>
+ <bookmark_value>paths; changing work directory</bookmark_value>
+ <bookmark_value>pictures; changing paths</bookmark_value>
+ <bookmark_value>changing;work directory</bookmark_value>
+</bookmark><comment>work --&gt; working, i85615</comment>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="CHG"
+ oldref="2"><variable id="workfolder"><link href="text/shared/guide/workfolder.xhp" name="Changing Your Working Directory">Changing Your Working Directory</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="4">Choose <emph>Tools - Options - $[officename] - Paths</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>OK</emph>. </paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3158430" xml-lang="en-US" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph>Tools - Options - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
-</section>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163802" role="listitem" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153880" role="listitem" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>Select</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
+ </section>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/xforms.xhp b/helpcontent2/source/text/shared/guide/xforms.xhp
index 3c904a74f8..515cf7001d 100755
--- a/helpcontent2/source/text/shared/guide/xforms.xhp
+++ b/helpcontent2/source/text/shared/guide/xforms.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xforms.xhp,v $
- * $Revision: 1.13 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter.xhp b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
index f2c4138410..7cf2fe6fb4 100755
--- a/helpcontent2/source/text/shared/guide/xsltfilter.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter.xhp,v $
- * $Revision: 1.20 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
index 879c21a835..de469f24b8 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_create.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter_create.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
index 447f0d7956..7cc03fbd75 100644
--- a/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
+++ b/helpcontent2/source/text/shared/guide/xsltfilter_distribute.xhp
@@ -7,13 +7,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: xsltfilter_distribute.xhp,v $
- * $Revision: 1.4 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify