Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md

46 files changed, 226 insertions, 209 deletions

diff --git a/doc/DerivedTheme1.md b/doc/DerivedTheme1.md
index 7544c4948..805d6b614 100644
--- a/doc/DerivedTheme1.md
+++ b/doc/DerivedTheme1.md
@@ -10,7 +10,7 @@ To create a derived theme, first choose a name. For our example we'll call our t
 
 **Directory Structure**
 
-First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level Hubzilla folder. 
+First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level $Projectname folder. 
 
 
     cd mywebsite
diff --git a/doc/Developers.md b/doc/Developers.md
index 2e7faf397..b19b4fc2f 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -1,4 +1,4 @@
-Red Developer Guide
+Developer Guide
 ===================
 
 **Here is how you can join us.**
@@ -18,7 +18,7 @@ to notify us to merge your work.
 
 **Translations**
 
-Our translations are managed through Transifex. If you wish to help out translating the Hubzilla to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   
+Our translations are managed through Transifex. If you wish to help out translating the $Projectname to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   
 
 [Translations - More Info](help/Translations)
 
diff --git a/doc/Features.md b/doc/Features.md
index 6358b6946..5a1e8c747 100644
--- a/doc/Features.md
+++ b/doc/Features.md
@@ -1,7 +1,7 @@
 Extra Features
 ==============
 
-The default interface of the Hubzilla was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page.
+The default interface of the $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page.
 
 **Content Expiration** 
 
diff --git a/doc/Plugins.md b/doc/Plugins.md
index 9fdbac502..7d802fc5c 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -1,11 +1,13 @@
-Creating Plugins/Addons for the Hubzilla
+
+Creating Plugins/Addons for the $Projectname
 ==========================================
 
 
-So you want to make the Hubzilla do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. 
+So you want to make the $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. 
+
 
+In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. 
 
-In your Hubzilla folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. 
 
 	mkdir addon
 
