summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-18 11:39:32 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2021-03-18 18:56:07 +0100
commit75d047408148b9c914b964017738d3b96b528017 (patch)
tree674f48810dd05ee5901107ca64e7ea73e53fd261
parentremove obsolete file that should not have been added (diff)
downloadhelp-75d047408148b9c914b964017738d3b96b528017.tar.gz
help-75d047408148b9c914b964017738d3b96b528017.zip
tdf#140890 Remove LDAP data source for Base
Change-Id: If937c8d2f5c7b294cd89ec8194552e42ebac6a4d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112691 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--AllLangHelp_shared.mk1
-rw-r--r--source/text/shared/explorer/database/dabawiz00.xhp1
-rw-r--r--source/text/shared/explorer/database/dabawiz02ldap.xhp58
3 files changed, 0 insertions, 60 deletions
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index d724325494..d81d87cd5e 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -890,7 +890,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/explorer/database/dabawiz02ado \
helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \
helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \
- helpcontent2/source/text/shared/explorer/database/dabawiz02ldap \
helpcontent2/source/text/shared/explorer/database/dabawiz02mysql \
helpcontent2/source/text/shared/explorer/database/dabawiz02odbc \
helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \
diff --git a/source/text/shared/explorer/database/dabawiz00.xhp b/source/text/shared/explorer/database/dabawiz00.xhp
index 396b18c628..26ab94f9d3 100644
--- a/source/text/shared/explorer/database/dabawiz00.xhp
+++ b/source/text/shared/explorer/database/dabawiz00.xhp
@@ -61,7 +61,6 @@
<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_idN10610" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02ldap.xhp">Set up LDAP connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz02ldap.xhp b/source/text/shared/explorer/database/dabawiz02ldap.xhp
deleted file mode 100644
index 4f54f20cff..0000000000
--- a/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- -->
-
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedexplorerdatabasedabawiz02ldapxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">LDAP Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02ldap.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id22583"><bookmark_value>LDAP server; address books (Base)</bookmark_value>
-<bookmark_value>address books; LDAP server (Base)</bookmark_value>
-<bookmark_value>data sources; LDAP server (Base)</bookmark_value>
-</bookmark><comment>mw copied 3 entries from shared/explorer/database/11190000.xhp</comment>
-<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><variable id="ldap"><link href="text/shared/explorer/database/dabawiz02ldap.xhp">LDAP Connection</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"><ahelp hid=".">Specifies the settings for importing a database using LDAP</ahelp> (<emph>Lightweight Directory Access Protocol)</emph>. This page is only available if you registered an LDAP server as an address database.<comment>UFI: copied text from shared\explorer\database\11190000</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_HOSTNAME" id="bm_id3147275" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/ldapconnectionpage/hostNameEntry" id="bm_id7872249" localize="false"/>
-<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2">Server URL</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US"><ahelp hid="HID_DSADMIN_LDAP_HOSTNAME">Enter the name of the LDAP server using the format "ldap.server.com".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_BASEDN" id="bm_id3145315" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/ldapconnectionpage/baseDNEntry" id="bm_id7593920" localize="false"/>
-<paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2">Base DN</paragraph>
-<paragraph role="paragraph" id="par_idN10598" xml-lang="en-US"><ahelp hid="HID_DSADMIN_LDAP_BASEDN">Enter the starting point to search the LDAP database, for example, "dc=com".</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER" id="bm_id3155341" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/ldapconnectionpage/portNumEntry" id="bm_id5359660" localize="false"/>
-<paragraph role="heading" id="par_idN105B7" xml-lang="en-US" level="2">Port number</paragraph>
-<paragraph role="paragraph" id="par_idN105BB" xml-lang="en-US"><ahelp hid="HID_DSADMIN_LDAP_PORTNUMBER">Enter the port of the LDAP server, normally 389.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/ldapconnectionpage/useSSLCheckbutton" id="bm_id9989623" localize="false"/>
-<paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3">Use secure connection (SSL)</paragraph>
-<paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
-<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
-</section>
-</body>
-</helpdocument>