diff --git a/doc/EN/mesh_capabilities.org b/doc/EN/mesh_capabilities.org index fdcf609c220725bdfc22d8dce7dc6a586d31411b..3525b6ba591df7375816d03f7c681c86f3054d7b 100644 --- a/doc/EN/mesh_capabilities.org +++ b/doc/EN/mesh_capabilities.org @@ -19,7 +19,6 @@ The mesh system has the following capabilities: - Private and public sharing of files - Blogging - Collaborative editing of documents and presentations - - Social network stream. Follow/unfollow other peers - No network administration required - No servers - Internet connection is optional diff --git a/doc/EN/mesh_usage.org b/doc/EN/mesh_usage.org index 4c1a29a0a896c4220f7c66c215d1a4dc33cf24e8..63a0e7fb396e442fa27913ddbcfea299cadda4af 100644 --- a/doc/EN/mesh_usage.org +++ b/doc/EN/mesh_usage.org @@ -139,22 +139,6 @@ To create a document click on the CryptPad icon. Depending upon the specificatio If you have the chat system running you can then copy and paste the URL for your pad into the chat, and the other user can then open the link and edit the document with you. You can repeat that for however many other users you wish to be able to edit. -* Social Network - -Patchwork is available as a social networking system for the mesh. Like all social network systems it has a stream of posts and you can follow or unfollow other users. You can also send private messages to other users with end-to-end encryption. - -Double click on the "Social" icon to open the app, then add your nickname and optionally a description. If you want to choose an avatar image some can be found within the directory */usr/share/freedombone/avatars*. On older systems or systems without a hardware random number generator, Patchwork sometimes takes a long time (a few minutes) to open for the first time after clicking the icon. This is most likely due to the initial generation of encryption keys, so be patient. - -#+attr_html: :width 80% :align center -[[file:images/patchwork_setup.jpg]] - -Other Patchwork users on the mesh will appear automatically under the *local* list and you can select and follow them if you wish. It's also possible to select the dark theme from *settings* on the drop down menu if you prefer. - -#+attr_html: :width 80% :align center -[[file:images/patchwork_public.jpg]] - -The Secure Scuttlebutt protocol which Patchwork is based upon is intended to be robust to intermittent network connectivity, so you can write posts when out of range and they will sync once you are back in the network. - * Sharing Files You can make files publicly available on the network simply by dragging and dropping them into the /Public/ folder on the desktop. To view the files belonging to another user select the desktop icon called /Visit a site/ and enter the username or Tox ID of the other user. diff --git a/website/EN/mesh_capabilities.html b/website/EN/mesh_capabilities.html index 36f01bd0f0f39f3707edb7bd566aca44a73d6dfb..caa04a52b89d4cab090c49d54309aa79a1836ab4 100644 --- a/website/EN/mesh_capabilities.html +++ b/website/EN/mesh_capabilities.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>Freedombone</title> -<!-- 2018-06-24 Sun 23:02 --> +<!-- 2018-09-26 Wed 09:23 --> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="generator" content="Org-mode" /> <meta name="author" content="Bob Mottram" /> @@ -171,8 +171,6 @@ The mesh system has the following capabilities: </li> <li>Collaborative editing of documents and presentations </li> -<li>Social network stream. Follow/unfollow other peers -</li> <li>No network administration required </li> <li>No servers diff --git a/website/EN/mesh_usage.html b/website/EN/mesh_usage.html index a253b4520b315f0f98d702732549ea3798aae2fd..0fba2b09e8f159b0bf617beb02b0a8ad0a7b73c7 100644 --- a/website/EN/mesh_usage.html +++ b/website/EN/mesh_usage.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>Freedombone</title> -<!-- 2018-06-24 Sun 23:03 --> +<!-- 2018-09-26 Wed 09:23 --> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="generator" content="Org-mode" /> <meta name="author" content="Bob Mottram" /> @@ -171,11 +171,11 @@ for the JavaScript code in this tag. </li> <li><a href="#sec-9">Collaborative document editing</a> </li> -<li><a href="#sec-10">Social Network</a> +<li><i>Social Network</i> </li> -<li><a href="#sec-11">Sharing Files</a> +<li><a href="#sec-10">Sharing Files</a> </li> -<li><a href="#sec-12">Blogging</a> +<li><a href="#sec-11">Blogging</a> </li> </ul> @@ -432,42 +432,9 @@ If you have the chat system running you can then copy and paste the URL for your </div> <div id="outline-container-sec-10" class="outline-2"> -<h2 id="sec-10">Social Network</h2> +<h2 id="sec-10">Sharing Files</h2> <div class="outline-text-2" id="text-10"> <p> -Patchwork is available as a social networking system for the mesh. Like all social network systems it has a stream of posts and you can follow or unfollow other users. You can also send private messages to other users with end-to-end encryption. -</p> - -<p> -Double click on the "Social" icon to open the app, then add your nickname and optionally a description. If you want to choose an avatar image some can be found within the directory <b>/usr/share/freedombone/avatars</b>. On older systems or systems without a hardware random number generator, Patchwork sometimes takes a long time (a few minutes) to open for the first time after clicking the icon. This is most likely due to the initial generation of encryption keys, so be patient. -</p> - - -<div class="figure"> -<p><img src="images/patchwork_setup.jpg" alt="patchwork_setup.jpg" width="80%" align="center" /> -</p> -</div> - -<p> -Other Patchwork users on the mesh will appear automatically under the <b>local</b> list and you can select and follow them if you wish. It's also possible to select the dark theme from <b>settings</b> on the drop down menu if you prefer. -</p> - - -<div class="figure"> -<p><img src="images/patchwork_public.jpg" alt="patchwork_public.jpg" width="80%" align="center" /> -</p> -</div> - -<p> -The Secure Scuttlebutt protocol which Patchwork is based upon is intended to be robust to intermittent network connectivity, so you can write posts when out of range and they will sync once you are back in the network. -</p> -</div> -</div> - -<div id="outline-container-sec-11" class="outline-2"> -<h2 id="sec-11">Sharing Files</h2> -<div class="outline-text-2" id="text-11"> -<p> You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user. </p> @@ -479,9 +446,9 @@ You can make files publicly available on the network simply by dragging and drop </div> </div> -<div id="outline-container-sec-12" class="outline-2"> -<h2 id="sec-12">Blogging</h2> -<div class="outline-text-2" id="text-12"> +<div id="outline-container-sec-11" class="outline-2"> +<h2 id="sec-11">Blogging</h2> +<div class="outline-text-2" id="text-11"> <p> To create a blog post select the <i>Blog</i> icon on the desktop and then select <b>New blog entry</b> and <b>Ok</b>. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the <b>CreateBlog/content/images</b> directory and then link to them as shown. </p>