aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2015-12-16 17:00:05 +0100
committerzottel <github@zottel.net>2015-12-16 17:00:05 +0100
commit63256bc9b29e011951f493d887aac5d2979262b7 (patch)
treeba2668ae27f432f69c848e7625d2a5adf24fd446 /doc
parent87519e107a530af2cda579b96141aaf6565622cc (diff)
downloadvolse-hubzilla-63256bc9b29e011951f493d887aac5d2979262b7.tar.gz
volse-hubzilla-63256bc9b29e011951f493d887aac5d2979262b7.tar.bz2
volse-hubzilla-63256bc9b29e011951f493d887aac5d2979262b7.zip
small fixes in English help files
Diffstat (limited to 'doc')
-rw-r--r--doc/about.bb2
-rw-r--r--doc/channels.bb2
-rw-r--r--doc/features.bb6
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/about.bb b/doc/about.bb
index 1d1a2d099..1ec1cf28e 100644
--- a/doc/about.bb
+++ b/doc/about.bb
@@ -4,7 +4,7 @@ $Projectname is a decentralized communication network, which aims to provide com
$Projectname is free and open source. It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers. It can be used to support communication between a few individuals, or scale to many thousands and more.
-Red aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers.
+$Projectname aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers.
How you use it depends on how you want to use it.
diff --git a/doc/channels.bb b/doc/channels.bb
index ff0446541..4b47b61dc 100644
--- a/doc/channels.bb
+++ b/doc/channels.bb
@@ -22,7 +22,7 @@ Once you have created your channel, you will be taken to the settings page, wher
Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0]example.com/channel/username[/observer] you will find your channel &quot;stream&quot;. This is where your recent activity will appear, in reverse chronological order. If you post in the box marked &quot;share&quot;, the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The &quot;About&quot; tab contains your &quot;profile&quot;, the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.
-The &quot;Matrix&quot; page contains all recent posts from across the matrix, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
+The &quot;Grid&quot; page contains all recent posts from across the $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for &quot;Can write to my &quot;public&quot; file storage&quot; than a personal account. For more information, see the permissions section.
diff --git a/doc/features.bb b/doc/features.bb
index 2abf0ec30..2d9849d4e 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -146,7 +146,7 @@ Forums are typically channels which may be open to participation from multiple a
Accounts in $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$Projectname identity called [b]tina@redhub.com[/b]. You can clone it to another$Projectname hub by choosing the same, or a different name: [b]liveForever@Some$ProjectnameHub.info[/b]
+By contrast, say you've created a $Projectname identity called [b]tina@$Projectnamehub.com[/b]. You can clone it to another $Projectname 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.
@@ -158,7 +158,7 @@ This is a rather revolutionary feature, if we consider some scenarios:
- 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, $Projectname offers [b]censorship resistance[/b]. You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.
-Red offers interesting new possibilities for privacy. You can read more at the &lt;&lt;Private Communications Best Practices&gt;&gt; page.
+$Projectname offers interesting new possibilities for privacy. You can read more at the &lt;&lt;Private Communications Best Practices&gt;&gt; page.
Some caveats apply. For a full explanation of identity cloning, read the &lt;HOW TO CLONE MY IDENTITY&gt;.
@@ -180,7 +180,7 @@ 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 $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.
+$Projectname supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in $Projectname. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for $Projectname had some serious issues and has since been removed. We are currently looking for a replacement.
When creating &quot;Websites&quot;, content may be entered in HTML, Markdown, BBcode, and/or plain text.