Merge branch '2.0RC'

6 files changed, 133 insertions, 3 deletions

diff --git a/doc/context/en/profiles/help.html b/doc/context/en/profiles/help.html
new file mode 100644
index 000000000..41f00fe64
--- /dev/null
+++ b/doc/context/en/profiles/help.html
@@ -0,0 +1,35 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+        <dd>
+            Once you have registered an <i>account</i> at the matrix you have also created a <i>profile</i> and a <i>channel</i>. 
+        </dd>
+    <dt>Account</dt>
+        <dd>
+            You have <i>one</i> account. This consists of your email account and your password. With your account you access your 
+            profile and your channel.<i>Think of your account as the way you authenticate at one Hubzilla site. It lets you 
+            do things, such as creating profiles and channels with which you can connect to other people.</i>
+        </dd>
+    <dt>Profile</dt>
+        <dd>
+            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. 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>
+        </dd>
+    <dt>Channel</dt>
+        <dd>
+            During the registration you created your first <i>channel</i>. Yes, besides several profiles you are able to have 
+            several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have 
+            created one channel. You can use this one for the public, to communicate with people about every day life. But 
+            perhaps you are an avid book reader and many people are bored by that. So  you open a <i>second channel</i> just 
+            for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of 
+            posts, with a new profile (... or new profile<i>s</i> ...) and completely different contacts. Some connections 
+            might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just 
+            switch between both of them just like you would in real life switch when talking to people you meet on the street 
+            or people you meet specially to talk about books. You can even connect to yourself, or better: to your other 
+            channel. :)<i>Think of a channel as different spaces dedicated to different topics where you meet with different 
+            people.</i>
+        </dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/settings/account/help.html b/doc/context/en/settings/account/help.html
new file mode 100644
index 000000000..41f00fe64
--- /dev/null
+++ b/doc/context/en/settings/account/help.html
@@ -0,0 +1,35 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+        <dd>
+            Once you have registered an <i>account</i> at the matrix you have also created a <i>profile</i> and a <i>channel</i>. 
+        </dd>
+    <dt>Account</dt>
+        <dd>
+            You have <i>one</i> account. This consists of your email account and your password. With your account you access your 
+            profile and your channel.<i>Think of your account as the way you authenticate at one Hubzilla site. It lets you 
+            do things, such as creating profiles and channels with which you can connect to other people.</i>
+        </dd>
+    <dt>Profile</dt>
+        <dd>
+            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. 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>
+        </dd>
+    <dt>Channel</dt>
+        <dd>
+            During the registration you created your first <i>channel</i>. Yes, besides several profiles you are able to have 
+            several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have 
+            created one channel. You can use this one for the public, to communicate with people about every day life. But 
+            perhaps you are an avid book reader and many people are bored by that. So  you open a <i>second channel</i> just 
+            for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of 
+            posts, with a new profile (... or new profile<i>s</i> ...) and completely different contacts. Some connections 
+            might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just 
+            switch between both of them just like you would in real life switch when talking to people you meet on the street 
+            or people you meet specially to talk about books. You can even connect to yourself, or better: to your other 
+            channel. :)<i>Think of a channel as different spaces dedicated to different topics where you meet with different 
+            people.</i>
+        </dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/settings/channel/help.html b/doc/context/en/settings/channel/help.html
new file mode 100644
index 000000000..41f00fe64
--- /dev/null
+++ b/doc/context/en/settings/channel/help.html
@@ -0,0 +1,35 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+        <dd>
+            Once you have registered an <i>account</i> at the matrix you have also created a <i>profile</i> and a <i>channel</i>. 
+        </dd>
+    <dt>Account</dt>
+        <dd>
+            You have <i>one</i> account. This consists of your email account and your password. With your account you access your 
+            profile and your channel.<i>Think of your account as the way you authenticate at one Hubzilla site. It lets you 
+            do things, such as creating profiles and channels with which you can connect to other people.</i>
+        </dd>
+    <dt>Profile</dt>
+        <dd>
+            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. 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>
+        </dd>
+    <dt>Channel</dt>
+        <dd>
+            During the registration you created your first <i>channel</i>. Yes, besides several profiles you are able to have 
+            several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have 
+            created one channel. You can use this one for the public, to communicate with people about every day life. But 
+            perhaps you are an avid book reader and many people are bored by that. So  you open a <i>second channel</i> just 
+            for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of 
+            posts, with a new profile (... or new profile<i>s</i> ...) and completely different contacts. Some connections 
+            might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just 
+            switch between both of them just like you would in real life switch when talking to people you meet on the street 
+            or people you meet specially to talk about books. You can even connect to yourself, or better: to your other 
+            channel. :)<i>Think of a channel as different spaces dedicated to different topics where you meet with different 
+            people.</i>
+        </dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/settings/tokens/help.html b/doc/context/en/settings/tokens/help.html
new file mode 100644
index 000000000..d37a0fd2b
--- /dev/null
+++ b/doc/context/en/settings/tokens/help.html
@@ -0,0 +1,23 @@
+<dl class="dl-horizontal">
+    <dt>Guest Access Tokens</dt>
+    <dd>
+        In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.).
+    </dd>
+    <dt>Create a token</dt>
+        <dd>
+            The form to create/edit accepts three parameters, a human readable name, a password or access token, and an 
+            optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be 
+            automatically purged from the list of temporary accounts. The password field in the create/edit forms 
+            displays the text of the access token and not an obscured password.
+        </dd>
+    <dt>Share a token</dt>
+        <dd>
+            We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided.
+
+            <b>Example</b>: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied.
+
+            The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album.
+
+            Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented.
+        </dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/webpages/help.html b/doc/context/en/webpages/help.html
index af57ee88a..a4817e4bf 100644
--- a/doc/context/en/webpages/help.html
+++ b/doc/context/en/webpages/help.html
@@ -3,6 +3,6 @@
   <dd>You can create modular, identity-aware websites composed of shareable elements. </dd>
   <dt>Pages</dt>
   <dd>This page lists your "pages", which are assigned URLs where people can visit your site. The structure of pages are typically described by an associated <b>layout</b>, and their content is constructed from a collection of <b>blocks</b>.</dd>
