summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <timar@fsf.hu>2011-02-27 10:10:17 +0100
committerAndras Timar <timar@fsf.hu>2011-02-27 10:10:17 +0100
commit695e40703c30101faf864ac1475e1226f9642709 (patch)
tree9ee0eb35200a1fac0be04193bf43f1300099ee86
parent54108f6fd3f8355d12db0217d21fbab9dccf5ed8 (diff)
helpcontent: remove Online Update and Improvement program fdo#33468
text was not removed - we may need it later commented out + removed from makefile
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp8
-rw-r--r--helpcontent2/source/text/shared/01/makefile.mk4
-rw-r--r--helpcontent2/source/text/shared/main0108.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010000.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/makefile.mk4
5 files changed, 10 insertions, 14 deletions
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index d16dda556..c697d857a 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -209,14 +209,14 @@
</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>
</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>
+<!-- fdo#33468 <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> -->
<paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
-</variable></paragraph>
+<!-- fdo#33468 <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
+</variable></paragraph> -->
<paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk
index 0ce209213..631d0b962 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -321,8 +321,6 @@ XHPFILES = \
guides.xhp \
mediaplayer.xhp \
moviesound.xhp \
- online_update.xhp \
- online_update_dialog.xhp \
packagemanager.xhp \
password_dlg.xhp \
password_main.xhp \
@@ -337,7 +335,7 @@ XHPFILES = \
xformsdatachange.xhp \
xformsdataname.xhp \
xformsdatatab.xhp
-
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index eed954370..6a5b420b0 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -66,10 +66,10 @@
<bookmark xml-lang="en-US" branch="hid/SID_HELP_SUPPORTPAGE" id="bm_id5582987" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelpSupport" id="bm_id3159176" localize="false"/><paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="15">Support</paragraph>
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
-<embed href="text/shared/01/08060100.xhp#registrierung"/>
+<!-- fdo#33468 <embed href="text/shared/01/08060100.xhp#registrierung"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph> -->
<bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:About">Displays general program information such as version number and copyrights.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp
index 0d5618684..1bc097d28 100755
--- a/helpcontent2/source/text/shared/optionen/01010000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010000.xhp
@@ -57,8 +57,8 @@
<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/online_update.xhp#online_update"/>
- <embed href="text/shared/optionen/improvement.xhp#improvement"/>
+<!-- fdo#33468 <embed href="text/shared/optionen/online_update.xhp#online_update"/>
+ <embed href="text/shared/optionen/improvement.xhp#improvement"/> -->
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index 6804a1f09..c685eb4a7 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -113,7 +113,6 @@ XHPFILES = \
01160100.xhp \
01160200.xhp \
01160201.xhp \
- improvement.xhp \
java.xhp \
javaclasspath.xhp \
javaparameters.xhp \
@@ -121,14 +120,13 @@ XHPFILES = \
macrosecurity_sl.xhp \
macrosecurity_ts.xhp \
mailmerge.xhp \
- online_update.xhp \
serverauthentication.xhp \
testaccount.xhp \
viewcertificate.xhp \
viewcertificate_c.xhp \
viewcertificate_d.xhp \
viewcertificate_g.xhp
-
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk