diff options
author | Jan Holesovsky <kendy@suse.cz> | 2012-01-03 16:44:16 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-01-03 16:46:09 +0100 |
commit | 87c767e7ff586490378235635fec44b1d8e9de4e (patch) | |
tree | 4e5fe7d91dba4d803335d1446f3641342030f7af | |
parent | dee380aa5945da84c70622e4dfeffc23838937f1 (diff) |
Online update: Enable the online update help again.
This partially reverts these commits:
695e40703c30101faf864ac1475e1226f9642709
c021e070fe4d401d067725b9058010cf16e2c5c8
-rw-r--r-- | helpcontent2/source/text/shared/00/00000406.xhp | 4 | ||||
-rw-r--r-- | helpcontent2/source/text/shared/01/makefile.mk | 2 | ||||
-rw-r--r-- | helpcontent2/source/text/shared/optionen/01010000.xhp | 6 | ||||
-rw-r--r-- | helpcontent2/source/text/shared/optionen/makefile.mk | 1 | ||||
-rw-r--r-- | helpcontent2/util/sbasic/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/scalc/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/schart/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/sdatabase/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/sdraw/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/simpress/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/smath/makefile.mk | 3 | ||||
-rw-r--r-- | helpcontent2/util/swriter/makefile.mk | 3 |
12 files changed, 32 insertions, 5 deletions
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp index 7cee3c0b20..bda5d05634 100644 --- a/helpcontent2/source/text/shared/00/00000406.xhp +++ b/helpcontent2/source/text/shared/00/00000406.xhp @@ -209,8 +209,8 @@ </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> -<!-- 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_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> diff --git a/helpcontent2/source/text/shared/01/makefile.mk b/helpcontent2/source/text/shared/01/makefile.mk index f630d02d3a..2f93f2c358 100644 --- a/helpcontent2/source/text/shared/01/makefile.mk +++ b/helpcontent2/source/text/shared/01/makefile.mk @@ -320,6 +320,8 @@ XHPFILES = \ guides.xhp \ mediaplayer.xhp \ moviesound.xhp \ + online_update.xhp \ + online_update_dialog.xhp \ packagemanager.xhp \ password_dlg.xhp \ password_main.xhp \ diff --git a/helpcontent2/source/text/shared/optionen/01010000.xhp b/helpcontent2/source/text/shared/optionen/01010000.xhp index 1bc097d280..9d7f15e5aa 100644 --- 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"/> -<!-- fdo#33468 <embed href="text/shared/optionen/online_update.xhp#online_update"/> - <embed href="text/shared/optionen/improvement.xhp#improvement"/> --> + <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"/> </body> -</helpdocument>
\ No newline at end of file +</helpdocument> diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk index 1ae8f58da0..219b69106c 100644 --- a/helpcontent2/source/text/shared/optionen/makefile.mk +++ b/helpcontent2/source/text/shared/optionen/makefile.mk @@ -119,6 +119,7 @@ XHPFILES = \ macrosecurity_sl.xhp \ macrosecurity_ts.xhp \ mailmerge.xhp \ + online_update.xhp \ serverauthentication.xhp \ testaccount.xhp \ viewcertificate.xhp \ diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk index 7708374f64..ddd093cc26 100644 --- a/helpcontent2/util/sbasic/makefile.mk +++ b/helpcontent2/util/sbasic/makefile.mk @@ -671,6 +671,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1234,6 +1236,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index fe8c363ab9..52343f40d2 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -685,6 +685,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1248,6 +1250,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk index 1d8f34575d..20a54d393a 100644 --- a/helpcontent2/util/schart/makefile.mk +++ b/helpcontent2/util/schart/makefile.mk @@ -372,6 +372,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -935,6 +937,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk index 93526c3129..178920fa1f 100644 --- a/helpcontent2/util/sdatabase/makefile.mk +++ b/helpcontent2/util/sdatabase/makefile.mk @@ -370,6 +370,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -933,6 +935,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index ceb4827e96..9253fbd51e 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -604,6 +604,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1167,6 +1169,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk index 4e967e3ff8..63b9cd8b5c 100644 --- a/helpcontent2/util/simpress/makefile.mk +++ b/helpcontent2/util/simpress/makefile.mk @@ -606,6 +606,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1169,6 +1171,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk index a7040b6692..1eb16161de 100644 --- a/helpcontent2/util/smath/makefile.mk +++ b/helpcontent2/util/smath/makefile.mk @@ -450,6 +450,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1013,6 +1015,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index 074d542383..b9035bf1e5 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -762,6 +762,8 @@ LINKLINKFILES= \ text$/shared$/01$/guides.xhp \ text$/shared$/01$/mediaplayer.xhp \ text$/shared$/01$/moviesound.xhp \ + text$/shared$/01$/online_update.xhp \ + text$/shared$/01$/online_update_dialog.xhp \ text$/shared$/01$/packagemanager.xhp \ text$/shared$/01$/password_dlg.xhp \ text$/shared$/01$/password_main.xhp \ @@ -1325,6 +1327,7 @@ LINKLINKFILES= \ text$/shared$/optionen$/macrosecurity_sl.xhp \ text$/shared$/optionen$/macrosecurity_ts.xhp \ text$/shared$/optionen$/mailmerge.xhp \ + text$/shared$/optionen$/online_update.xhp \ text$/shared$/optionen$/serverauthentication.xhp \ text$/shared$/optionen$/testaccount.xhp \ text$/shared$/optionen$/viewcertificate.xhp \ |