Link to fediverse doc

59746d37 · Bob Mottram · 36d39c34 · 59746d37 · 59746d37
Commit 59746d37 authored 7 years ago by Bob Mottram
--- a/doc/EN/app_pleroma.org
+++ b/doc/EN/app_pleroma.org
@@ -16,6 +16,8 @@

 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.

+Some general advice about life in the fediverse [[./fediverse.html][can be found here]].
+
 #+BEGIN_CENTER
 [[file:images/pleroma.jpg]]
 #+END_CENTER

--- a/website/EN/app_pleroma.html
+++ b/website/EN/app_pleroma.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-11-12 Sun 18:45 -->
+<!-- 2018-02-21 Wed 14:59 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -256,6 +256,10 @@ for the JavaScript code in this tag.
 Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 </p>

+<p>
+Some general advice about life in the fediverse <a href="./fediverse.html">can be found here</a>.
+</p>
+
 <div class="org-center">

 <div class="figure">
@@ -264,9 +268,9 @@ Pleroma is an OStatus-compatible social networking server, compatible with GNU S
 </div>
 </div>

-<div id="outline-container-org39de7d0" class="outline-2">
-<h2 id="org39de7d0">Installation</h2>
-<div class="outline-text-2" id="text-org39de7d0">
+<div id="outline-container-org06e6248" class="outline-2">
+<h2 id="org06e6248">Installation</h2>
+<div class="outline-text-2" id="text-org06e6248">
 <p>
 Log into your system with:
 </p>
@@ -286,9 +290,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
 </div>
 </div>

-<div id="outline-container-org35d8b0a" class="outline-2">
-<h2 id="org35d8b0a">Initial setup</h2>
-<div class="outline-text-2" id="text-org35d8b0a">
+<div id="outline-container-orgcf8ad56" class="outline-2">
+<h2 id="orgcf8ad56">Initial setup</h2>
+<div class="outline-text-2" id="text-orgcf8ad56">
 <p>
 The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
 </p>
@@ -299,9 +303,9 @@ Once you have done that then you can disable further registrations from the <b>A
 </div>
 </div>

-<div id="outline-container-org31f6ea0" class="outline-2">
-<h2 id="org31f6ea0">Mastodon user interface</h2>
-<div class="outline-text-2" id="text-org31f6ea0">
+<div id="outline-container-org293d783" class="outline-2">
+<h2 id="org293d783">Mastodon user interface</h2>
+<div class="outline-text-2" id="text-org293d783">
 <p>
 If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
 </p>