-  <dt><a href='#' onclick='contextualHelpFocus("#website-import-tools", 1); return false;' title="Click to highlight element...">Website import tool</a></dt>
-  <dd>The website import tool allows you import multiple webpage elements (pages, layouts, blocks) either from an uploaded zip file or from an existing cloud files folder. <a target="_blank" href="help/webpages">Read more...</a></dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#website-portation-tools", 1); return false;' title="Click to highlight element...">Website portation tools</a></dt>
+  <dd>The website portation tools allows you import/export multiple webpage elements (pages, layouts, blocks). You can <b>import</b> either from an uploaded zip file or from an existing cloud files folder. You can <b>export</b> to either a zip file containing a select group of webpage elements in a form compatible with the import tool, or you can export directly to a cloud files folder. <a target="_blank" href="help/webpages">Read more...</a></dd>
 </dl>
\ No newline at end of file
diff --git a/doc/context/en/wiki/help.html b/doc/context/en/wiki/help.html
index 314a9d60b..5ac9b22ae 100644
--- a/doc/context/en/wiki/help.html
+++ b/doc/context/en/wiki/help.html
@@ -1,10 +1,12 @@
 <dl class="dl-horizontal">
   <dt>General</dt>
   <dd>Each wiki is a collection of pages, composed as Markdown-formatted text files.</dd>
-  <dt><a href='#' onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Click to highlight element...">Wiki List</a></dt>
+  <dt><a href='#' onclick='contextualHelpFocus("#wikis-index", 1); return false;' title="Click to highlight element...">Wiki List</a></dt>
   <dd>Wikis owned by the channel <i>that you have permission to view</i> are listed in the side panel.</dd>
   <dt><a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element...">Page History</a></dt>
   <dd>Every revision of a page is saved to allow quick reversion. Click the <b>History</b> tab to view a history of page revisions, including the date and author of each. The revert button will load the selected revision but will not automatically save the page.</dd>
   <dt><a href='#' onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Click to highlight element...">Pages</a></dt>
   <dd>The list of pages in the wiki are listed in the <b>Wiki Pages</b> panel. Prior to saving page edits using the <b>Page</b> control dropdown menu, you may <a href='#' onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Click to highlight element...">enter a custom message</a> to be displayed in the <a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element..."><b>Page History</b></a> viewer along with the revision.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' title="Click to highlight element...">Channel Content Tabs</a></dt>
+  <dd>The channel content tabs are links to other content published by the channel. The <b>About</b> tab links to the channel profile. The <b>Photos</b> tab links to the channel photo galleries. The <b>Files</b> tab links to the general shared files published by the channel.</dd>
 </dl>
\ No newline at end of file