From 8b37e25ec207e1010edd66883cedfa1d39b3578c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 30 Apr 2015 17:10:24 -0400
Subject: [PATCH 1/2] add admin documentation links for Sharing, Encryption and
 Email server

---
 settings/templates/admin.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 587a3b6c66..5edf4e2a9c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -180,6 +180,9 @@ if ($_['cronErrors']) {
 
 	<div class="section" id="shareAPI">
 		<h2><?php p($l->t('Sharing'));?></h2>
+		<a target="_blank" class="icon-info svg"
+			title="<?php p($l->t('Open documentation'));?>"
+			href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
 		<p id="enable">
 			<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
 				   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
@@ -310,7 +313,10 @@ if ($_['cronErrors']) {
 </div>
 
 <div class="section" id='encryptionAPI'>
-	<h2><?php p($l->t('Server-side encryption')); ?> </h2>
+	<h2><?php p($l->t('Server-side encryption')); ?></h2>
+	<a target="_blank" class="icon-info svg"
+		title="<?php p($l->t('Open documentation'));?>"
+		href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
 
 	<p id="enable">
 		<input type="checkbox" name="encryption_enabled"
@@ -359,6 +365,9 @@ if ($_['cronErrors']) {
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
 		<h2><?php p($l->t('Email server'));?></h2>
+		<a target="_blank" class="icon-info svg"
+			title="<?php p($l->t('Open documentation'));?>"
+			href="<?php p(link_to_docs('admin-email')); ?>"></a>
 
 		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
 

From 9ec80377e6b4ff6cff56bb91ba2d2f27fa0fb847 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 30 Apr 2015 17:12:34 -0400
Subject: [PATCH 2/2] fix layout for documentation link hints

---
 settings/css/settings.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index f610e96eea..583e880495 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -368,8 +368,15 @@ table.grid td.date{
 	display: inline-block;
 }
 
+/* correctly display help icons next to headings */
 .icon-info {
 	padding: 11px 20px;
+	vertical-align: text-bottom;
+}
+#shareAPI h2,
+#encryptionAPI h2,
+#mail_general_settings h2 {
+	display: inline-block;
 }
 
 .mail_settings p label:first-child {