Merge pull request #485 from nextcloud/stable10-reenable-help-section

[Stable10] reenable help section

Author: MorrisJobke

lib/private/legacy/app.php

@@ -421,9 +421,7 @@ public static function getSettingsNavigation() {
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		/*
-		 * FIXME: Add help sidebar back once documentation is properly branded.
-		 if (OC_Util::getEditionString() === '' &&
+		if (OC_Util::getEditionString() === '' &&
 			\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
 		) {
 			$settings = array(
@@ -435,7 +433,7 @@ public static function getSettingsNavigation() {
 					"icon" => $urlGenerator->imagePath("settings", "help.svg")
 				)
 			);
-		}*/
+		}
 
 		// if the user is logged-in
 		if (OC_User::isLoggedIn()) {

settings/templates/help.php

@@ -16,27 +16,27 @@
 	<?php } ?>
 
 		<li>
-			<a href="https://owncloud.org/support" target="_blank" rel="noreferrer">
+			<a href="https://docs.nextcloud.org" target="_blank" rel="noreferrer">
 				<?php p($l->t('Online documentation')); ?> ↗
 			</a>
 		</li>
 		<li>
-			<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
+			<a href="https://help.nextcloud.com" target="_blank" rel="noreferrer">
 				<?php p($l->t('Forum')); ?> ↗
 			</a>
 		</li>
 
 	<?php if($_['admin']) { ?>
 		<li>
-			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+			<a href="https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md"
 				target="_blank" rel="noreferrer">
 				<?php p($l->t('Issue tracker')); ?> ↗
 			</a>
 		</li>
 	<?php } ?>
 
 	<li>
-		<a href="https://owncloud.com/subscriptions/" target="_blank" rel="noreferrer">
+		<a href="https://nextcloud.com/enterprise/" target="_blank" rel="noreferrer">
 			<?php p($l->t('Commercial support')); ?> ↗
 		</a>
 	</li>