aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-07 10:12:02 +1100
committerGitHub <noreply@github.com>2016-12-07 10:12:02 +1100
commitabb045e1ffc73cded20df613933b2c68a76cf9c1 (patch)
tree655d01dfddacb62149c3aed24668ab9728c8f675
parent4c1701ca77b68499fad0f4440d7ff40d4fd96cff (diff)
parentae97afd806656467b8704ecffda73dceffa98be0 (diff)
downloadvolse-hubzilla-abb045e1ffc73cded20df613933b2c68a76cf9c1.tar.gz
volse-hubzilla-abb045e1ffc73cded20df613933b2c68a76cf9c1.tar.bz2
volse-hubzilla-abb045e1ffc73cded20df613933b2c68a76cf9c1.zip
Merge pull request #612 from anaqreon/dev
Doco merge
-rw-r--r--doc/toc.html1
-rw-r--r--include/help.php1
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/toc.html b/doc/toc.html
index 047032437..c9c5ec46d 100644
--- a/doc/toc.html
+++ b/doc/toc.html
@@ -421,7 +421,6 @@
}
});
- //$('#accordion').sticky({topSpacing:$('nav').outerHeight(true)});
});
</script>
diff --git a/include/help.php b/include/help.php
index 6efeeb57e..03d01d1a1 100644
--- a/include/help.php
+++ b/include/help.php
@@ -55,6 +55,7 @@ function get_help_content($tocpath = false) {
if(! $text) {
$doctype = 'bbcode';
$text = load_doc_file('doc/main.bb');
+ goaway('/help/about/about_hubzilla');
\App::$page['title'] = t('Help');
}