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

1 files changed, 29 insertions, 29 deletions

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 "Acquaintances". 

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

 

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

 

-At this point, the Hubzilla [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" 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 "Matrix" 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 <<Private Communications Best Practices>> 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 "Websites", 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.