second pass name change

34 files changed, 85 insertions, 85 deletions

diff --git a/doc/DerivedTheme1.md b/doc/DerivedTheme1.md
index d4a7ee148..7544c4948 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 Red Matrix 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 Hubzilla folder. 
 
 
     cd mywebsite
diff --git a/doc/Developers.md b/doc/Developers.md
index b40a61964..2e7faf397 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -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 Red Matrix 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 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.   
 
 [Translations - More Info](help/Translations)
 
diff --git a/doc/Features.md b/doc/Features.md
index 78c77c9bd..6358b6946 100644
--- a/doc/Features.md
+++ b/doc/Features.md
@@ -1,7 +1,7 @@
 Extra Features
 ==============
 
-The default interface of the Red Matrix 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 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.
 
 **Content Expiration** 
 
diff --git a/doc/Plugins.md b/doc/Plugins.md
index e3e4688d9..9fdbac502 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -1,11 +1,11 @@
-Creating Plugins/Addons for the Red Matrix
+Creating Plugins/Addons for the Hubzilla
 ==========================================
 
 
-So you want to make the Red Matrix 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 Hubzilla 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 Red Matrix 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 +28,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 Red Matrix plugin, Sets a random place when posting.
+	 * Description: Sample Hubzilla plugin, Sets a random place when posting.
 	 * Version: 1.0
 	 * Author: Mike Macgirvin <mike@zothub.com>
 	 *
@@ -47,9 +47,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 Red Matrix 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 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.
 
-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 Red Matrix 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 Hubzilla 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 +244,18 @@ we will create an argc/argv list for use by your module functions
 
 ***Porting Friendica Plugins***
 
-The Red Matrix 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 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:
 
 * Friendica's pluginname_install() is pluginname_load()
 
 * Friendica's pluginname_uninstall() is pluginname_unload()
 
-The Red Matrix has _install and _uninstall functions but these are used differently.
+The Hubzilla 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 Red Matrix. 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 Hubzilla. 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 5a963cb0c..92e5f7702 100644
--- a/doc/Privacy.md
+++ b/doc/Privacy.md
@@ -52,11 +52,11 @@ Hubzilla developers will ensure that any content you provide which is designated
 
 ##Identity Privacy
 
-Privacy for your identity is another aspect. Because you have a decentralized identity in the Red Matrix, 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 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.
 
-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 Red Matrix 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 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.
 
-* 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 Red Matrix. 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 Hubzilla. 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.
 
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index dc39a8cbd..93998bca8 100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -13,7 +13,7 @@ Visit the URL
 
 	https://yoursite/removeme 
 
-(replace 'yoursite' with the domain name of your Red Matrix site). 
+(replace 'yoursite' with the domain name of your Hubzilla 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 7435a28bf..a63bfa86d 100644
--- a/doc/Translations.md
+++ b/doc/Translations.md
@@ -1,4 +1,4 @@
-Translating the Red Matrix
+Translating the Hubzilla
 ==========================
 
 Translation Process
diff --git a/doc/about.bb b/doc/about.bb
index bd91970f6..83f1fb0c6 100644
--- a/doc/about.bb
+++ b/doc/about.bb
@@ -1,8 +1,8 @@
 [b]About[/b]

 

-The Red Matrix 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 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 Red Matrix 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 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.

 

 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 Red Matrix 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 Hubzilla 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 Red Matrix 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 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]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 Red Matrix).  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 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]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 0a55d2f03..327709459 100644
--- a/doc/account_basics.bb
+++ b/doc/account_basics.bb
@@ -2,7 +2,7 @@
 

 [b]Registration[/b]

 

-Not all Red Matrix 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 Red Matrix sites are linked, it does not matter where your account resides.

