Merge remote-tracking branch 'upstream/dev' into wiki

1 files changed, 17 insertions, 8 deletions

diff --git a/doc/channels.bb b/doc/channels.bb
index 4b47b61dc..14d588266 100644
--- a/doc/channels.bb
+++ b/doc/channels.bb
@@ -1,19 +1,23 @@
-[b]Channels[/b]

+[h2]Channels[/h2]

+

+[h3]What are channels?[/h3]

 

 Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be "Me".

 

 The most important features for a channel that represents "me" are:

+[ul]

+[*]Secure and private "spam free" communications

 

-Secure and private "spam free" communications

-

-Identity and "single-signon" across the entire network

+[*]Identity and "single-signon" across the entire network

 

-Privacy controls and permissions which extend to the entire network

-

-Directory services (like a phone book)

+[*]Privacy controls and permissions which extend to the entire network

 

+[*]Directory services (like a phone book)

+[/ul]

 In short, a channel that represents yourself is "me, on the internet".

 

+[h3]Creating channels[/h3]

+

 You will be required to create your first channel as part of the sign up process. You can also create additonal channels from the "Select channel" link.

 

 You will be asked to provide a channel name, and a short nick name. For a channel that represents yourself, it is a good idea to use your real name here to ensure your friends can find you, and connect to your channel. The short nickname will be used to generate a "webbie". This is a bit like a username, and will look like an email address, taking the form nickname@domain. You should put a little thought into what you want to use here. Imagine somebody asking for your webbie and having to tell them it is "llamas-are_kewl.123". "llamasarecool" would be a much better choice.

@@ -22,9 +26,14 @@ 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 "stream". This is where your recent activity will appear, in reverse chronological order. If you post in the box marked "share", 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 "About" tab contains your "profile", the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.

 

+[h3]The grid, permissions and delegation[/h3]

+

 The "Grid" 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 "Can write to my "public" file storage" than a personal account. For more information, see the permissions section.

+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 "Can write to my "public" file storage" than a personal account. For more information, see the [zrl=[baseurl]/help/roles]permissions section[/zrl].

+

+You can also delegate control of your channels' posts and connections, but not its configurations, to another channel. That is done by editing a connection and assigning it the permission to administer your channel's resources.

 

 #include doc/macros/main_footer.bb;

 

+