source/text/shared/00/00000406.xhp | 2 +-
source/text/shared/guide/macro_recording.xhp | 1 +
source/text/shared/optionen/01010000.xhp | 2 +-
source/text/shared/optionen/01010600.xhp | 3 ---
source/text/shared/optionen/java.xhp | 16 ++++++++++------
source/text/shared/optionen/javaclasspath.xhp | 2 +-
source/text/shared/optionen/javaparameters.xhp | 2 +-
7 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit a43f72ace3d84b3ba0df35ec589a21a1d5de2299
Author: Andras Timar <ati...@suse.com>
Date: Tue Oct 23 12:27:20 2012 +0200
fdo#54699 document that macro recording is an unstable feature
Change-Id: Icd07c94b22bf8527c5eedc7152b98e462daea8c3
diff --git a/source/text/shared/00/00000406.xhp
b/source/text/shared/00/00000406.xhp
index b8b7bba..e665492 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -207,7 +207,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U"
oldref="43"><variable id="scripting">Choose <emph><switchinline
select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - $[officename] - Security</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph"
l10n="NEW"><variable id="java">Choose <emph><switchinline
select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - $[officename] - Java</emph>
+ <paragraph xml-lang="en-US" id="par_idN11C3D" role="paragraph"
l10n="NEW"><variable id="advanced">Choose <emph><switchinline
select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - $[officename] - Advanced</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5485702" role="paragraph"
l10n="NEW"><variable id="online_update">Choose <emph><switchinline
select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
</variable></paragraph>
diff --git a/source/text/shared/guide/macro_recording.xhp
b/source/text/shared/guide/macro_recording.xhp
index 433c1b0..5911c14 100644
--- a/source/text/shared/guide/macro_recording.xhp
+++ b/source/text/shared/guide/macro_recording.xhp
@@ -54,6 +54,7 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG"
oldref="5">Choose <emph>Tools - Macros - Record Macro</emph>.</paragraph>
+<paragraph role="note" id="par_id3149399" xml-lang="en-US">If <emph>Tools -
Macros - Record Macro</emph> menu item is missing, make sure that macro
recording feature is enabled in <emph><switchinline select="sys"><caseinline
select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - %PRODUCTNAME -
Advanced</emph>.</paragraph>
<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U"
oldref="6">You see the small <emph>Recording</emph> dialog with just one button
called <emph>Stop Recording</emph>.</paragraph>
</listitem>
<listitem>
diff --git a/source/text/shared/optionen/01010000.xhp
b/source/text/shared/optionen/01010000.xhp
index 9d7f15e..b2d8c37 100644
--- a/source/text/shared/optionen/01010000.xhp
+++ b/source/text/shared/optionen/01010000.xhp
@@ -56,7 +56,7 @@
<embed href="text/shared/optionen/01030300.xhp#security"/>
<embed href="text/shared/optionen/01012000.xhp#appearance"/>
<embed href="text/shared/optionen/01013000.xhp#accessibility"/>
- <embed href="text/shared/optionen/java.xhp#java"/>
+ <embed href="text/shared/optionen/java.xhp#advanced"/>
<embed href="text/shared/optionen/online_update.xhp#online_update"/>
<!-- fdo#33468 <embed
href="text/shared/optionen/improvement.xhp#improvement"/> -->
<embed href="text/shared/00/00000001.xhp#zurueck"/>
diff --git a/source/text/shared/optionen/01010600.xhp
b/source/text/shared/optionen/01010600.xhp
index a6c4b0a..1d8dfa5 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -42,7 +42,6 @@
<bookmark_value>saving; dialog settings</bookmark_value>
<bookmark_value>years; 2-digit options</bookmark_value>
<bookmark_value>Help Agent;options</bookmark_value>
- <bookmark_value>experimental features</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E"
oldref="42"
localize="false"/>
@@ -97,7 +96,5 @@
<section id="jahreszahlen">
<paragraph xml-lang="en-US" id="par_id3156343" role="paragraph"
l10n="U" oldref="7">In $[officename], years are indicated by four digits, so
that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year
(two digits)</emph> setting allows the user to define the years in which
two-digit dates are added to 2000. To illustrate, if you specify a date of
1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of
1/1/1920.</paragraph>
</section>
-<paragraph xml-lang="en-US" id="hd_id3148618" role="heading" level="2">Enable
experimental (unstable) features</paragraph>
-<paragraph xml-lang="en-US" id="par_id3156344" role="paragraph">It enables
features that are not yet complete or contain known bugs. The list of these
features is different version by version, or even it can be empty. In
%PRODUCTNAME 3.6 it enables in-line formula editing in %PRODUCTNAME Math (so it
is possibel to type inside the formula and navigate around it with cursor
keys), and it also enables macro recording.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/java.xhp
b/source/text/shared/optionen/java.xhp
index 04badd0..7174470 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -35,19 +35,19 @@
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionenjavaxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Java</title>
+<title id="tit" xml-lang="en-US">Advanced</title>
<filename>/text/shared/optionen/java.xhp</filename>
</topic>
</meta>
<body>
-<section id="java">
-<bookmark xml-lang="en-US" branch="index"
id="bm_id4077578"><bookmark_value>Java;setting options</bookmark_value>
+<section id="advanced">
+<bookmark xml-lang="en-US" branch="index"
id="bm_id4077578"><bookmark_value>Java;setting
options</bookmark_value><bookmark_value>experimental
features</bookmark_value><bookmark_value>unstable options</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/shared/optionen/java.xhp">Java</link></paragraph>
-<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="CHG">Specifies the support options for Java applications in %PRODUCTNAME,
including which Java Runtime Environment (JRE) to use.</paragraph>
+<paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="1"
l10n="NEW"><link
href="text/shared/optionen/java.xhp">Advanced</link></paragraph>
+<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="CHG">Specifies the support options for Java applications in %PRODUCTNAME,
including which Java Runtime Environment (JRE) to use. It also specifies
whether to use experimental (unstable) features such as macro
recording.</paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#java"/>
+ <embed href="text/shared/00/00000406.xhp#advanced"/>
</section>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2"
l10n="NEW">Java options</paragraph>
<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_INET_SCRIPTING_CB_J_ENABLE -->
@@ -61,5 +61,9 @@
<paragraph role="paragraph" id="par_idN10657" xml-lang="en-US"
l10n="NEW"><ahelp
hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER">Opens the <link
href="text/shared/optionen/javaparameters.xhp">Java Start Parameters</link>
dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH"
id="bm_id5799127" localize="false"/><paragraph role="heading" id="par_idN105AD"
xml-lang="en-US" level="3" l10n="NEW">Class Path</paragraph>
<paragraph role="paragraph" id="par_idN10686" xml-lang="en-US"
l10n="NEW"><ahelp
hid="svx:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH">Opens the <link
href="text/shared/optionen/javaclasspath.xhp">Class Path</link>
dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148618" role="heading"
level="2">Optional (unstable) options</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148619" role="heading" level="3">Enable
experimental features</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156344" role="paragraph">It enables
features that are not yet complete or contain known bugs. The list of these
features is different version by version, or even it can be empty.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148610" role="heading" level="3">Enable
macro recording</paragraph><paragraph xml-lang="en-US" id="par_id3156345"
role="paragraph">It enables macro recording, so the <link
href="text/shared/guide/macro_recording.xhp" name="Tools - Macros - Record
Macro"><item type="menuitem">Tools - Macros - Record Macro</item></link> menu
item will be available.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/javaclasspath.xhp
b/source/text/shared/optionen/javaclasspath.xhp
index 32c5652..a5b9a1d 100644
--- a/source/text/shared/optionen/javaclasspath.xhp
+++ b/source/text/shared/optionen/javaclasspath.xhp
@@ -43,7 +43,7 @@
<paragraph role="heading" id="par_idN10566" xml-lang="en-US" level="1"
l10n="NEW">Class Path</paragraph>
<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">You
use this dialog to add folders and archives to the Java class path. These paths
are valid for any JRE that you start.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#java"/>
+ <embed href="text/shared/00/00000406.xhp#advanced"/>
</section>
<!-- removed HID SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH -->
<bookmark xml-lang="en-US"
branch="hid/cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH" id="bm_id6794640"
localize="false"/>
diff --git a/source/text/shared/optionen/javaparameters.xhp
b/source/text/shared/optionen/javaparameters.xhp
index fc42f59..360c6d5 100644
--- a/source/text/shared/optionen/javaparameters.xhp
+++ b/source/text/shared/optionen/javaparameters.xhp
@@ -45,7 +45,7 @@ dedr: reviewed</lastedited>
<paragraph role="heading" id="par_idN10545" xml-lang="en-US" level="1"
l10n="NEW">Java Start Parameters</paragraph>
<paragraph role="paragraph" id="par_idN10549" xml-lang="en-US" l10n="NEW">You
can use this dialog to enter optional start parameters for the Java runtime
environment (JRE). The settings that you specify in this dialog are valid for
any JRE that you start.</paragraph>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#java"/>
+ <embed href="text/shared/00/00000406.xhp#advanced"/>
</section>
<bookmark xml-lang="en-US"
branch="hid/cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER" id="bm_id1370891"
localize="false"/>
<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2"
l10n="NEW">Java Start parameter</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