+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.

 

 [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 Red Matrix 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 Hubzilla 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 f8abd3c3b..c20b247bd 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 Red Matrix 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 Hubzilla 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 Red Matrix 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 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.
 [i]Think of your profile as the basic information about yourself you tell other people.[/i]
 
 [b]Channel[/b]
diff --git a/doc/bbcode.html b/doc/bbcode.html
index f75b1c90b..2b552f0b1 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]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br />
+<li>[url=https://redmatrix.me]Hubzilla[/url] <a href="https://redmatrix.me">Hubzilla</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>Red Matrix specific codes</p>
+<p>Hubzilla 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 2df91f8a3..9abfea129 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 Red Matrix project by asking ourselves a few questions: 

+We started the Hubzilla 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 Red Matrix 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 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.

 

 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 Red Matrix 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 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: 

 

 - Zot, the protocol powering the matrix

 - Single-signon logins.

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

 [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 Red Matrix 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 Hubzilla 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: Red Matrix Beta with the following features[/b]

+[b]March, 2014: Hubzilla 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 Red Matrix t-shirts, as well as our undying gratitude.  

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

 

 [b]$32:  [/b]

 

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

 [b]$2048[/b]

 

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

+Each contributor at this level gets their own Hubzilla 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 Red Matrix?[/size][/color][/b]

+[b][color= grey][size=20]Why are we so excited about the Hubzilla?[/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 Red Matrix 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 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.

 

 [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 Red Matrix offers a passport.

+The Hubzilla 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 Red Matrix use encryption?  Details please![/b]

+[b]6. Does the Hubzilla 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 Red Matrix?[/b]

+[b]8. Can I build my own website with in the Hubzilla?[/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/classRedmatrix_1_1Import_1_1Import-members.html b/doc/classRedmatrix_1_1Import_1_1Import-members.html
index 79ccdf787..d5e2f9277 100644
--- a/doc/classRedmatrix_1_1Import_1_1Import-members.html
+++ b/doc/classRedmatrix_1_1Import_1_1Import-members.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
-<title>The Red Matrix: Member List</title>
+<title>The Hubzilla: Member List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -30,7 +30,7 @@
  <tr style="height: 56px;">
   <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
   <td style="padding-left: 0.5em;">
-   <div id="projectname">The Red Matrix
+   <div id="projectname">The Hubzilla
    </div>
   </td>
  </tr>
diff --git a/doc/classRedmatrix_1_1Import_1_1Import.html b/doc/classRedmatrix_1_1Import_1_1Import.html
index 07c5f1477..9a7128d65 100644
--- a/doc/classRedmatrix_1_1Import_1_1Import.html
+++ b/doc/classRedmatrix_1_1Import_1_1Import.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.3.1"/>
-<title>The Red Matrix: Hubzilla\Import\Import Class Reference</title>
+<title>The Hubzilla: Hubzilla\Import\Import Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -30,7 +30,7 @@
  <tr style="height: 56px;">
   <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
   <td style="padding-left: 0.5em;">
-   <div id="projectname">The Red Matrix
+   <div id="projectname">The Hubzilla
    </div>
   </td>
  </tr>
diff --git a/doc/cloud.bb b/doc/cloud.bb
index 92b97a21c..d3a2d6af9 100644
--- a/doc/cloud.bb
+++ b/doc/cloud.bb
@@ -1,6 +1,6 @@
 [b]Personal Cloud Storage[/b]

 

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

+The Hubzilla 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 901565ad3..58981b506 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 Red Matrix 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 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?

 

 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 Red Matrix 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 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.

 

-To connect with other Red Matrix channels:

+To connect with other Hubzilla 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 1e0d4d3fc..2257f75ba 100644
--- a/doc/connecting_to_channels.md
+++ b/doc/connecting_to_channels.md
@@ -1,12 +1,12 @@
 # Connecting To Channels #
 
-Connections in the Red Matrix 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 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?
 
 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 Red Matrix 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 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.
 
-To connect with other Red Matrix channels:
+To connect with other Hubzilla 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/de/channels.bb b/doc/de/channels.bb
index 19146cf9b..7500d9256 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 Red Matrix, 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 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.
 
 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/developers.bb b/doc/developers.bb
index 0fffcceff..ce2f978a5 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 Red Matrix 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 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.   

 

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

 

diff --git a/doc/encryption.bb b/doc/encryption.bb
index 427c5f96b..2413eda01 100644
--- a/doc/encryption.bb
+++ b/doc/encryption.bb
@@ -1,6 +1,6 @@
 [size=large]Builtin Automatic Encryption[/size]
 
-Full disclosure: The encryption Red Matrix 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 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.
 
 To explain this in more detail: 
 
@@ -11,6 +11,6 @@ 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 Red Matrix.
+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 gladly accept help improving the security of the system and auditing it as well.
diff --git a/doc/extra_features.bb b/doc/extra_features.bb
index be14fdb5b..3a2d77ec5 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 Red Matrix 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 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.

 

 [b]Content Expiration[/b]

 

diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb
index fed66a8dd..63c007bce 100644
--- a/doc/faq_admins.bb
+++ b/doc/faq_admins.bb
@@ -1,4 +1,4 @@
-[size=large][b]The Red Matrix FAQ[/b][/size]
+[size=large][b]The Hubzilla FAQ[/b][/size]
 
 [toc]
 
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 010ef9b8a..55d90621b 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -4,7 +4,7 @@
 
 
 [h3]What does $a mean?[/h3]
-$a is a class defined in boot.php and passed all around Red Matrix as a global reference variable. It defines everything necessary for the Red Matrix 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 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 ... 
 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 cdc7883f9..3cc4f7189 100644
--- a/doc/faq_members.bb
+++ b/doc/faq_members.bb
@@ -1,11 +1,11 @@
-[size=large][b]The Red Matrix FAQ[/b][/size]
+[size=large][b]The Hubzilla 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 Red Matrix 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 Red Matrix 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 Red Matrix 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 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.
 
 [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 3bb8ceda7..77b6ae1d0 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -142,7 +142,7 @@ Forums are typically channels which may be open to participation from multiple a
 

 [b]Account Cloning[/b]

 

-Accounts in the Red Matrix 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 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.  

 

 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]

 

@@ -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 Red Matrix 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 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.

 

- - 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 Red Matrix 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 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.  

 

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

 

@@ -183,7 +183,7 @@ Red supports a number of different ways of adding rich-text content. The default
 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 Red Matrix 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 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).

 

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

diff --git a/doc/history.md b/doc/history.md
index fbb4a4561..d190ac446 100644
--- a/doc/history.md
+++ b/doc/history.md
@@ -38,7 +38,7 @@ In July 2012, Mike left the Friendica project and began development of "zot" and
 
 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 "Red Matrix" 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 "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.  
 
 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.
 
diff --git a/doc/permissions.bb b/doc/permissions.bb
index b4facde39..6bc8e566b 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -1,6 +1,6 @@
 [b]Permissions[/b]

 

-Permissions in the Red Matrix 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 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.

 

 [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 Red Matrix 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 Hubzilla 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 7f1684117..ada29cf62 100644
--- a/doc/plugins.bb
+++ b/doc/plugins.bb
@@ -1,9 +1,9 @@
 [b]Plugins[/b]

 

-So you want to make the Red Matrix 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 Hubzilla 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 Red Matrix 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. 

 [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 Red Matrix plugin, Sets a random place when posting.

+	 * Description: Sample Hubzilla 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 Red Matrix 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 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.

 

-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 Red Matrix 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 Hubzilla 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 Red Matrix 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 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:

 

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

 

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

 

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

+The Hubzilla 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 Red Matrix. 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 Hubzilla. 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 a8a764cf1..750f5e6f0 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 Red Matrix.  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 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.

 

 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 1bf37b13b..208f84f75 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 Red Matrix 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 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.

 

 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 923537e1e..5e2b77755 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -1,4 +1,4 @@
-[b]How to install the Red Matrix on a Raspberry Pi[/b]

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

 

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

 

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

 

-Not all Red Matrix 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 Red Matrix sites are linked, it does not matter where your account resides.

+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.

 

 [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 Red Matrix 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 Hubzilla 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 Red Matrix[/zrl]

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

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

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

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

diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 836f174b4..374cf598d 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 Red Matrix, providing three core capabilities: Communications, Identity, and Access Control.

+Zot is the protocol that powers the Hubzilla, 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 Red Matrix. 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 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. 

 

 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 54af44161..8cc1c8764 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 Red Matrix 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 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. 
 
 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.