From 64fe06710aba6a512e19a3a8a896278e503389b0 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 4 Jun 2012 12:49:33 +0200
Subject: [PATCH 1/2] add deprecated warning

---
 lib/public/app.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/public/app.php b/lib/public/app.php
index 1a46180bb96..0df665f9bce 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -36,7 +36,8 @@ namespace OCP;
 class App {
 
         /**
-         * @brief makes owncloud aware of this app
+         * @brief Makes owncloud aware of this app
+         * @brief This call is deprecated and not necessary to use.
          * @param $data array with all information
          * @returns true/false
          *

From b48228ae3d27b277003b7baee39ca7711d4a5f7f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 13:04:18 +0200
Subject: [PATCH 2/2] LDAP: link to documentation on settings page

---
 apps/user_ldap/templates/settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 34c4f8f9d90..a0e5c15f3a3 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,6 +4,7 @@
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
+	<p style="text-align:right; float:right; margin: 2ex 1em;"><a href="http://owncloud.org/support/ldap-backend/" target="_blank">How to configure the LDAP backend <img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" /></a></p>
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_host"><?php echo $l->t('Host');?><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>"></label> <label for="ldap_base"><?php echo $l->t('Base');?></label><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" /></p>
 		<p><label for="ldap_dn"><?php echo $l->t('Name');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" />
@@ -26,7 +27,7 @@
 		<label for="ldap_quota_def">Quota Default</label><input type="text" id="ldap_quota_def" name="ldap_quota_def" value="<?php if (isset($_['ldap_quota_def'])) echo $_['ldap_quota_def']; ?>" />bytes</p>
 		<p><label for="ldap_email_attr">Email Attribute</label><input type="text" id="ldap_email_attr" name="ldap_email_attr" value="<?php echo $_['ldap_email_attr']; ?>" /></p>
 	</fieldset>
-	<input type="submit" value="Save" />
+	<input type="submit" value="Save" /> <a href="http://owncloud.org/support/ldap-backend/" target="_blank"><img src="<?php echo OCP\Util::imagePath('','actions/info.png'); ?>" style="height:1.75ex" /> <?php echo $l->t('Help');?></a>
 	</div>
 
 </form>