summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-17 03:13:17 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-17 03:13:17 -0700
commit264ee9df9afa8e042ff7395c25979e47d7b71722 (patch)
tree2fc0fcdded61ebfeaa345f4056cd53badd3ac13c
parente761cba80821edd75f36a33300ffa20294c6bdba (diff)
parent746d32eb059267799af8c5797850a6843e04d19f (diff)
downloadnextcloud-server-264ee9df9afa8e042ff7395c25979e47d7b71722.tar.gz
nextcloud-server-264ee9df9afa8e042ff7395c25979e47d7b71722.zip
Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
-rw-r--r--core/doc/admin/index.html (renamed from core/doc/admin/index.php)0
-rw-r--r--core/doc/user/index.html (renamed from core/doc/user/index.php)0
-rw-r--r--settings/help.php4
3 files changed, 2 insertions, 2 deletions
diff --git a/core/doc/admin/index.php b/core/doc/admin/index.html
index 7785f2ce2f1..7785f2ce2f1 100644
--- a/core/doc/admin/index.php
+++ b/core/doc/admin/index.html
diff --git a/core/doc/user/index.php b/core/doc/user/index.html
index ede62f05aee..ede62f05aee 100644
--- a/core/doc/user/index.php
+++ b/core/doc/user/index.html
diff --git a/settings/help.php b/settings/help.php
index 713b23f7857..88693939b84 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -14,11 +14,11 @@ OC_App::setActiveNavigationEntry( "help" );
if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
- $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin' );
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin/index.html' );
$style1='';
$style2=' pressed';
}else{
- $url=OC_Helper::linkToAbsolute( 'core', 'doc/user' );
+ $url=OC_Helper::linkToAbsolute( 'core', 'doc/user/index.html' );
$style1=' pressed';
$style2='';
}