This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 3d4e38430c Update main0108.xhp (#195)
3d4e38430c is described below
commit 3d4e38430c721217b40b97ae4e3b30861c8113b6
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Mon Dec 25 01:42:44 2023 +0100
Update main0108.xhp (#195)
* Update main0108.xhp
We still build with Help instructions to purchase OpenOffice. This should
be removed.
* Further changes
(cherry picked from commit aabcc2e6b71dc9438871fcec1507ebb86fe54c7a)
---
.../source/text/shared/autopi/makefile.mk | 11 ++---
.../source/text/shared/autopi/purchase.xhp | 50 ----------------------
main/helpcontent2/source/text/shared/main0108.xhp | 1 -
main/helpcontent2/util/sbasic/makefile.mk | 16 +++----
main/helpcontent2/util/scalc/makefile.mk | 14 +++---
main/helpcontent2/util/schart/makefile.mk | 14 +++---
main/helpcontent2/util/sdatabase/makefile.mk | 14 +++---
main/helpcontent2/util/sdraw/makefile.mk | 3 --
main/helpcontent2/util/simpress/makefile.mk | 3 --
main/helpcontent2/util/smath/makefile.mk | 14 +++---
main/helpcontent2/util/swriter/makefile.mk | 14 +++---
11 files changed, 35 insertions(+), 119 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/autopi/makefile.mk
b/main/helpcontent2/source/text/shared/autopi/makefile.mk
index 3e940e9b67..9be5cef879 100644
--- a/main/helpcontent2/source/text/shared/autopi/makefile.mk
+++ b/main/helpcontent2/source/text/shared/autopi/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
# edit to match directory level
PRJ = ..$/..$/..$/..
# same for all makefiles in "helpcontent2"
@@ -105,7 +103,6 @@ XHPFILES = \
01170300.xhp \
01170400.xhp \
01170500.xhp \
- purchase.xhp \
startup.xhp \
webwizard00.xhp \
webwizard01.xhp \
diff --git a/main/helpcontent2/source/text/shared/autopi/purchase.xhp
b/main/helpcontent2/source/text/shared/autopi/purchase.xhp
deleted file mode 100644
index 6049b21964..0000000000
--- a/main/helpcontent2/source/text/shared/autopi/purchase.xhp
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedautopipurchasexhp" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Purchase %PRODUCTNAME</title>
-<filename>/text/shared/autopi/purchase.xhp</filename>
-</topic>
-</meta>
-<body>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/shared/autopi/purchase.xhp">Purchase
%PRODUCTNAME</link></paragraph><comment>removed "commercial" switch, excluded
from full text index</comment><paragraph role="paragraph" id="par_idN10574"
xml-lang="en-US" l10n="NEW">This wizard is visible for the evaluation version
of %PRODUCTNAME. If you are using a time-limited evaluation version of
%PRODUCTNAME, you can purchase a license online. You [...]
-<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US" l10n="NEW">The
wizard can be called any time from the Help menu. The wizard will be offered
automatically starting five days before the evaluation period
expires.</paragraph>
-<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US" l10n="NEW">The
wizard consists of the following steps:</paragraph>
-<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2"
l10n="NEW">Purchase %PRODUCTNAME</paragraph>
-<paragraph role="paragraph" id="par_idN10581" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">This is the welcome page of the wizard. If you want
to buy a serial number online, click the button. If you already have a serial
number, click Next to enter the number on the next page.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="3"
l10n="NEW">Get your serial number online</paragraph>
-<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Click to enter a web page, where you can purchase a
serial number online.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="2"
l10n="NEW">Unlock %PRODUCTNAME</paragraph>
-<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter your serial number or copy and paste the number
from the online web page.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105B6" xml-lang="en-US" level="2"
l10n="NEW">License Agreement</paragraph>
-<paragraph role="paragraph" id="par_idN105BA" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Please read the license text (scroll down the text
accordingly), then accept the license to continue unlocking. If you do not
accept the license, the software will not be unlocked.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2"
l10n="NEW">Personal Data</paragraph>
-<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">This step of the wizard appears when the unlocking
program finds an installed version of %PRODUCTNAME where some user settings can
be copied to the new installation.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105DC" xml-lang="en-US" level="3"
l10n="NEW">Copy personal data</paragraph>
-<paragraph role="paragraph" id="par_idN105E0" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select this box to copy your user name and other data
from a previous installation to your new installation of
%PRODUCTNAME.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN105EF" xml-lang="en-US" level="2"
l10n="NEW">Summary</paragraph>
-<paragraph role="paragraph" id="par_idN105F3" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">This is the last page of the Purchase %PRODUCTNAME
Wizard.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/main/helpcontent2/source/text/shared/main0108.xhp
b/main/helpcontent2/source/text/shared/main0108.xhp
index 1434cd14aa..f77a892158 100644
--- a/main/helpcontent2/source/text/shared/main0108.xhp
+++ b/main/helpcontent2/source/text/shared/main0108.xhp
@@ -55,7 +55,6 @@
<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>
<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 <switchinline
select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools - O [...]
-<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 te [...]
<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>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/main/helpcontent2/util/sbasic/makefile.mk
b/main/helpcontent2/util/sbasic/makefile.mk
index a92fe42949..6cf4beb0b9 100644
--- a/main/helpcontent2/util/sbasic/makefile.mk
+++ b/main/helpcontent2/util/sbasic/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -920,7 +917,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
@@ -1244,7 +1240,7 @@ LINKLINKFILES= \
text$/shared$/optionen$/viewcertificate_c.xhp \
text$/shared$/optionen$/viewcertificate_d.xhp \
text$/shared$/optionen$/viewcertificate_g.xhp \
- text$/shared$/tree_strings.xhp
+ text$/shared$/tree_strings.xhp
# --- Targets ------------------------------------------------------
diff --git a/main/helpcontent2/util/scalc/makefile.mk
b/main/helpcontent2/util/scalc/makefile.mk
index d65b230beb..a2dfcb0a0c 100644
--- a/main/helpcontent2/util/scalc/makefile.mk
+++ b/main/helpcontent2/util/scalc/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -933,7 +930,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/schart/makefile.mk
b/main/helpcontent2/util/schart/makefile.mk
index bba764519d..604f2f9050 100644
--- a/main/helpcontent2/util/schart/makefile.mk
+++ b/main/helpcontent2/util/schart/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -621,7 +618,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/sdatabase/makefile.mk
b/main/helpcontent2/util/sdatabase/makefile.mk
index 273996bc9b..5f47b2f570 100644
--- a/main/helpcontent2/util/sdatabase/makefile.mk
+++ b/main/helpcontent2/util/sdatabase/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -619,7 +616,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/sdraw/makefile.mk
b/main/helpcontent2/util/sdraw/makefile.mk
index 019399772e..22302310d4 100644
--- a/main/helpcontent2/util/sdraw/makefile.mk
+++ b/main/helpcontent2/util/sdraw/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
@@ -852,7 +850,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/simpress/makefile.mk
b/main/helpcontent2/util/simpress/makefile.mk
index c290aab512..423599a8c2 100644
--- a/main/helpcontent2/util/simpress/makefile.mk
+++ b/main/helpcontent2/util/simpress/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
@@ -862,7 +860,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/smath/makefile.mk
b/main/helpcontent2/util/smath/makefile.mk
index eb6f775755..9ebdf84cdc 100644
--- a/main/helpcontent2/util/smath/makefile.mk
+++ b/main/helpcontent2/util/smath/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -699,7 +696,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
diff --git a/main/helpcontent2/util/swriter/makefile.mk
b/main/helpcontent2/util/swriter/makefile.mk
index 53b97fb3a6..4f0bfedb69 100644
--- a/main/helpcontent2/util/swriter/makefile.mk
+++ b/main/helpcontent2/util/swriter/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,22 +7,19 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
-
-# edit to match directory level
+# edit to match directory level
PRJ = ..$/..
# same for all makefiles in "helpcontent2"
PRJNAME = helpcontent2
@@ -1011,7 +1008,6 @@ LINKLINKFILES= \
text$/shared$/autopi$/01170300.xhp \
text$/shared$/autopi$/01170400.xhp \
text$/shared$/autopi$/01170500.xhp \
- text$/shared$/autopi$/purchase.xhp \
text$/shared$/autopi$/startup.xhp \
text$/shared$/autopi$/webwizard00.xhp \
text$/shared$/autopi$/webwizard01.xhp \
