6 files changed, 23 insertions, 4 deletions
diff --git a/doc/ca/general.bb b/doc/ca/general.bb
index f7d556130..dace92775 100644
--- a/doc/ca/general.bb
+++ b/doc/ca/general.bb
@@ -2,7 +2,7 @@
 
 [zrl=[baseurl]/help/Privacy]Politica de Privacitat[/zrl]
 
-[zrl=[baseurl]/help/history]Història de $Projectname[/zrl]
+[zrl=[baseurl]/help/project/history]Història de $Projectname[/zrl]
 
 [h3]Recursos Externs[/h3]
 [zrl=[baseurl]/help/external-resource-links]Enllaços a Recursos Externs[/zrl]
diff --git a/doc/de/general.bb b/doc/de/general.bb
index eb1c0f158..6660370d7 100644
--- a/doc/de/general.bb
+++ b/doc/de/general.bb
@@ -2,7 +2,7 @@
 
 [zrl=[baseurl]/help/Privacy]Informationen zum Datenschutz[/zrl]
 
-[zrl=[baseurl]/help/history]Zur Geschichte von $Projectname[/zrl]
+[zrl=[baseurl]/help/project/history]Zur Geschichte von $Projectname[/zrl]
 
 [h3]Externe Ressourcen[/h3]
 [zrl=[baseurl]/help/external-resource-links]Links zu externen Ressourcen[/zrl]
diff --git a/doc/general.bb b/doc/general.bb
index 89451beaf..cc5de5a56 100644
--- a/doc/general.bb
+++ b/doc/general.bb
@@ -3,7 +3,7 @@
 [zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
 [zrl=[baseurl]/help/project/governance]Project Governance[/zrl]
 [zrl=[baseurl]/help/contributor/convenant]Project Covenant and Code of Conduct[/zrl]
-[zrl=[baseurl]/help/history]$Projectname history[/zrl]
+[zrl=[baseurl]/help/project/history]$Projectname history[/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]
diff --git a/doc/history.md b/doc/project/history.md
index 7360c6b22..46c23129e 100644
--- a/doc/history.md
+++ b/doc/project/history.md
@@ -53,4 +53,22 @@ The Redmatrix community held a vote and the project was renamed "Hubzilla", with
 
 Mike stepped down as active coordinator for the project in early 2015 and turned management over to the community. He remains active as a Hubzilla developer.  
 
+##And Then...
+
+In 2016, the project was re-architected to support multiple server "roles". These correspond to sub-projects which can be isolated from each other in terms of supported feature sets, but all use and support the same code-base and developers are able to work together on common features and goals. The roles primarily differ in target audience, project [governance](help/project/governance) and decision making structures, and this results in slightly different features and idealogy. They all share a common code repository. 
+
+Those roles are:
+
+### Basic
+
+Entry level server. Supported by and governed by the Hubzilla community. Most advanced or complex features have been stripped away to ease federation with external services. It is best suited as a FOSS social network tool. 
+
+### Standard
+
+The standard Hubzilla server. This provides a wide range of useful features and is supported by and governed by the Hubzilla community. It is best suited as an open source community and cloud server. 
+
+### Pro
+
+This is a specially crafted server with a unique feature set. It is supported by and governed by Mike Macgirvin dba "Zotlabs". Federation with external services has been stripped away in order to support a wide range of more technically advanced and complex features which may not have the support or backing of the Hubzilla community. It is best suited for business and workplace applications. 
+
 #include doc/macros/main_footer.bb;
diff --git a/doc/project/toc.html b/doc/project/toc.html
index e264e014d..b9489de3d 100644
--- a/doc/project/toc.html
+++ b/doc/project/toc.html
@@ -1,5 +1,6 @@
 <h3>Project Information</h3>
 <ul>
 <li><a href="help/project/governance">Project Governance</a></li>
+<li><a href="help/project/history">Project History</a></li>
 <li><a href="help/project/versions">Versions and Versioning</a></li>
 </ul>
diff --git a/doc/sv/main.bb b/doc/sv/main.bb
index 1ab77a499..27a7a742e 100644
--- a/doc/sv/main.bb
+++ b/doc/sv/main.bb
@@ -43,7 +43,7 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Proje
 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
 
 [h3]Teknisk dokumentation[/h3]
-[zrl=[baseurl]/help/history]$Projectname history[/zrl]
+[zrl=[baseurl]/help/project/history]$Projectname history[/zrl]
 [zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl]
 [zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]
 [zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]