@@ -28,7 +30,7 @@ Then we're going to create a comment block to describe the plugin. There's a spe
 	/**
 	 *
 	 * Name: Random Place (here you can use better descriptions than you could in the filename)
-	 * Description: Sample Hubzilla plugin, Sets a random place when posting.
+	 * Description: Sample $Projectname plugin, Sets a random place when posting.
 	 * Version: 1.0
 	 * Author: Mike Macgirvin <mike@zothub.com>
 	 *
@@ -47,9 +49,9 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is
 * pluginname_uninstall()
 
 
-Next we'll talk about **hooks**. Hooks are places in the Hubzilla code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
+Next we'll talk about **hooks**. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
 
-We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Hubzilla installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. 
+We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. 
 
 
 	function randplace_load() {
@@ -244,18 +246,18 @@ we will create an argc/argv list for use by your module functions
 
 ***Porting Friendica Plugins***
 
-The Hubzilla uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
+The $Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
 
 * Friendica's pluginname_install() is pluginname_load()
 
 * Friendica's pluginname_uninstall() is pluginname_unload()
 
-The Hubzilla has _install and _uninstall functions but these are used differently.
+The $Projectname has _install and _uninstall functions but these are used differently.
 
 * Friendica's "plugin_settings" hook is called "feature_settings"
 
 * Friendica's "plugin_settings_post" hook is called "feature_settings_post"
 
-Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Hubzilla. Many structured data names (especially DB schema columns) are also quite different. 
+Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the $Projectname. Many structured data names (especially DB schema columns) are also quite different. 
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/Privacy.md b/doc/Privacy.md
index 92e5f7702..fd6df6315 100644
--- a/doc/Privacy.md
+++ b/doc/Privacy.md
@@ -4,22 +4,22 @@
 
 Q: Who can see my content?
  
-A: By default ANYBODY on the internet, UNLESS you restrict it. The Hubzilla allows you to choose the privacy level you desire. Restricted content will NOT be visible to spy networks and their advertisers. It will be protected against eavesdropping by outsiders - to the best of our ability. Hub administrators with sufficient skills and patience MAY be able to eavesdrop on some private communications but they must expend effort to do so. Privacy modes exist within the Hubzilla which are even resistant to eavesdropping by skilled and determined hub administrators.    
+A: By default ANYBODY on the internet, UNLESS you restrict it. The $Projectname allows you to choose the privacy level you desire. Restricted content will NOT be visible to spy networks and their advertisers. It will be protected against eavesdropping by outsiders - to the best of our ability. Hub administrators with sufficient skills and patience MAY be able to eavesdrop on some private communications but they must expend effort to do so. Privacy modes exist within the $Projectname which are even resistant to eavesdropping by skilled and determined hub administrators.    
 
 Q: Can my content be censored?
 
-A: The Hubzilla (the network) CANNOT censor your content. Server and hub administrators are subject to local laws and MAY remove objectionable content from their site/hub. Anybody MAY become a hub administrator, including you; and therefore publish content which might otherwise be censored. You still MAY be subject to local laws.   
+A: The $Projectname (the network) CANNOT censor your content. Server and hub administrators are subject to local laws and MAY remove objectionable content from their site/hub. Anybody MAY become a hub administrator, including you; and therefore publish content which might otherwise be censored. You still MAY be subject to local laws.   
 
 
 ##Definitions
 
-**Hubzilla** 
+**$Projectname** 
 
-Otherwise referred to as "the network", the Hubzilla is a collection of individual computers/servers (aka **hubs**) which connect together to form a larger cooperative network. 
+Otherwise referred to as "the network", the $Projectname is a collection of individual computers/servers (aka **hubs**) which connect together to form a larger cooperative network. 
 
 **hub** 
 
-An individual computer or server connected to the Hubzilla. These are provided by a **hub administrator** and may be public or private, paid or free.
+An individual computer or server connected to the $Projectname. These are provided by a **hub administrator** and may be public or private, paid or free.
 
 **hub administrator**
 
@@ -29,17 +29,17 @@ The system operator of an individual hub.
 
 **Public Information**
 
-Any information or anything posted by you within the Hubzilla MAY be public or visible to anybody on the internet. To the extent possible, the Hubzilla allows you to protect content and restrict who can view it.
+Any information or anything posted by you within the $Projectname MAY be public or visible to anybody on the internet. To the extent possible, the $Projectname allows you to protect content and restrict who can view it.
 
 Your profile photo, your channel name, and the location (URL or network address) of your channel are visible to anybody on the internet and privacy controls will not affect the display of these items. 
 
-You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in the Hubzilla and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. 
+You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in the $Projectname and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. 
 
 **Content**
 
-Content you provide (status posts, photos, files, etc.) belongs to you. The Hubzilla default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). The Hubzilla developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. 
+Content you provide (status posts, photos, files, etc.) belongs to you. The $Projectname default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). The $Projectname developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. 
 
-Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other Hubzilla sites. It MAY appear on spy networks and internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content. 
+Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other $Projectname sites. It MAY appear on spy networks and internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content. 
 
 **Comments and Forum posts**
 
@@ -48,25 +48,25 @@ Comments to posts that were created by others and posts which are designated as
 
 **Private Information**
 
-Hubzilla developers will ensure that any content you provide which is designated as PRIVATE will be protected against eavesdropping - to the best of their ability. Private content is generally hidden or obscured even from hub administrators. It is also stripped from email notifications. It is difficult but NOT impossible for this content to be seen by a hub administrator.  This is a side effect of the physical laws of the universe.  Unfortunately, if a database needs to decrypt a post at display time, it must have the means to decrypt the post!  End to end encryption is also provided and this CANNOT be seen, even by a determined administrator. 
+$Projectname developers will ensure that any content you provide which is designated as PRIVATE will be protected against eavesdropping - to the best of their ability. Private content is generally hidden or obscured even from hub administrators. It is also stripped from email notifications. It is difficult but NOT impossible for this content to be seen by a hub administrator.  This is a side effect of the physical laws of the universe.  Unfortunately, if a database needs to decrypt a post at display time, it must have the means to decrypt the post!  End to end encryption is also provided and this CANNOT be seen, even by a determined administrator. 
 
 ##Identity Privacy
 
-Privacy for your identity is another aspect. Because you have a decentralized identity in the Hubzilla, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible.
+Privacy for your identity is another aspect. Because you have a decentralized identity in the $Projectname, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible.
 
-A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the Hubzilla network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking.
+A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the $Projectname network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking.
 
-* You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the Hubzilla. This setting is probably enough for most people.
+* You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the $Projectname. This setting is probably enough for most people.
 *You can [disable publication](settings) of your channel in our channel directory. If you want people to find your channel, you should give your channel address directly to them. We think this is a good indication that you prefer extra privacy and automatically enable "Do Not Track" if this is the case.
 * You can have a blocked hub. That means that all channels and content on that hub is not public, and not visible to the outside world. This is something only your hub administrator can do. We also respect this and automatically enable "Do Not Track" if it is set.
 
 ###Censorship
 
-The Hubzilla is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends. 
+The $Projectname is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends. 
 
-The Hubzilla as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the Hubzilla as a network cannot block it from being posted.
+The $Projectname as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the $Projectname as a network cannot block it from being posted.
 
-The Hubzilla RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a Hubzilla decision. 
+The $Projectname RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a $Projectname decision. 
 
 If you typically and regularly post content of an adult or offensive nature, you are STRONGLY encouraged to mark your account "NSFW" (Not Safe For Work). This will prevent the display of your profile photo in the directory except to viewers that have chosen to disable "safe mode". If your profile photo is found by directory administrators to be adult or offensive, the directory administrator MAY flag your profile photo as NSFW. There is currently no official mechanism to contest or reverse this decision, which is why you SHOULD mark your own account NSFW if it is likely to be inappropriate for general audiences. 
 
diff --git a/doc/README.md b/doc/README.md
index f2c80fca6..9cd0cb27b 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -4,6 +4,7 @@ Hubzilla - Hub Deployment Platform
 
 ![Hubzilla](images/ghash-32.png)
 
+
 **What are Hubs?**
 
 Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.  
@@ -33,3 +34,4 @@ Possible website applications include
 * forums
 * dating websites
 * pretty much anything you can do on a traditional blog or community website, but that you could do better if you could easily connect it with other websites or privately share things across website boundaries. 
+
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index 93998bca8..a8ef733a6 100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -13,7 +13,8 @@ Visit the URL
 
 	https://yoursite/removeme 
 
-(replace 'yoursite' with the domain name of your Hubzilla site). 
+(replace 'yoursite' with the domain name of your $Projectname site). 
+
 You will need to confirm your password and the channel you are currently logged into will be removed. 
 
 This is irreversible.
diff --git a/doc/Translations.md b/doc/Translations.md
index a63bfa86d..d0fe489f3 100644
--- a/doc/Translations.md
+++ b/doc/Translations.md
@@ -1,4 +1,4 @@
-Translating the Hubzilla
+Translating the $Projectname
 ==========================
 
 Translation Process
diff --git a/doc/about.bb b/doc/about.bb
index 83f1fb0c6..508795aed 100644
--- a/doc/about.bb
+++ b/doc/about.bb
@@ -1,8 +1,8 @@
 [b]About[/b]

 

-The Hubzilla is a decentralized communication network, which aims to provide communication that is censorship-resistant, privacy-respecting, and thus free from the oppressive claws of contemporary corporate communication giants. These giants function primarily as spy networks for paying clients of all sorts and types, in addition to monopolizing and centralizing the Internet; a feature that was not part of the original and revolutionary goals that produced the World Wide Web. 

+The $Projectname is a decentralized communication network, which aims to provide communication that is censorship-resistant, privacy-respecting, and thus free from the oppressive claws of contemporary corporate communication giants. These giants function primarily as spy networks for paying clients of all sorts and types, in addition to monopolizing and centralizing the Internet; a feature that was not part of the original and revolutionary goals that produced the World Wide Web. 

 

-The Hubzilla is free and open source.  It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers.  It can be used to support communication between a few individuals, or scale to many thousands and more.

+The $Projectname is free and open source.  It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers.  It can be used to support communication between a few individuals, or scale to many thousands and more.

 

 Red aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers. 

 

@@ -10,13 +10,13 @@ How you use it depends on how you want to use it.
 

 It is written in the PHP scripting language, thus making it trivial to install on any hosting platform in use today. This includes self-hosting at home, at hosting providers such as [url=http://mediatemple.com/]Media Temple[/url] and [url=http://www.dreamhost.com/]Dreamhost[/url], or on virtual and dedicated servers, offered by the likes of [url=https://www.linode.com]Linode[/url],  [url=http://greenqloud.com]GreenQloud[/url] or [url=https://aws.amazon.com]Amazon AWS[/url].

 

-In other words, the Hubzilla can run on any computing platform that comes with a web server, a MySQL-compatible database, and the PHP scripting language. 

+In other words, the $Projectname can run on any computing platform that comes with a web server, a MySQL-compatible database, and the PHP scripting language. 

 

 Along the way, Red offers a number of unique goodies: 

 

-[b]Single-click user identification:[/b] meaning you can access sites on the Hubzilla simply by clicking on links to remote sites. Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.

+[b]Single-click user identification:[/b] meaning you can access sites on the $Projectname simply by clicking on links to remote sites. Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.

 

-[b]Cloning:[/b] of online identities. Your online presence no longer has to be tied to a single server, domain name or IP address.  You can clone and import your identity (or channel as we call it) to another server (or, a hub as servers are known in the Hubzilla).  Now, should your primary hub go down, no worries, your contacts, posts[i]*[/i], and messages[i]*[/i] will automagically continue to be available and accessible under your cloned channel. [i](*: only posts and messages as from the moment you cloned your channel)[/i]

+[b]Cloning:[/b] of online identities. Your online presence no longer has to be tied to a single server, domain name or IP address.  You can clone and import your identity (or channel as we call it) to another server (or, a hub as servers are known in the $Projectname).  Now, should your primary hub go down, no worries, your contacts, posts[i]*[/i], and messages[i]*[/i] will automagically continue to be available and accessible under your cloned channel. [i](*: only posts and messages as from the moment you cloned your channel)[/i]

 

 [b]Privacy:[/b]  Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned.  The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub.  No questions, no fuss. 

 

diff --git a/doc/account_basics.bb b/doc/account_basics.bb
index 327709459..ba2380df7 100644
--- a/doc/account_basics.bb
+++ b/doc/account_basics.bb
@@ -2,7 +2,7 @@
 

 [b]Registration[/b]

 

-Not all Hubzilla sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Hubzilla sites are linked, it does not matter where your account resides.

+Not all $Projectname sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all $Projectname sites are linked, it does not matter where your account resides.

 

 [b]Your Email Address[/b]

 

@@ -10,7 +10,7 @@ Please provide a valid email address. Your email address is never published. Thi
 

 [b]Password[/b]

 

-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Hubzilla offers a decentralised identity, your account can log you in to many other websites.

+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the $Projectname offers a decentralised identity, your account can log you in to many other websites.

 

 [b]Terms Of Service[/b]

 

diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/accounts_profiles_channels_basics.bb
index c20b247bd..63b13f036 100644
--- a/doc/accounts_profiles_channels_basics.bb
+++ b/doc/accounts_profiles_channels_basics.bb
@@ -4,11 +4,11 @@ Once you have registered an [i]account[/i] at the matrix you have also created a
 
 [b]Account[/b]
 You have [i]one[/i] account. This consists of your email account and your password. With your account you access your profile and your channel.
-[i]Think of your account as the way you authenticate at one Hubzilla site. It lets you do things, such as creating profiles and channels with which you can connect to other people.[/i]
+[i]Think of your account as the way you authenticate at one $Projectname site. It lets you do things, such as creating profiles and channels with which you can connect to other people.[/i]
 
 [b]Profile[/b]
 You have surely registered with some other internet services, such as forums or online communities. For all of them you provided some information about yourself, such as date of birth, country, age and the likes. [observer=1]If you like you can see your profile here: [baseurl]/profile/[observer.webname] and edit it by clicking on the pencil icon next to your avatar image. [/observer]
-Unlike other services Hubzilla offers you the advantage of creating [i]many more profiles[/i]. That way you are able to distinguish between profiles targeted specially at everyone (your public profile), your work mates, your family and your partner.
+Unlike other services $Projectname offers you the advantage of creating [i]many more profiles[/i]. That way you are able to distinguish between profiles targeted specially at everyone (your public profile), your work mates, your family and your partner.
 [i]Think of your profile as the basic information about yourself you tell other people.[/i]
 
 [b]Channel[/b]
diff --git a/doc/addons.bb b/doc/addons.bb
index 56ec08086..1be88150d 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -42,7 +42,7 @@
 [*] qrator - generate QR code images
 [*] rainbowtag - display your tag and category clouds in colours
 [*] randpost - post/reply bot based on and requires fortunate
-[*] redred - Crosspost to another Hubzilla channel
+[*] redred - Crosspost to another Redmatrix or Hubzilla channel
 [*] rtof - Crosspost to Friendica
 [*] smiley_pack - extend the built-in smilie (emoticon) support
 [*] smileybutton - provides a smiley selector on the post window
@@ -51,7 +51,7 @@
 [*] superblock - Highly recommended - completely block an offensive channel from your stream
 [*] tictac - 3D tic-tac-toe
 [*] torch - flashlight app
-[*] tour - feature tour for new red#matrix members
+[*] tour - feature tour for new members
 [*] twitter - crosspost to Twitter
 [*] upload_limits - discover what server setting (there are a few) may be causing large photo uploads to fail
 [*] visage - show visitors to your channel
diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index bdb023c8e..dfdce5f6a 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -8,17 +8,18 @@ https://yourgnusocialinstance.org/settings/oauthapps
 
 Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field.
 
-Icon. I uploaded the Hubzilla icon located at this link, after saving it to my computer:
+Icon. I uploaded the $Projectname icon located at this link, after saving it to my computer:
 
 https://github.com/redmatrix/hubzilla/blob/master/images/rm-32.png
 
 Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g.
 
-Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from Hubzilla to GNUsocial.
+Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from $Projectname to GNUsocial.
+
 
 Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourhubzillasite.com. If your Red installation is a subdomain, that would probably be called for.
 
-Organization. Since Hubzilla is unorganized, I put that. If you use your installation for a group or business, that might be a good option.
+Organization. Since $Projectname is unorganized, I put that. If you use your installation for a group or business, that might be a good option.
 
 Homepage. If your group is using a subdomain, you probably want to put your main domain URI here. Since I'm on a hosted site, I put redmatrix.me.
 
@@ -32,13 +33,13 @@ All fields except the callback URL must be filled in.
 
 Click on the save button.
 
-Then click on the icon or the name of the application for the information you'll need to insert over on Hubzilla.
+Then click on the icon or the name of the application for the information you'll need to insert over on $Projectname.
 
 *****
 
-Now open up a new tab or window and go to your Hubzilla account, to Settings > Feature settings. Find the StatusNet Posting Settings.
+Now open up a new tab or window and go to your $Projectname account, to Settings > Feature settings. Find the StatusNet Posting Settings.
 
-Insert the strings of numbers given on the GNUsocial site into the Hubzilla fields for Consumer Key and Consumer Secret.
+Insert the strings of numbers given on the GNUsocial site into the $Projectname fields for Consumer Key and Consumer Secret.
 
 The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this:
 
@@ -50,15 +51,15 @@ StatusNet application name: Insert the name you gave to the application over on
 
 Click Submit.
 
-A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the Hubzilla app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit.
+A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit.
 
-If successful, your information from the GNUsocial instance should appear in the Hubzilla app.
+If successful, your information from the GNUsocial instance should appear in the $Projectname app.
 
-You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your Hubzilla account to your GNUsocial instance.
+You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your $Projectname account to your GNUsocial instance.
 
 If you don't choose this option, you will have an option to send a post to your GNUsocial instance by first opening the post (by clicking in the post text area) and clicking on the lock icon next to the Share button. Select the GNUsocial icon made up of three colored dialog baloons. Close that window, then make your post.
 
-If all goes well, you have just cross-posted your Hubzilla post to your account on a GNUsocial instance.
+If all goes well, you have just cross-posted your $Projectname post to your account on a GNUsocial instance.
 
 #include doc/macros/addons_footer.bb;
 
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 2b552f0b1..4fe47842f 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -7,7 +7,7 @@
 <li>[u]underlined[/u] - <u>underlined</u><br />
 <li>[s]strike[/s] - <strike>strike</strike><br />
 <li>[color=red]red[/color] - <span style="color:  red;">red</span><br />
-<li>[url=https://redmatrix.me]Hubzilla[/url] <a href="https://redmatrix.me">Hubzilla</a><br />
+<li>[url=https://redmatrix.me]$Projectname[/url] <a href="https://redmatrix.me">$Projectname</a><br />
 <li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
 <li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
 <div style="clear:both;"></div>
@@ -47,7 +47,7 @@
 </ul><br />
 <br />Tables? Yes!<br /><br />[table border=1]<br />  [tr]<br />    [th]Tables now[/th]<br />  [/tr]<br />  [tr]<br />    [td]Have headers[/td]<br />  [/tr]<br />[/table]<br /><br /><table border="1" ><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></table><br />All sizes, <br />From the [size=xx-small] - <span style="font-size: xx-small;">xx-small</span>.<br />To the [size=xx-large] - <span style="font-size: xx-large;">xx-large</span>.<br />To fit exactly <span style="font-size: 20px;">20px</span> use [size=20].<br /><br />
 
-<p>Hubzilla specific codes</p>
+<p>$Projectname specific codes</p>
 <ul class="listbullet" style="list-style-type: circle;">
 <li>[&amp;copy;] &copy;  This works for many HTML entities</li>
 <li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag</li>
diff --git a/doc/campaign.bb b/doc/campaign.bb
index 9abfea129..48f28f0c0 100644
--- a/doc/campaign.bb
+++ b/doc/campaign.bb
@@ -4,7 +4,7 @@
 

 [b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b]

 

-We started the Hubzilla project by asking ourselves a few questions: 

+We started the $Projectname project by asking ourselves a few questions: 

 

 - Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site.  Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites. 

 Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online. 

@@ -52,7 +52,7 @@ Think of it this way: the internet is nothing, but a bunch of permissions and a
 

 [b][color= grey][size=20]The Matrix is Born![/size][/color][/b]

 

-After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features.  We called it the Hubzilla and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API.  The sum of the matrix is greater than it's parts.  We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.

+After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features.  We called it the $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API.  The sum of the matrix is greater than it's parts.  We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.

 

 It's a lot of work, for anyone.  So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot.  We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication. 

 

@@ -60,7 +60,7 @@ We need your help to finish it and release it to the world!
 

 [b][color= grey][size=20]What have we written so far[/size][/color][/b]

 

-As of the today, the Hubzilla is in developer preview (alpha) state.  It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state).  These include: 

+As of the today, the $Projectname is in developer preview (alpha) state.  It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state).  These include: 

 

 - Zot, the protocol powering the matrix

 - Single-signon logins.

@@ -71,7 +71,7 @@ As of the today, the Hubzilla is in developer preview (alpha) state.  It is not
 

 [b][color= grey][size=20]Our TO-DO List[/size][/color][/b]

 

-However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the Hubzilla ready for daily use.  If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: 

+However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the $Projectname ready for daily use.  If we meet our fundraising goal, we hope to dive into the following road map, by order of priority: 

 

 - A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git. 

 

@@ -97,7 +97,7 @@ If we raise our targeted amount of funds, we plan to use it as follows:
 

 [b][color= grey][size=20]Deadlines[/size][/color][/b]

 

-[b]March, 2014: Hubzilla Beta with the following features[/b]

+[b]March, 2014: $Projectname Beta with the following features[/b]

 

 - {LIST FEATURES}

 

@@ -127,7 +127,7 @@ We'll list your name on our initial supporters list, a Hall of Fame of the matri
 

 [b]$16: [/b]

 

-You get one of your Hubzilla t-shirts, as well as our undying gratitude.  

+You get one of your $Projectname t-shirts, as well as our undying gratitude.  

 

 [b]$32:  [/b]

 

@@ -143,9 +143,9 @@ You get one of your Hubzilla t-shirts, as well as our undying gratitude.
 

 [b]$2048[/b]

 

-Each contributor at this level gets their own Hubzilla virtual private server, installed, hosted and supported by us for a period of 1 year. 

+Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year. 

 

-[b][color= grey][size=20]Why are we so excited about the Hubzilla?[/size][/color][/b]

+[b][color= grey][size=20]Why are we so excited about the $Projectname?[/size][/color][/b]

 

 {SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC&gt;

 

@@ -167,7 +167,7 @@ Perhaps you're good at writing and documenting stuff.  Grab an account at one of
 

 [b]1. Is Red a social network?[/b]

 

-The Hubzilla is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.

+The $Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.

 

 [b]2. What is the difference between Red and Friendica?[/b]

 

@@ -177,7 +177,7 @@ Friendica is really, really good at sending postcards. It can do all sorts of th
 

 What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are.  Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity.

 

-The Hubzilla offers a passport.

+The $Projectname offers a passport.

 

 You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity.  No longer do you need to register at every single site you use.  You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead. 

 

@@ -194,7 +194,7 @@ We use MySQL as our database (this include any forks such as, MariaDB or Percona
 [b]5. How is the Affinity Slider different from Mozilla's Persona?[/b]

 {COMPLETE}

 

-[b]6. Does the Hubzilla use encryption?  Details please![/b]

+[b]6. Does the $Projectname use encryption?  Details please![/b]

 

 Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance.

 

@@ -207,7 +207,7 @@ For more info on our initial implementation of encrypted communication, check ou
 [b]7. What do you mean by decentralization? [/b]

 

 

-[b]8. Can I build my own website with in the Hubzilla?[/b]

+[b]8. Can I build my own website with in the $Projectname?[/b]

 

 Yes.  The short explanation: We've got this spiffy idea we're calling &quot;Comanche&quot;, which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix.  The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix.

 

diff --git a/doc/cloud.bb b/doc/cloud.bb
index d3a2d6af9..20498e6a5 100644
--- a/doc/cloud.bb
+++ b/doc/cloud.bb
@@ -1,6 +1,6 @@
 [b]Personal Cloud Storage[/b]

 

-The Hubzilla provides an ability to store privately and/or share arbitrary files with friends.

+The $Projectname provides an ability to store privately and/or share arbitrary files with friends.

 

 You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol.

 

diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb
index 58981b506..be37eb25c 100644
--- a/doc/connecting_to_channels.bb
+++ b/doc/connecting_to_channels.bb
@@ -1,12 +1,12 @@
 [b]Connecting To Channels[/b]

 

-Connections in the Hubzilla can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?

+Connections in the $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?

 

 First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the &quot;Can send me their channel stream and posts&quot; permission to &quot;Anybody in this network&quot; will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.

 

-The next thing you can do is look at the Directory. The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.

+The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.

 

-To connect with other Hubzilla channels:

+To connect with other $Projectname channels:

 

 Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called &quot;connect&quot;. Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, &quot;Full Sharing&quot; is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click &quot;Submit&quot;.

 

diff --git a/doc/connecting_to_channels.md b/doc/connecting_to_channels.md
index 2257f75ba..60834c244 100644
--- a/doc/connecting_to_channels.md
+++ b/doc/connecting_to_channels.md
@@ -1,12 +1,12 @@
 # Connecting To Channels #
 
-Connections in the Hubzilla can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
+Connections in the $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
 
 First, you need to find some channels to connect to.  There are two primary ways of doing this.  Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix.  This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
 
-The next thing you can do is look at the Directory.  The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network.  You can search by name, interest, location and keyword.  This is incomplete, so we'll improve this paragraph later.
+The next thing you can do is look at the Directory.  The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network.  You can search by name, interest, location and keyword.  This is incomplete, so we'll improve this paragraph later.
 
-To connect with other Hubzilla channels:
+To connect with other $Projectname channels:
 
 Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer.  At the left hand side of the screen, you will usually see a link called "connect".  Click it, and you're done.  Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, "Full Sharing" is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click "Submit". 
 
diff --git a/doc/credits.bb b/doc/credits.bb
index c94dada96..4923bdadc 100644
--- a/doc/credits.bb
+++ b/doc/credits.bb
@@ -63,7 +63,6 @@ tonnerkiller
 Antoine G
 Christian Drechsler
 Ludovic Grossard
-HubzillaCanada
 Stanislav Lechev [0xAF]
 aweiher
 bufalo1973
diff --git a/doc/de/channels.bb b/doc/de/channels.bb
index 7500d9256..1c963fc08 100644
--- a/doc/de/channels.bb
+++ b/doc/de/channels.bb
@@ -19,7 +19,7 @@ Nachdem Du Deinen Kanal erstellt hast, wirst Du zu den Einstellungen weitergelei
 
 Nachdem Du auch das getan hast, kannst Du Deinen Kanal verwenden. Unter der Addresse https://example.com/channel/spitzname [observer=1]( [observer.url] )[/observer] findest Du Deinen Kanal. Hier werden Deine letzten Aktivitäten gezeigt, die neuesten oben. Wenn Du etwas in die Textbox schreibst, in der „Teilen“ steht, wird der neue Eintrag ganz oben in Deinem Kanal auftauchen. Du findest hier auch Links zu den anderen Kommunikationsbereichen Deines Kanals. Der „Über“-Reiter enthält Dein Profil, der „Fotos“-Reiter Deine Fotoalben, und der Veranstaltungskalender enthält Termine und Veranstaltungen, die Du und Deine Kontakte geteilt haben.
 
-Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten Hubzilla, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst.
+Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten $Projectname, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst.
 
 Wie zu Anfang erwähnt sind viele Arten von Kanälen möglich, diese unterscheiden sich hauptsächlich durch die Berechtigungen. Das Anlegen dieser Kanäle unterscheidet sich dagegen nicht. Beispiel: Um einen Kanal zum Austausch von Dokumenten zu erstellen, wirst du vermutlich die Berechtigung „Kann in meinen öffentlichen Dateiordner schreiben“ freizügiger einstellen. Für weitere Informationen sieh bitte in der Hilfe unter Zugriffsrechte nach.
 
diff --git a/doc/de/features.bb b/doc/de/features.bb
index 7ec753e4b..6bee360eb 100644
--- a/doc/de/features.bb
+++ b/doc/de/features.bb
@@ -1,6 +1,6 @@
-[size=large][b]Features der Hubzilla[/b][/size]
+[size=large][b]Features der $Projectname[/b][/size]
 
-Die Hubzilla ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren.
+Die $Projectname ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren.
 
 Diese Seite listet einige der Kern-Features von Red auf, die in der offiziellen Distribution enthalten sind. Wie immer bei freier Open-Source-Software sind den Möglichkeiten keine Grenzen gesetzt. Beliebige Erweiterungen, Addons, Themes und Konfigurationen sind möglich.
 
@@ -10,7 +10,8 @@ Eines der Design-Ziele von Red ist einfache Kommunikations über das Web, ohne d
 
 [b]Beziehungs-Tool[/b]
 
-Wenn Du in der Hubzilla einen Kontakt hinzufügst (und das Beziehungs-Tool aktiviert hast), hast Du die Möglichkeit, einen „Grad der Freundschaft“ zu bestimmen. Bespiel: Wenn Du ein Blog eines Bekannten hinzufügst, könntest Du ihm den Freundschaftsgrad „Bekannte“ (Acquaintances) geben.
+Wenn Du in der $Projectname einen Kontakt hinzufügst (und das Beziehungs-Tool aktiviert hast), hast Du die Möglichkeit, einen „Grad der Freundschaft“ zu bestimmen. Bespiel: Wenn Du ein Blog eines Bekannten hinzufügst, könntest Du ihm den Freundschaftsgrad „Bekannte“ (Acquaintances) geben.
+
 
 [img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]
 
@@ -28,15 +29,15 @@ Diese Nachricht kann dann nur vom Absender und den eingestellten Empfängern bet
 
 Solche Zugriffsrechte gibt es bei Beiträgen, Fotos, Terminen, Webseiten, Chat-Räumen und Dateien.
 
-[b]Ein Passwort für alle Hubzilla-Server (Single Sign-on)[/b]
+[b]Ein Passwort für alle $Projectname-Server (Single Sign-on)[/b]
 
-Zugriffsrechte funktionieren in der gesamten Hubzilla mit allen Kanälen. Die meisten Links, die innerhalb der Hubzilla verlinken, enthalten deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem Hubzilla-Server mit Deinem Hubzilla-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind.
+Zugriffsrechte funktionieren in der gesamten $Projectname mit allen Kanälen. Die meisten Links, die innerhalb der $Projectname verlinken, enthalten deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem $Projectname-Server mit Deinem $Projectname-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind.
 
-Du loggst Dich nur einmal auf Deinem Heimatserver ein. Ab dann funktioniert die Authentifizierung gegenüber anderen Hubzilla-Servern „magisch“ von selbst.
+Du loggst Dich nur einmal auf Deinem Heimatserver ein. Ab dann funktioniert die Authentifizierung gegenüber anderen $Projectname-Servern „magisch“ von selbst.
 
 [b]Dateiablage (Cloud) mit WebDAV-Zugriff[/b]
 
-Du kannst in Deinem persönlichen Speicherbereich Dateien hochladen und ihn sogar als Verzeichnis von Deinem lokalen Betriebssystem anzeigen lassen (via WebDAV). Die Dateien können über Zugriffsrechte bestimmten Hubzilla-Mitgliedern (und den Mitgliedern mancher anderer Netze) zugänglich gemacht oder auch komplett öffentlich zur Verfügung gestellt werden.
+Du kannst in Deinem persönlichen Speicherbereich Dateien hochladen und ihn sogar als Verzeichnis von Deinem lokalen Betriebssystem anzeigen lassen (via WebDAV). Die Dateien können über Zugriffsrechte bestimmten $Projectname-Mitgliedern (und den Mitgliedern mancher anderer Netze) zugänglich gemacht oder auch komplett öffentlich zur Verfügung gestellt werden.
 
 [b]Fotoalben[/b]
 
@@ -48,19 +49,19 @@ Im eingebauten Terminkalender kannst Du Termine erstellen und verwalten. Auch hi
 
 [b]Chat-Räume[/b]
 
-Du kannst Chaträume erstellen und über die Zugriffsrechte nur bestimmten Nutzern öffnen. Die Nachrichten sind sicherer verschlüsselt als es normalerweise bei Jabber/XMPP, IRC und anderen Instant Messengern üblich ist. Über Plugins ist es aber auch möglich, andere IM-Dienste aus der Hubzilla heraus zu nutzen.
+Du kannst Chaträume erstellen und über die Zugriffsrechte nur bestimmten Nutzern öffnen. Die Nachrichten sind sicherer verschlüsselt als es normalerweise bei Jabber/XMPP, IRC und anderen Instant Messengern üblich ist. Über Plugins ist es aber auch möglich, andere IM-Dienste aus der $Projectname heraus zu nutzen.
 
 [b]Erstellen von Webseiten[/b]
 
-In der Hubzilla gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast.
+In der $Projectname gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast.
 
 [b]Apps[/b]
 
-Hubzilla-Mitglieder könnnen Apps erstellen und verteilen. Anders als bei anderen Systemen, bei denen man an den System-Anbieter gebunden ist, werden diese Apps komplett vom App-Anbieter kontrolliert, der auf Wunsch seine eigene Zugriffskontrolle und ein Bezahlsystem einbauen kann. Die meisten Apps in der Hubzilla sind kostenlos. Sie sind sehr einfach und ohne große Programmierkenntnisse zu erstellen.
+$Projectname-Mitglieder könnnen Apps erstellen und verteilen. Anders als bei anderen Systemen, bei denen man an den System-Anbieter gebunden ist, werden diese Apps komplett vom App-Anbieter kontrolliert, der auf Wunsch seine eigene Zugriffskontrolle und ein Bezahlsystem einbauen kann. Die meisten Apps in der $Projectname sind kostenlos. Sie sind sehr einfach und ohne große Programmierkenntnisse zu erstellen.
 
 [b]Layout[/b]
 
-Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. Die Hubzilla ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet.
+Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. Die $Projectname ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet.
 
 [b]Lesezeichen[/b]
 
@@ -72,7 +73,7 @@ Nachrichten mit eingeschränktem Empfängerkreis werden mit einem symmetrischen
 
 Jeder Red-Kanal hat seinen eigenes 4096-bit-RSA-Schlüsselpaar, das erzeugt wird, wenn der Kanal erstellt wird.
 
-Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder Hubzilla-Server-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen.
+Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder $Projectname-Server-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen.
 
 Komplett öffentliche Nachrichten werden weder in der Datenbank noch bei der Übertragung verschlüsselt (abgesehen ggfs. von SSL).
 
@@ -82,7 +83,7 @@ Alle Nachrichten können mit einem „Verfallsdatum“ versehen werden. Zu diese
 
 [b]Verbindung zu anderen Diensten[/b]
 
-Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie die Hubzilla in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte.
+Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie die $Projectname in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte.
 
 Weiterhin wird OpenID auf experimenteller Ebene unterstützt und kann bei den Zugriffsrechten genutzt werden, um Inhalte für per OpenID authentifizierte Nutzer freizugeben. An dieser Funktion wird noch gearbeitet.
 
@@ -94,7 +95,7 @@ Die Inhalte von Kanälen können als Quellen für andere Kanäle dienen (wenn de
 
 [b]Verzeichnisdienste[/b]
 
-Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale Hubzilla-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale Hubzilla-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) all Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können.
+Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale $Projectname-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale $Projectname-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) all Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können.
 
 [b]TLS/SSL[/b]
 
@@ -124,7 +125,7 @@ Foren sind Kanäle, in denen mehrere Nutzer als Autoren fungieren können; eine
 
 [b]Klone[/b]
 
-Konten in der Hubzilla werden auch als [i]nomadische Identitäten[/i] bezeichnet (eine ausführliche Erklärung dazu gibt es unter [url=[baseurl]/help/what_is_zot]What is Zot?[/url]). Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com.
+Konten in der $Projectname werden auch als [i]nomadische Identitäten[/i] bezeichnet (eine ausführliche Erklärung dazu gibt es unter [url=[baseurl]/help/what_is_zot]What is Zot?[/url]). Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com.
 
 Bei Red ist das anders. Sagen wir, Du hast eine Red-Indentität namens tina@redhub.com. Die kannst Du auf einen anderen Server klonen, mit dem gleichen oder einem anderen Namen, zum Beispiel lebtEwig@matrixserver.info.
 
@@ -134,7 +135,7 @@ Das ist ein ziemlich revolutionäres Feature, wenn man sich einige Szenarien daz
 
 [ul][*]Was passiert, wenn ein Server, auf dem sich Deine Identität befindet, plötzlich offline ist? Ohne Klone ist der Nutzer nicht in der Lage zu kommunzieren, bis der Server wieder online ist. Mit Klonen loggst Du Dich einfach bei Deinem geklonten Kanal ein und lebst glücklich bis an Dein Ende.
 [*]Der Administrator Deines Red-Servers kann es sich nicht länger leisten, seinen für alle kostenlosen Server zu bezahlen. Er gibt bekannt, dass der Server in zwei Wochen vom Netz gehen wird. Zeit genug, um Deine Red-Kanäle auf andere Server zu klonen und somit Verbindungen und Freunde zu behalten.
-[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin wird gezwungen, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet die Hubzilla Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Servern überall im Internet.[/ul]
+[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin wird gezwungen, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet die $Projectname Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Servern überall im Internet.[/ul]
 
 Red bietet interessante, neue Möglichkeiten in Bezug auf die Privatsphäre. Mehr dazu unter „Tipps und Tricks zur privaten Kommunikation“.
 
@@ -158,13 +159,13 @@ Konten und Kanäle können sofort gelöscht werden, indem Du einfach auf einen L
 
 [b]Beiträge schreiben[/b]
 
-Red unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die Hubzilla-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative.
+Red unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die $Projectname-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative.
 
 Webseiten können neben BBCode und Markdown auch in HTML und Plain Text erstellt werden.
 
 [b]Inhalte löschen[/b]
 
-Alle Inhalte in der Hubzilla bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot angemeldet war.
+Alle Inhalte in der $Projectname bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot angemeldet war.
 
 [b]Medien[/b]
 
@@ -174,12 +175,12 @@ Genau wie jedes andere Blog-System, soziale Netzwerk oder Mikro-Blogging-Dienst
 
 Vor dem Absenden kann eine Vorschau von Beiträgen betrachtet werden. Außerdem können Beiträge auch nach dem Absenden noch verändert werden.
 
-[b]Hubzilla erweitern[/b]
+[b]$Projectname erweitern[/b]
 
-Die Hubzilla kann auf vielerlei Art erweitert werden: Durch Server-Anpassung, persönliche Anpassung, setzen von Optionen, Themes und Addons/Plugins.
+Die $Projectname kann auf vielerlei Art erweitert werden: Durch Server-Anpassung, persönliche Anpassung, setzen von Optionen, Themes und Addons/Plugins.
 
 [b]API[/b]
 
-Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in der Hubzilla gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich.
+Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in der $Projectname gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich.
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/de/main.bb b/doc/de/main.bb
index 2dee14ff8..fa2168f79 100644
--- a/doc/de/main.bb
+++ b/doc/de/main.bb
@@ -25,7 +25,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat
 [zrl=[baseurl]/help/cloud]Cloud-Speicher[/zrl]
 [zrl=[baseurl]/help/remove_account]Einen Kanal oder das ganze Konto löschen[/zrl]
 
-[size=large][b]Hilfe für Hubzilla-Mitglieder[/b][/size]
+[size=large][b]Hilfe für $Projectname-Mitglieder[/b][/size]
 [zrl=[baseurl]/help/tags_and_mentions]Tags und Erwähnungen[/zrl]
 [zrl=[baseurl]/help/webpages]Webseiten[/zrl]
 [zrl=[baseurl]/help/bbcode]BBcode-Referenz für Posts und Kommentare[/zrl]
@@ -45,7 +45,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat
 [zrl=[baseurl]/help/faq_admins]FAQ für Admins[/zrl]
 
 [size=large][b]Technische Dokumentation[/b][/size]
-[zrl=[baseurl]/help/history]Die Geschichte der Hubzilla[/zrl]
+[zrl=[baseurl]/help/history]Die Geschichte der $Projectname[/zrl]
 [zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein grober Überblick[/zrl]
 [zrl=[baseurl]/help/zot]Eine Einführung ins Zot-Protokoll[/zrl]
 [zrl=[baseurl]/help/zot_structures]Zot-Strukturen[/zrl]
@@ -80,8 +80,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat
 [url=https://zothub.com/channel/one]Entwickler-Kanal[/url]
 [url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url]
 
-
-[url=[baseurl]/help/credits]Hubzilla Credits[/url]
+[url=[baseurl]/help/credits]$Projectname Credits[/url]
 
 [size=large][b]Über diesen Red-Server[/b][/size]
 [zrl=[baseurl]/help/TermsOfService]Nutzungsbedingungen dieses Red-Servers[/zrl]
diff --git a/doc/de/registration.bb b/doc/de/registration.bb
index 0dbd876f7..ebd187357 100644
--- a/doc/de/registration.bb
+++ b/doc/de/registration.bb
@@ -27,7 +27,7 @@ Der Kanal-Name ist der Titel oder eine kurze Beschreibung des Kanals. Der „Spi
 Wenn Dein Kanal angelegt ist, geht es direkt weiter zu den Einstellungen. Dort kannst Du Zugriffsrechte setzen, Funktionen zu- oder abschalten und so weiter. Diese Punkte werden auf den entsprechenden Hilfeseiten erklärt.  
 
 Siehe auch
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der Hubzilla[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der $Projectname[/zrl]
 [zrl=[baseurl]/help/accounts]Konten[/zrl]
 [zrl=[baseurl]/help/profiles]Profile[/zrl]
 [zrl=[baseurl]/help/permissions]Zugriffsrechte[/zrl]
diff --git a/doc/developers.bb b/doc/developers.bb
index ce2f978a5..eccf991ab 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -19,7 +19,7 @@ to notify us to merge your work.
 

 [b]Translations[/b]

 

-Our translations are managed through Transifex. If you wish to help out translating the Hubzilla to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   

+Our translations are managed through Transifex. If you wish to help out translating the $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   

 

 [zrl=[baseurl]/help/Translations]Translations - More Info[/zrl]

 

diff --git a/doc/encryption.bb b/doc/encryption.bb
index 2413eda01..9985f4b33 100644
--- a/doc/encryption.bb
+++ b/doc/encryption.bb
@@ -1,6 +1,7 @@
 [size=large]Builtin Automatic Encryption[/size]
 
-Full disclosure: The encryption Hubzilla uses per default is not absolutely waterproof. There [i]are[/i] known procedures to circumvent it. [i]But[/i] this takes a lot of effort and needs to be done individually for each channel. And to make this clear: Other services store your messages in plaintext, therefore we regard this approach as a [i]significant[/i] improvement for your privacy. Plus you are always free to use further encryption and password protection if you so desire.
+Full disclosure: The encryption $Projectname uses per default is not absolutely waterproof. There [i]are[/i] known procedures to circumvent it. [i]But[/i] this takes a lot of effort and needs to be done individually for each channel. And to make this clear: Other services store your messages in plaintext, therefore we regard this approach as a [i]significant[/i] improvement for your privacy. Plus you are always free to use further encryption and password protection if you so desire.
+
 
 To explain this in more detail: 
 
@@ -11,6 +12,7 @@ To explain this in more detail:
 So what is the scope of security? Full disclosure: This might be great, but it is not perfect.
 - every non-public post is automatically encrypted but persons who have access to the site's database and files [i]may[/i] be able to decrypt everything by using these keys which obviously need to be stored on the server. To be clear: The encrypion keys are different for every channel and it is [i]quite an effort[/i] to do this. And again: Other services store your messages in plain text unencrypted. So this [i]is[/i] quite a significant win for your privacy.
 
-We believe that the NSA-level dragnet plaintext extracting mass surveillance is probably not possible due to the design of the zot protocol. Dedicated attacks including hacking into one hub to obtain the server logs and database only partly reveal what is going on between people communication between different hubs. We believe that this makes it much more expensive for state-level attackers to access your content in Hubzilla.
+We believe that the NSA-level dragnet plaintext extracting mass surveillance is probably not possible due to the design of the zot protocol. Dedicated attacks including hacking into one hub to obtain the server logs and database only partly reveal what is going on between people communication between different hubs. We believe that this makes it much more expensive for state-level attackers to access your content in $Projectname.
+
 
 We gladly accept help improving the security of the system and auditing it as well.
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index fcd27c77a..412e84467 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -5,8 +5,8 @@
 

 [*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]

 [*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]

-[*][url=https://github.com/tonybaldwin/hubzillathemes/]nubasic[/url]

-[*][url=https://github.com/deadsuperhero/hubzilla-themes]Sean Tilley's Hubzilla themes[/url]

+[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url]

+[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's themes[/url]

 

 [b]Third-Party Addons[/b]

 [*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]

diff --git a/doc/extra_features.bb b/doc/extra_features.bb
index 3a2d77ec5..ed513eeb3 100644
--- a/doc/extra_features.bb
+++ b/doc/extra_features.bb
@@ -1,7 +1,7 @@
 // multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file?

 [b]Features[/b]

 

-The default interface of the Hubzilla was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.

+The default interface of the $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.

 

 [b]Content Expiration[/b]

 

diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb
index 63c007bce..63418c1dc 100644
--- a/doc/faq_admins.bb
+++ b/doc/faq_admins.bb
@@ -1,4 +1,4 @@
-[size=large][b]The Hubzilla FAQ[/b][/size]
+[size=large][b]The $Projectname FAQ[/b][/size]
 
 [toc]
 
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 55d90621b..027efe8f4 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -4,7 +4,8 @@
 
 
 [h3]What does $a mean?[/h3]
-$a is a class defined in boot.php and passed all around Hubzilla as a global reference variable. It defines everything necessary for the Hubzilla application: Server variables, URL arguments, page structures, layouts, content, installed plugins, output device info, theme info, identity of the observer and (potential) page owner ... 
+$a is a class defined in boot.php and passed all around $Projectname as a global reference variable. It defines everything necessary for the $Projectname application: Server variables, URL arguments, page structures, layouts, content, installed plugins, output device info, theme info, identity of the observer and (potential) page owner ... 
+
 We don't ever create more than one instance and always modify the elements of the single instance. The mechanics of this are somewhat tricky. If you have a function that is passed $a and needs to modify $a you need to declare it as a reference with '&' e.g. 
 
 [code]function foo(&$a) { $a->something = 'x'; // whatever };
diff --git a/doc/faq_members.bb b/doc/faq_members.bb
index 3cc4f7189..9d42d97ad 100644
--- a/doc/faq_members.bb
+++ b/doc/faq_members.bb
@@ -1,11 +1,11 @@
-[size=large][b]The Hubzilla FAQ[/b][/size]
+[size=large][b]The $Projectname FAQ[/b][/size]
 
 [toc]
 
 
 [h3]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/h3]
-Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. 
-If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.
+Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other $Projectname servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to $Projectname posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. 
+If a posting is public this is even harder, as the $Projectname is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.
 
 [h3]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/h3]
 To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :)
diff --git a/doc/features.bb b/doc/features.bb
index 77b6ae1d0..8d51d9853 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -1,35 +1,35 @@
 [b][size=20]Features[/size][/b]

 

-[b][size=24]Hubzilla in a Nutshell[/size][/b]

+[b][size=24]$Projectname in a Nutshell[/size][/b]

 

 TL;DR 

 

-Hubzilla provides distributed web publishing and social communications with [b]decentralised permissions[/b].

+$Projectname provides distributed web publishing and social communications with [b]decentralised permissions[/b].

 

 So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.

 

-Hubzilla combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher. 

+$Projectname combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher. 

 

-Hubzilla is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools. 

+$Projectname is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools. 

 

-[b][size=24]Hubzilla Features[/size][/b]

+[b][size=24]$Projectname Features[/size][/b]

 

 

-The Hubzilla is a general-purpose web publishing and communication network, with several unique features.  It is designed to be used by the widest range of people on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.

+The $Projectname is a general-purpose web publishing and communication network, with several unique features.  It is designed to be used by the widest range of people on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.

 

-This page lists some of the core features of Hubzilla that are bundled with the official release.  As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of the members.

+This page lists some of the core features of $Projectname that are bundled with the official release.  As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of the members.

 

 [b][size=20]Built for Privacy and Freedom[/size][/b]

 

-One of the design goals of Hubzilla is to enable easy communication on the web, while preserving privacy, if so desired by members. To achieve this goal, Hubzilla includes a number of features allowing arbitrary levels of privacy:

+One of the design goals of $Projectname is to enable easy communication on the web, while preserving privacy, if so desired by members. To achieve this goal, $Projectname includes a number of features allowing arbitrary levels of privacy:

 

 [b]Affinity Slider[/b]

 

-When adding connnections in Hubzilla, members have the option of assigning "affinity" levels (how close your friendship is) to the new connection.  For example, when adding someone who happens to be a person whose blog you follow, you could assign their channel an affinity level of &quot;Acquaintances&quot;. 

+When adding connnections in $Projectname, members have the option of assigning "affinity" levels (how close your friendship is) to the new connection.  For example, when adding someone who happens to be a person whose blog you follow, you could assign their channel an affinity level of &quot;Acquaintances&quot;. 

 

 On the other hand, when adding a friend's channel, they could be placed under the affinity level of &quot;Friends&quot;.

 

-At this point, the Hubzilla [i]Affinity Slider[/i] tool, which usually appears at the top of your &quot;Matrix&quot; page, adjusts the content on the page to include those within the desired affinity range. Channels outside that range will not be displayed, unless you adjust the slider to include them.

+At this point, the $Projectname [i]Affinity Slider[/i] tool, which usually appears at the top of your &quot;Matrix&quot; page, adjusts the content on the page to include those within the desired affinity range. Channels outside that range will not be displayed, unless you adjust the slider to include them.

 

 The Affinity Slider allows instantaneous filtering of large amounts of content, grouped by levels of closeness.

 

@@ -43,12 +43,12 @@ Access Control Lists may be applied to content and posts, photos, events, webpag
 

 [b]Single Sign-on[/b]

 

-Access Control Lists work for all channels in the matrix due to our unique single sign-on technology. Most internal links provide an identity token which can be verified on other Hubzilla sites and used to control access to private resources. You login once to your home hub. After that, authentication to all Hubzilla resources is "magic".

+Access Control Lists work for all channels in the matrix due to our unique single sign-on technology. Most internal links provide an identity token which can be verified on other $Projectname sites and used to control access to private resources. You login once to your home hub. After that, authentication to all $Projectname resources is "magic".

 

 

 [b]WebDAV enabled File Storage[/b]

 

-Files may be uploaded to your personal storage area using your operating system utilities (drag and drop in most cases). You may protect these files with Access Control Lists to any combination of Redmatrix.members (including some third party network members) or make them public.

+Files may be uploaded to your personal storage area using your operating system utilities (drag and drop in most cases). You may protect these files with Access Control Lists to any combination of $Projectname members (including some third party network members) or make them public.

 

 [b]Photo Albums[/b]

 

@@ -64,15 +64,15 @@ You may create any number of personal chatrooms and allow access via Access Cont
 

 [b]Webpage Building[/b]

 

-Hubzilla has many "Content Management" creation tools for building webpages, including layout editing, menus, blocks, widgets, and page/content regions. All of these may be access controlled so that the resulting pages are private to their intended audience. 

+$Projectname has many "Content Management" creation tools for building webpages, including layout editing, menus, blocks, widgets, and page/content regions. All of these may be access controlled so that the resulting pages are private to their intended audience. 

 

 [b]Apps[/b]

 

-Apps may be built and distributed by members. These are different from traditional "vendor lockin" apps because they are controlled completely by the author - who can provide access control on the destination app pages and charge accordingly for this access. Most apps in Hubzilla are free and can be created easily by those with no programming skills. 

+Apps may be built and distributed by members. These are different from traditional "vendor lockin" apps because they are controlled completely by the author - who can provide access control on the destination app pages and charge accordingly for this access. Most apps in $Projectname are free and can be created easily by those with no programming skills. 

 

 [b]Layout[/b]

 

-Page layout is based on a description language called Comanche. Hubzilla is itself written in Comanche layouts which you can change. This allows a level of customisation you won't typically find in so-called "multi-user environments".

+Page layout is based on a description language called Comanche. $Projectname is itself written in Comanche layouts which you can change. This allows a level of customisation you won't typically find in so-called "multi-user environments".

 

 [b]Bookmarks[/b]

 

@@ -87,7 +87,7 @@ These private messages are also stored in an encrypted form on remote systems.
 

 Each Red channel has it's own unique set of private and associated public RSA 4096-bit keys, generated when the channels is first created.

 

-Additionally, messages may be created utilising "end-to-end encryption" which cannot be read by Hubzilla operators or ISPs or anybody who does not know the passcode. 

+Additionally, messages may be created utilising "end-to-end encryption" which cannot be read by $Projectname operators or ISPs or anybody who does not know the passcode. 

 

 Public messages are generally not encrypted in transit or in storage.  

 

@@ -98,9 +98,9 @@ Posts and messages may be created with an expiration date, at which time they wi
 

 [b]Service Federation[/b]

 

-In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as Hubzilla and may present privacy risks.

+In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as $Projectname and may present privacy risks.

 

-There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your Hubzilla hub may be used as an OpenID provider to authenticate you to external services which use this technology. 

+There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your $Projectname hub may be used as an OpenID provider to authenticate you to external services which use this technology. 

 

 Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel. 

 

@@ -111,12 +111,12 @@ Channels may have permissions to become "derivative channels" where two or more
 

 [b]Directory Services[/b]

 

-We provide easy access to a directory of members and provide decentralised tools capable of providing friend "suggestions". The directories are normal Hubzilla sites which have chosen to accept the directory server role. This requires more resources than most typical sites so is not the default. Directories are synchronised and mirrored so that they all contain up-to-date information on the entire network (subject to normal propagation delays).  

+We provide easy access to a directory of members and provide decentralised tools capable of providing friend "suggestions". The directories are normal $Projectname sites which have chosen to accept the directory server role. This requires more resources than most typical sites so is not the default. Directories are synchronised and mirrored so that they all contain up-to-date information on the entire network (subject to normal propagation delays).  

  

 

 [b]TLS/SSL[/b]

 

-For Hubzilla hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL.  Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways. Private communications are consequently encrypted at a higher level before sending offsite.

+For $Projectname hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL.  Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways. Private communications are consequently encrypted at a higher level before sending offsite.

 

 [b]Channel Settings[/b]

 

@@ -142,9 +142,9 @@ Forums are typically channels which may be open to participation from multiple a
 

 [b]Account Cloning[/b]

 

-Accounts in the Hubzilla are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created.  For example, when you create a Facebook or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  

+Accounts in the $Projectname are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created.  For example, when you create a Facebook or Gmail account, it is tied to those services.  They cannot function without Facebook.com or Gmail.com.  

 

-By contrast, say you've created a Red identity called [b]tina@redhub.com[/b].  You can clone it to another Red hub by choosing the same, or a different name: [b]liveForever@SomeHubzillaHub.info[/b]

+By contrast, say you've created a Red identity called [b]tina@redhub.com[/b].  You can clone it to another Red hub by choosing the same, or a different name: [b]liveForever@Some$ProjectnameHub.info[/b]

 

 Both channels are now synchronized, which means all your contacts and preferences will be duplicated on your clone.  It doesn't matter whether you send a post from your original hub, or the new hub.  Posts will be mirrored on both accounts.

 

@@ -152,9 +152,9 @@ This is a rather revolutionary feature, if we consider some scenarios:
 

  - What happens if the hub where an identity is based suddenly goes offline?  Without cloning, a member will not be able to communicate until that hub comes back online (no doubt many of you have seen and cursed the Twitter "Fail Whale").  With cloning, you just log into your cloned account, and life goes on happily ever after. 

 

- - The administrator of your hub can no longer afford to pay for his free and public Hubzilla hub. He announces that the hub will be shutting down in two weeks.  This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.

+ - The administrator of your hub can no longer afford to pay for his free and public $Projectname hub. He announces that the hub will be shutting down in two weeks.  This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.

 

- - What if your identity is subject to government censorship?  Your hub provider may be compelled to delete your account, along with any identities and associated data.  With cloning, the Hubzilla offers [b]censorship resistance[/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  

+ - What if your identity is subject to government censorship?  Your hub provider may be compelled to delete your account, along with any identities and associated data.  With cloning, the $Projectname offers [b]censorship resistance[/b].  You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.  

 

 Red offers interesting new possibilities for privacy. You can read more at the &lt;&lt;Private Communications Best Practices&gt;&gt; page.

 

@@ -178,12 +178,12 @@ Accounts can be immediately deleted by clicking on a link. That's it.  All assoc
 

 [b]Writing Posts[/b]

 

-Red supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in Hubzilla. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for Hubzilla had some serious issues and has since been removed. We are currently looking for a replacement. 

+Red supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in $Projectname. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for $Projectname had some serious issues and has since been removed. We are currently looking for a replacement. 

 

 When creating &quot;Websites&quot;, content may be entered in HTML, Markdown, BBcode, and/or plain text.

 

 [b]Deletion of content[/b]

-Any content created in the Hubzilla remains under the control of the member (or channel) that originally created it.  At any time, a member can delete a message, or a range of messages.  The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot (the Hubzilla communication and authentication protocol).

+Any content created in the $Projectname remains under the control of the member (or channel) that originally created it.  At any time, a member can delete a message, or a range of messages.  The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot (the $Projectname communication and authentication protocol).

 

 [b]Media[/b]

 Similar to any other modern blogging system, social network, or a micro-blogging service, Red supports the uploading of files, embedding of videos, linking web pages.

@@ -195,13 +195,13 @@ Post can be previewed prior to sending and edited after sending.
 Posts can be turned into "concensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys. 

 

 

-[b]Extending Hubzilla[/b]

+[b]Extending $Projectname[/b]

 

-Hubzilla can be extended in a number of ways, through site customisation, personal customisation, option setting, themes, and addons/plugins. 

+$Projectname can be extended in a number of ways, through site customisation, personal customisation, option setting, themes, and addons/plugins. 

 

 [b]API[/b]

 

-An API is available for use by third-party services. This is based originally on the early Twitter API (for which hundreds of third-party tools exist). It is currently being extended to provide access to facilities and abilities which are specific to Hubzilla. Access may be provided by login/password or OAuth and client registration of OAuth applications is provided.

+An API is available for use by third-party services. This is based originally on the early Twitter API (for which hundreds of third-party tools exist). It is currently being extended to provide access to facilities and abilities which are specific to $Projectname. Access may be provided by login/password or OAuth and client registration of OAuth applications is provided.

 

  

 

diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 525f93b2c..76213851c 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -1,6 +1,7 @@
 [b]Advanced Configurations for Administrators[/b]
 
-Hubzilla contains many configuration options hidden from the main admin panel.
+$Projectname contains many configuration options hidden from the main admin panel.
+
 These are generally options considered too niche, confusing, or advanced for 
 the average member.  These settings can be activated from the the top level Red 
 directory with the syntax [code]util/config cat key value[/code] for a site
diff --git a/doc/history.md b/doc/history.md
index d190ac446..614696435 100644
--- a/doc/history.md
+++ b/doc/history.md
@@ -1,7 +1,7 @@
-Hubzilla History
-=================
+$Projectname History
+====================
 
-Hubzilla is a collaborative effort by the Hubzilla community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself were created/written primarily by Mike Macgirvin and represent the culmination of over a decade of software design using variations of this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list individually).
+$Projectname is a collaborative effort by the $Projectname community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself were created/written primarily by Mike Macgirvin and represent the culmination of over a decade of software design using variations of this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list individually).
 
 ##Mike Macgirvin -- Biography
  
@@ -10,9 +10,9 @@ Mike Macgirvin is an American software engineer now living in Australia. He spen
 During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Opening a retail store for non-essential goods at the beginning of a prolonged economic downturn was in retrospect probably not the wisest career move. Sonica eventually folded; in late 2006. Mike returned to working on software and systems support full-time and was employed briefly at Symantec before moving to Australia in early 2007. He currently lives on a farm "out in the middle of nowhere" and is employed as a Computer Systems Officer at the University of Wollongong. 
 
 
-##Hubzilla - The Early Years
+##$Projectname - The Early Years
 
-The software which went into creating Hubzilla has been through three distinct historical phases. It began in 2003 when Mike Macgirvin was looking for a content management system to power the website for his music store and found the available solutions to be lacking in various respects. The project was born as the "PurpleHaze weblog" under the nom de plume "Nerdware Communications". It was a multi-user PHP/MySQL CMS which provided blogs, forums, photo albums, events and more. Initially it provided the basis for a social community and shopping for customers of the store, but was also linked to Mike's personal weblog running on another domain. The distinguishing characteristic of this software was the ability for so-called "normal users" to re-assemble the components and choose different content feeds - and in essence create their own personal "multi-user CMS" as a view. Their custom view was able to communicate with anybody else that used the system, but could be partitioned so that adult sites and motorcycle enthusiast sites would not be visible to each other and not clash (or in this case Mike's personal website and the music store website). This software was developed primarily from 2003 until 2008.
+The software which went into creating $Projectname has been through three distinct historical phases. It began in 2003 when Mike Macgirvin was looking for a content management system to power the website for his music store and found the available solutions to be lacking in various respects. The project was born as the "PurpleHaze weblog" under the nom de plume "Nerdware Communications". It was a multi-user PHP/MySQL CMS which provided blogs, forums, photo albums, events and more. Initially it provided the basis for a social community and shopping for customers of the store, but was also linked to Mike's personal weblog running on another domain. The distinguishing characteristic of this software was the ability for so-called "normal users" to re-assemble the components and choose different content feeds - and in essence create their own personal "multi-user CMS" as a view. Their custom view was able to communicate with anybody else that used the system, but could be partitioned so that adult sites and motorcycle enthusiast sites would not be visible to each other and not clash (or in this case Mike's personal website and the music store website). This software was developed primarily from 2003 until 2008.
 
 In 2006 this software was used as the prototype for Symantec's "safeweb" reputation and community site. It was developed and enhanced until about 2008. A rewrite took place in 2008 named "Reflection" but work stagnated as the community dwindled. The need for content management systems and communications software dropped dramatically during this time as humans flocked to the new social aggregrators - Facebook and Twitter.  
 
@@ -32,17 +32,18 @@ Mike realised he did not want to be held hostage to the decisions that other pro
 Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. 
 
 
-##Hubzilla
+##$Projectname
 
 In July 2012, Mike left the Friendica project and began development of "zot" and a new base project called "red" in his somewhat elusive *spare time*. Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time (December 2012) was developing separately on its own track.
 
 It became clear during this time that the single most compelling feature of the project wasn't the social network at all, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - now gone. This is also what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies.   
 
-An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Hubzilla" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy.  
+An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "$Projectname" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy.  
 
 The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. It needed content publishing tools. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. And it **also** had a built-in social network; with lots of additional privacy and encryption features which were added even before the Snowden revelations gave them added urgency.
 
-Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed Hubzilla to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications. 
+Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed $Projectname to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications. 
+
 
 Mike resigned from the project as an active coordinator in early 2015. 
 
diff --git a/doc/html/index.php b/doc/html/index.php
index 1796685a2..4ef28aada 100644
--- a/doc/html/index.php
+++ b/doc/html/index.php
@@ -1,10 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
+<<<<<<< HEAD
 	<title>Hubzilla Doxygen API Documentation</title>
 </head>
 <body>
 <h1>Hubzilla Doxygen API Documentation not rendered</h1>
+=======
+	<title>$Projectname Doxygen API Documentation</title>
+</head>
+<body>
+<h1>$Projectname Doxygen API Documentation not rendered</h1>
+>>>>>>> f866a42a42b9e12756353f5bb39a0f31a64bb26a
 To get the Doxygen API Documentation you must render it with the program <a href="http://www.doxygen.org">Doxygen</a> (included in most distributions).
 <pre>
 $ doxygen util/Doxyfile
diff --git a/doc/main.bb b/doc/main.bb
index 0c5844993..8085f2f2e 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,22 +1,22 @@
 [img][baseurl]/assets/hashlogo.png[/img]

 

-[size=large][b]Hubzilla Documentation[/b][/size]

+[size=large][b]$Projectname Documentation[/b][/size]

 

-[zrl=[baseurl]/help/about][b]What is the Hubzilla?[/b][/zrl]

-Hubzilla is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.

+[zrl=[baseurl]/help/about][b]What is the $Projectname?[/b][/zrl]

+$Projectname is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.

 

-[zrl=[baseurl]/help/features][b]Hubzilla Features[/b][/zrl]

+[zrl=[baseurl]/help/features][b]$Projectname Features[/b][/zrl]

 

-The Hubzilla is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

-Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the Hubzilla is there to cater to your creativity.

+The $Projectname is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

+Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the $Projectname is there to cater to your creativity.

 

 [zrl=[baseurl]/help/what_is_zot][b]Got Zot? Well, you should.[/b][/zrl]

-Zot is the great new communicaton protocol invented especially for the Hubzilla. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the Hubzilla there is no need for you to authenticate twice, even when accessing another Hubzilla site. Zot is what sets the Hubzilla apart. 

+Zot is the great new communicaton protocol invented especially for the $Projectname. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the $Projectname there is no need for you to authenticate twice, even when accessing another $Projectname site. Zot is what sets the $Projectname apart. 

 

 [size=large][b]Getting Started[/b][/size]

 [zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]

 [zrl=[baseurl]/help/registration]Account Registration[/zrl]

-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the Hubzilla: accounts, profiles and channels in short[/zrl]

+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the $Projectname: accounts, profiles and channels in short[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/channels]Channels[/zrl]

 [zrl=[baseurl]/help/roles]Permission roles and Channel types[/zrl]

@@ -42,11 +42,11 @@ Zot is the great new communicaton protocol invented especially for the Hubzilla.
 [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]

 [zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]

 [zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]

-[zrl=[baseurl]/help/hidden_configs]Tweaking Hubzilla's Hidden Configurations[/zrl]

+[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]

 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]

 

 [size=large][b]Technical Documentation[/b][/size]

-[zrl=[baseurl]/help/history]Hubzilla history[/zrl]

+[zrl=[baseurl]/help/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]

@@ -79,11 +79,11 @@ Zot is the great new communicaton protocol invented especially for the Hubzilla.
 [url=https://github.com/redmatrix/hubzilla]Main Website[/url]

 [url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url]

 [url=https://zothub.com/channel/one]Development Channel[/url]

-[url=https://federated.social/channel/postgres]Postgres-specific Hubzilla Admin Support Channel[/url]

+[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]

 

-[url=[baseurl]/help/credits]Hubzilla Credits[/url]

+[url=[baseurl]/help/credits]$Projectname Credits[/url]

 

-[size=large][b]About This Hubzilla Hub[/b][/size]

+[size=large][b]About This $Projectname Hub[/b][/size]

 [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]

diff --git a/doc/permissions.bb b/doc/permissions.bb
index 6bc8e566b..bcf3c43e0 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -1,6 +1,6 @@
 [b]Permissions[/b]

 

-Permissions in the Hubzilla are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white &quot;this person is my friend, so they can do everything&quot; or &quot;this person is not my friend, so they can't do anything&quot; permissions you may find elsewhere.

+Permissions in the $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white &quot;this person is my friend, so they can do everything&quot; or &quot;this person is not my friend, so they can't do anything&quot; permissions you may find elsewhere.

 

 [b]Default Permissions[/b]

 

@@ -24,7 +24,7 @@ The scopes of permissions are:
 

 [li]Anybody On This Hub. Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.[/li]

 

-[li]Anybody in this network. Anybody in the Hubzilla will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]

+[li]Anybody in this network. Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]

 

 [li]Anybody authenticated. This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.[/li]

 

diff --git a/doc/plugins.bb b/doc/plugins.bb
index ada29cf62..fdabbb7ab 100644
--- a/doc/plugins.bb
+++ b/doc/plugins.bb
@@ -1,9 +1,9 @@
 [b]Plugins[/b]

 

-So you want to make the Hubzilla do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. 

+So you want to make the $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. 

 

 

-In your Hubzilla folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. 

+In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. 

 [code]

 	mkdir addon

 [/code]

@@ -26,7 +26,7 @@ Then we're going to create a comment block to describe the plugin. There's a spe
 	/**

 	 *

 	 * Name: Random Place (here you can use better descriptions than you could in the filename)

-	 * Description: Sample Hubzilla plugin, Sets a random place when posting.

+	 * Description: Sample $Projectname plugin, Sets a random place when posting.

 	 * Version: 1.0

 	 * Author: Mike Macgirvin &lt;mike@zothub.com&gt;

 	 *

@@ -45,9 +45,9 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is
  pluginname_uninstall()

 [/code]

 

-Next we'll talk about **hooks**. Hooks are places in the Hubzilla code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a &quot;handler function&quot; for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.

+Next we'll talk about **hooks**. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a &quot;handler function&quot; for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.

 

-We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Hubzilla installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. 

+We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. 

 

 [code]

 	function randplace_load() {

@@ -247,18 +247,18 @@ If you want to keep your plugin hidden from the siteinfo page, simply create a f
 

 ***Porting Friendica Plugins***

 

-The Hubzilla uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:

+The $Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:

 

 [li] Friendica's pluginname_install() is pluginname_load()[/li]

 

 [li] Friendica's pluginname_uninstall() is pluginname_unload()[/li]

 

-The Hubzilla has _install and _uninstall functions but these are used differently.

+The $Projectname has _install and _uninstall functions but these are used differently.

 

 [li] Friendica's &quot;plugin_settings&quot; hook is called &quot;feature_settings&quot;[/li]

 

 [li] Friendica's &quot;plugin_settings_post&quot; hook is called &quot;feature_settings_post&quot;[/li]

 

-Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Hubzilla. Many structured data names (especially DB schema columns) are also quite different.

+Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the $Projectname. Many structured data names (especially DB schema columns) are also quite different.

 

 #include doc/macros/main_footer.bb;

diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb
index 750f5e6f0..e2ba11e3e 100644
--- a/doc/problems-following-an-update.bb
+++ b/doc/problems-following-an-update.bb
@@ -28,7 +28,7 @@ We use the Smarty3 template engine to generate pages.  These templates are compi
 

 [b]Theme Issues[/b]

 

-There are many themes for The Hubzilla.  Only Redbasic is officialy supported by the core developers.  This applies [i]even if a core developer happens to support an additional theme[/i].  This means new features are only guaranteed to work in Redbasic.

+There are many themes for The $Projectname.  Only Redbasic is officialy supported by the core developers.  This applies [i]even if a core developer happens to support an additional theme[/i].  This means new features are only guaranteed to work in Redbasic.

 

 Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes.  This means new features may only work properly in Redbasic.  Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there.  If the issue goes away, this is not a bug - it's a theme that isn't up to date.

 

diff --git a/doc/profiles.bb b/doc/profiles.bb
index 208f84f75..cae51a9c6 100644
--- a/doc/profiles.bb
+++ b/doc/profiles.bb
@@ -14,7 +14,7 @@ In addition, if you'd like to meet people that share some general interests with
 

 To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings &gt; Additional Features[/zrl] and enable &quot;Multiple Profiles&quot; there, otherwise you won't have the ability to use more than just your default profile.

 

-Then select &quot;Edit Profiles&quot; from the menu of your Hubzilla site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a &quot;clone&quot; of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose &quot;Clone this profile&quot; there.

+Then select &quot;Edit Profiles&quot; from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a &quot;clone&quot; of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose &quot;Clone this profile&quot; there.

 

 In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on &quot;Edit visibility&quot; next to the profile in question (only available for the profiles that are not your default profile) and then click on user images to add them to or remove them from the group of people who can see this profile.

 

diff --git a/doc/red2pi.bb b/doc/red2pi.bb
index 5e2b77755..18e7d325a 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -1,4 +1,4 @@
-[b]How to install the Hubzilla on a Raspberry Pi[/b]

+[b]How to install the $Projectname on a Raspberry Pi[/b]

 

 You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name?

 

@@ -6,11 +6,11 @@ Then this page is for you! You will:
 [list=1]

 [*] Install Raspberry OS (Debian Linux) on a Raspberry

 [*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin

-[*] Register a free domain (dynamic DNS) and use it for your RED hub

-[*] Install the RED Matrix

-[*] Keep your Raspberry Pi and your Hubzilla up-to-date

+[*] Register a free domain (dynamic DNS) and use it for your hub

+[*] Install $Projectname

+[*] Keep your Raspberry Pi and $Projectname up-to-date

 [*] TODO Setting up SSL

-[*] TODO Running Friendica with SSL

+[*] TODO Running with SSL

 [*] TODO Make the webserver less vulnarable to attacks

 [/list]

 

@@ -224,27 +224,27 @@ To check the logs you can use this:
 [code]more /var/log/messages |grep INADYN[/code]

 

 

-[size=large]4. Install RED [/size] 

+[size=large]4. Install $Projectname[/size] 

 

-(Source: [zrl=https://friendicared.net/help/Install]https://friendicared.net/help/Install[/zrl])

+(Source: [zrl=[baseurl]/help/Install][baseurl]/help/Install[/zrl])

 

 Linux Appache document root is /var/www/

 Two files exist there (created by the steps above): index.html, phpinfo.php

 

 

-[b]Install RED and its Addons[/b]

+[b]Install $Projectname and its Addons[/b]

 

 Cleanup: Remove the directory www/ (Git will not create files and folders in directories that are not empty.) Make sure you are in directory var[code]pi@pi /var $ cd /var[/code]

  

 Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code]

 

-Download the sources of RED from GIT

+Download the sources of $Projectname from GIT

 [code]pi@pi /var $ sudo git clone https://github.com/redmatrix/hubzilla.git www[/code]

 

 Download the sources of the addons from GIT

 [code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/hubzilla-addons.git addon[/code]

 

-Make user www-data the owner of the whole red directory (including subdirectories and files)

+Make user www-data the owner of the whole web directory (including subdirectories and files)

 (TODO: This step has to be proofed by the next installation.)

 [code]pi@pi /var $ chown -R www-data:www-data /var/www/[/code]

 

@@ -319,14 +319,14 @@ php util/config system block_public_search 1
 

 

 

-[size=large]5. Keep your Raspberry Pi and your Hubzilla up-to-date[/size] 

+[size=large]5. Keep your Raspberry Pi and your $Projectname up-to-date[/size] 

 

-Git update of RED every day at 4 am and addons at 5 am every day

+Git update every day at 4 am and addons at 5 am every day

 Try if the command is working

 - pi@pi /var/www $ sudo git pull

 Create the cronjob

 - pi@pi /var/www $ crontab -e

-Enter the following to update RED at 4:01 am every day

+Enter the following to update at 4:01 am every day

 - 01 04 * * * cd /var/www/; sudo git pull

 Enter the following to update the addons at 5:01 am every day

 - 01 05 * * * cd /var/www/addon/; sudo git pull

@@ -334,7 +334,7 @@ Enter the following to update the Raspberry Pi (Raspbian OS = Debian) at 6:01 am
 - 01 06 * * * sudo aptitude -y update &amp;&amp; sudo aptitude -y safe-upgrade

 Save and exit.

 

-[size=large]6. Running Friendica with SSL[/size] 

+[size=large]6. Running with SSL[/size] 

 

 Follow the instructions here:

 [url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url]

diff --git a/doc/registration.bb b/doc/registration.bb
index 249d38bd1..31d696221 100644
--- a/doc/registration.bb
+++ b/doc/registration.bb
@@ -1,6 +1,6 @@
 [size=large][b]Registration[/b][/size]

 

-Not all Hubzilla sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Hubzilla sites are linked, it does not matter where your account resides.

+Not all $Projectname sites allow open registration. If registration is allowed, you will see a &quot;Register&quot; link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all $Projectname sites are linked, it does not matter where your account resides.

 

 [b]Your Email Address[/b]

 

@@ -8,7 +8,7 @@ Please provide a valid email address. Your email address is never published. Thi
 

 [b]Password[/b]

 

-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Hubzilla offers a decentralised identity, your account can log you in to many other websites.

+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the $Projectname offers a decentralised identity, your account can log you in to many other websites.

 

 [b]Terms Of Service[/b]

 

@@ -25,7 +25,7 @@ Next, you will be presented with the &quot;Add a channel&quot; screen. Normally,
 When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.

 

 See Also

-[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the Hubzilla[/zrl]

+[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the $Projectname[/zrl]

 [zrl=[baseurl]/help/accounts]Accounts[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/permissions]Permissions[/zrl]

diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index 40d8490f5..641fef4ca 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -1,6 +1,6 @@
 
 
-Roadmap for Hubzilla V3
+Roadmap for $Projectname V3
 
 Crypto
 	Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
diff --git a/doc/sv/main.bb b/doc/sv/main.bb
index ad0768536..409be59c3 100644
--- a/doc/sv/main.bb
+++ b/doc/sv/main.bb
@@ -1,21 +1,21 @@
 [img][baseurl]/assets/hashlogo.png[/img]

 

-[size=large][b]Hubzilla dokumentation[/b][/size]

+[size=large][b]$Projectname dokumentation[/b][/size]

 

-[zrl=[baseurl]/help/about][b]Vad är Hubzilla?[/b][/zrl]

-Hubzilla är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll.

+[zrl=[baseurl]/help/about][b]Vad är $Projectname?[/b][/zrl]

+$Projectname är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll.

 

-[zrl=[baseurl]/help/features][b]Hubzilla funktioner[/b][/zrl]

-Hubzilla används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll.

-Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns Hubzilla för att stödja dig i förverkligande av din kreativitet.

+[zrl=[baseurl]/help/features][b]$Projectname funktioner[/b][/zrl]

+$Projectname används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll.

+Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns $Projectname för att stödja dig i förverkligande av din kreativitet.

 

 [zrl=[baseurl]/help/what_is_zot][b]Har du Zot? Skaffa det, direkt.[/b][/zrl]

-Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för Hubzilla. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i Hubzilla så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör Hubzilla till något särskilt värdefullt/som urskiljer Hubzilla från mängden.

+Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Projectname. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i $Projectname så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör $Projectname till något särskilt värdefullt/som urskiljer $Projectname från mängden.

 

 [size=large][b]Kom igång[/b][/size]

 [zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]

 [zrl=[baseurl]/help/registration]Account Registration[/zrl]

-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the Hubzilla: accounts, profiles and channels in short[/zrl]

+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the $Projectname: accounts, profiles and channels in short[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/channels]Channels[/zrl]

 [zrl=[baseurl]/help/sv/roles]Behörighetsförval för kanaler[/zrl]

@@ -41,11 +41,11 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för Hubzil
 [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]

 [zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]

 [zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]

-[zrl=[baseurl]/help/hidden_configs]Tweaking Hubzilla's Hidden Configurations[/zrl]

+[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]

 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]

 

 [size=large][b]Teknisk dokumentation[/b][/size]

-[zrl=[baseurl]/help/history]Hubzilla history[/zrl]

+[zrl=[baseurl]/help/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]

@@ -78,9 +78,9 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för Hubzil
 [url=https://github.com/friendica/red-addons]Addon Website[/url]

 [url=https://zothub.com/channel/one]Development Channel[/url]

 

-[url=[baseurl]/help/credits]Hubzilla Credits[/url]

+[url=[baseurl]/help/credits]$Projectname Credits[/url]

 

-[size=large][b]About This Hubzilla Hub[/b][/size]

+[size=large][b]About This $Projectname Hub[/b][/size]

 [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 (/siteinfo_json)[/zrl]

diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 374cf598d..50df9e392 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -1,6 +1,6 @@
 [b]What is Zot?[/b]

 

-Zot is the protocol that powers the Hubzilla, providing three core capabilities: Communications, Identity, and Access Control.

+Zot is the protocol that powers the $Projectname, providing three core capabilities: Communications, Identity, and Access Control.

 

 The functionality it provides can also be described as follows: 

 

@@ -39,7 +39,7 @@ You cannot be silenced. You cannot be removed from the matrix, unless you yourse
 

 [b][size=20]Access Control[/size][/b]

 

-Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Hubzilla. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. 

+Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the $Projectname. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. 

 

 Currently, the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities, such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control.

 

diff --git a/doc/zot.md b/doc/zot.md
index 8cc1c8764..f8881c551 100644
--- a/doc/zot.md
+++ b/doc/zot.md
@@ -57,7 +57,7 @@ In order to implement high performance communications, the data transfer format
 
 Bi-directional encryption is based on RSA 4096-bit keys expressed in DER/ASN.1 format using the PKCS#8 encoding variant, with AES-256-CBC used for block encryption of variable length or large items.
 
-Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. The Hubzilla project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. 
+Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. The $Projectname project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. 
 
 In order to create a globally unique ID, we will base it on a whirlpool hash of the identity URL of the origination node and a psuedo-random number, which should provide us with a 256 bit ID with an extremely low probability of collision (256 bits represents approximately 115 quattuorviginitillion or 1.16 X 10^77 unique numbers). This will be represented in communications as a base64url-encoded string. We will not depend on probabilities however and the ID must also be attached to a public key with public key cryptography used to provide an assurance of identity which has not been copied or somehow collided in whirlpool hash space.
 
diff --git a/mod/help.php b/mod/help.php
index 0081e54e7..3d7c0a628 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -97,7 +97,7 @@ function help_content(&$a) {
 	$content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content);
 
 	return replace_macros(get_markup_template("help.tpl"), array(
-		'$content' => $content
+		'$content' => translate_projectname($content)
 	));
 
 }