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 7d7f0aff68 Cleaning up Help files from ODK 7d7f0aff68 is described below commit 7d7f0aff6856fc2af08f9331050027dbc625de18 Author: mseidel <msei...@apache.org> AuthorDate: Sat Feb 3 00:48:44 2024 +0100 Cleaning up Help files from ODK (cherry picked from commit f2c86871916be869074b9bd6a040ecf9bc27e812) --- .../DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp | 14 +++++++------- .../DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp | 13 +++++++------ .../help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp | 10 ++++++---- .../DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp | 14 +++++++------- .../DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp | 13 +++++++------ .../help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp | 10 ++++++---- 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp index 38bfef9bb6..735d338171 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextpage1" indexer="include" status="PUBLISH"> @@ -54,9 +56,7 @@ <paragraph role="paragraph" id="par_id0010" xml-lang="de">Ich mag Fuell-Text. Ich mag Fuell-Text. Ich mag Fuell-Text.</paragraph> <section id="target"> <paragraph role="heading" id="hd_id0004" xml-lang="de" level="2">Section "target"</paragraph> -<paragraph role="paragraph" id="par_id0011" xml-lang="de"> -This is a section within the file page1.xhp. The section has the name "target". -</paragraph> +<paragraph role="paragraph" id="par_id0011" xml-lang="de">This is a section within the file page1.xhp. The section has the name "target".</paragraph> </section> <paragraph role="heading" id="hd_id0005" xml-lang="de" level="2">Noch mehr Fuell-Text</paragraph> <paragraph role="paragraph" id="par_id0012" xml-lang="de" >Dieser Text fuellt die Seite um die Section "target" oben anzeigen zu koennen.</paragraph> diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp index d4b4a7d2f8..56f4c5f2d8 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextpage2" indexer="include" status="PUBLISH"> @@ -39,8 +41,7 @@ <link href="text/shared/guide/main.xhp">Dies</link> ist ein Link zu einer Hilfe-Seite in der installierten Hilfe.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id0004" xml-lang="de"> -Diese Section zeigt einen Link der durch Einfuegen der "linkvar" Variable aus subfolder/anotherpage.xhp erzeugt wurde. -</paragraph> +Diese Section zeigt einen Link der durch Einfuegen der "linkvar" Variable aus subfolder/anotherpage.xhp erzeugt wurde.</paragraph> <embed href="com.foocorp.foo-ext/subfolder/anotherpage.xhp#linkvar"/> </section> </body> diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp index 9f7598675f..c3f3cd0b75 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextsubfolder/anotherpage" indexer="include" status="PUBLISH"> diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp index a60326e0d4..01eae335af 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextpage1" indexer="include" status="PUBLISH"> @@ -54,9 +56,7 @@ <paragraph role="paragraph" id="par_id0010" xml-lang="en-US">I like fill text. I like fill text. I like fill text.</paragraph> <section id="target"> <paragraph role="heading" id="hd_id0004" xml-lang="en-US" level="2">Section "target"</paragraph> -<paragraph role="paragraph" id="par_id0011" xml-lang="en-US"> -This is a section within the file page1.xhp. The section has the name "target". -</paragraph> +<paragraph role="paragraph" id="par_id0011" xml-lang="en-US">This is a section within the file page1.xhp. The section has the name "target".</paragraph> </section> <paragraph role="heading" id="hd_id0005" xml-lang="en-US" level="2">Some more fill text</paragraph> <paragraph role="paragraph" id="par_id0012" xml-lang="en-US">This text fills the page allowing to show section "target" at the top.</paragraph> diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp index 62456c931c..0c8743f044 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextpage2" indexer="include" status="PUBLISH"> @@ -38,8 +40,7 @@ <paragraph role="paragraph" id="par_id0003" xml-lang="en-US"> <link href="text/shared/guide/main.xhp">This</link> is a link to a file of the already installed help.</paragraph> <section id="relatedtopics"> -<paragraph role="paragraph" id="par_id0004" xml-lang="en-US"> -This section shows a link created by embedding the "linkvar" variable defined in subfolder/anotherpage.xhp.</paragraph> +<paragraph role="paragraph" id="par_id0004" xml-lang="en-US">This section shows a link created by embedding the "linkvar" variable defined in subfolder/anotherpage.xhp.</paragraph> <embed href="com.foocorp.foo-ext/subfolder/anotherpage.xhp#linkvar"/> </section> </body> diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp index 59869e6b7d..00d8d46fae 100644 --- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp +++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp @@ -1,6 +1,7 @@ <?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 @@ -8,17 +9,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. - * + * ***********************************************************--> + <helpdocument version="1.0"> <meta> <topic id="comfoocorpfooextsubfolder/anotherpage" indexer="include" status="PUBLISH">