aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.bb
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-25 06:30:15 -0500
committerAndrew Manning <tamanning@zoho.com>2016-06-25 06:30:15 -0500
commit83a42afddf6e5ffd04028431b36aed6ecadf5b9d (patch)
tree26d7251cd032fb627c80345cc9cbc4384a66f46f /doc/general.bb
parent780f83a118146cf67509574ac88024c2cb03cf3a (diff)
parentec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff)
downloadvolse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.gz
volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.bz2
volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'doc/general.bb')
-rw-r--r--doc/general.bb18
1 files changed, 7 insertions, 11 deletions
diff --git a/doc/general.bb b/doc/general.bb
index c9c2501e5..bbc85c900 100644
--- a/doc/general.bb
+++ b/doc/general.bb
@@ -1,20 +1,16 @@
-
-[h2]Project/Site Information[/h2]
-
+[h2]Project and site information[/h2]
+[h3]$Projectname[/h3]
[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
-
[zrl=[baseurl]/help/history]$Projectname history[/zrl]
-
-[h3]External Resources[/h3]
-[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
-
+[h3]External resources[/h3]
+[zrl=[baseurl]/help/external-resource-links]List of external resources[/zrl]
[url=https://github.com/redmatrix/hubzilla]Main Website[/url]
[url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url]
-
[url=[baseurl]/help/credits]$Projectname Credits[/url]
-
-[h3]About This $Projectname Hub[/h3]
+[h3]About this $Projectname hub[/h3]
[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]
[zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl]
+#include doc/macros/main_footer.bb;
+