Bob Mottram преди 7 години
родител
ревизия
cff61c8d43
променени са 5 файла, в които са добавени 62 реда и са изтрити 38 реда
  1. 4
    0
      doc/EN/app_pleroma.org
  2. 4
    0
      doc/EN/socialinstance.org
  3. BIN
      img/tusky.jpg
  4. 24
    16
      website/EN/app_pleroma.html
  5. 30
    22
      website/EN/socialinstance.html

+ 4
- 0
doc/EN/app_pleroma.org Целия файл

@@ -51,6 +51,10 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
51 51
 
52 52
 * Mobile apps
53 53
 It's also possible to use Mastodon apps together with Pleroma, such as Tusky, since it supports the Mastodon API. You may need to install *IcecatMobile* and set it as your default browser (under *Settings/Apps/Menu*) in order for the initial oauth registration process to work.
54
+
55
+#+BEGIN_CENTER
56
+[[file:images/tusky.jpg]]
57
+#+END_CENTER
54 58
 * Blocking controls
55 59
 #+BEGIN_CENTER
56 60
 [[file:images/controlpanel/control_panel_blocking.jpg]]

+ 4
- 0
doc/EN/socialinstance.org Целия файл

@@ -87,3 +87,7 @@ Navigate to your domain and register a new user.
87 87
 #+END_CENTER
88 88
 
89 89
 More details about setting up and using Pleroma [[./app_pleroma.html][can be found here]].
90
+
91
+#+BEGIN_CENTER
92
+[[file:images/tusky.jpg]]
93
+#+END_CENTER

BIN
img/tusky.jpg Целия файл


+ 24
- 16
website/EN/app_pleroma.html Целия файл

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2018-03-12 Mon 21:53 -->
6
+<!-- 2018-03-13 Tue 12:58 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title>&lrm;</title>
@@ -274,9 +274,9 @@ Some general advice about life in the fediverse <a href="./fediverse.html">can b
274 274
 </div>
275 275
 </div>
276 276
 
277
-<div id="outline-container-orga1288c8" class="outline-2">
278
-<h2 id="orga1288c8">Installation</h2>
279
-<div class="outline-text-2" id="text-orga1288c8">
277
+<div id="outline-container-org0494ed4" class="outline-2">
278
+<h2 id="org0494ed4">Installation</h2>
279
+<div class="outline-text-2" id="text-org0494ed4">
280 280
 <p>
281 281
 Log into your system with:
282 282
 </p>
@@ -296,9 +296,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
296 296
 </div>
297 297
 </div>
298 298
 
299
-<div id="outline-container-org7a24a56" class="outline-2">
300
-<h2 id="org7a24a56">Initial setup</h2>
301
-<div class="outline-text-2" id="text-org7a24a56">
299
+<div id="outline-container-org264cd33" class="outline-2">
300
+<h2 id="org264cd33">Initial setup</h2>
301
+<div class="outline-text-2" id="text-org264cd33">
302 302
 <p>
303 303
 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.
304 304
 </p>
@@ -309,9 +309,9 @@ Once you have done that then you can disable further registrations from the <b>A
309 309
 </div>
310 310
 </div>
311 311
 
312
-<div id="outline-container-org611e679" class="outline-2">
313
-<h2 id="org611e679">Mastodon user interface</h2>
314
-<div class="outline-text-2" id="text-org611e679">
312
+<div id="outline-container-org3b7289f" class="outline-2">
313
+<h2 id="org3b7289f">Mastodon user interface</h2>
314
+<div class="outline-text-2" id="text-org3b7289f">
315 315
 <p>
316 316
 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.
317 317
 </p>
@@ -326,17 +326,25 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
326 326
 </div>
327 327
 </div>
328 328
 
329
-<div id="outline-container-org6bd57cf" class="outline-2">
330
-<h2 id="org6bd57cf">Mobile apps</h2>
331
-<div class="outline-text-2" id="text-org6bd57cf">
329
+<div id="outline-container-orgb42a82b" class="outline-2">
330
+<h2 id="orgb42a82b">Mobile apps</h2>
331
+<div class="outline-text-2" id="text-orgb42a82b">
332 332
 <p>
333 333
 It's also possible to use Mastodon apps together with Pleroma, such as Tusky, since it supports the Mastodon API. You may need to install <b>IcecatMobile</b> and set it as your default browser (under <b>Settings/Apps/Menu</b>) in order for the initial oauth registration process to work.
334 334
 </p>
335
+
336
+<div class="org-center">
337
+
338
+<div class="figure">
339
+<p><img src="images/tusky.jpg" alt="tusky.jpg" />
340
+</p>
341
+</div>
342
+</div>
335 343
 </div>
336 344
 </div>
337
-<div id="outline-container-org5784610" class="outline-2">
338
-<h2 id="org5784610">Blocking controls</h2>
339
-<div class="outline-text-2" id="text-org5784610">
345
+<div id="outline-container-orgf39f4e5" class="outline-2">
346
+<h2 id="orgf39f4e5">Blocking controls</h2>
347
+<div class="outline-text-2" id="text-orgf39f4e5">
340 348
 <div class="org-center">
341 349
 
342 350
 <div class="figure">

+ 30
- 22
website/EN/socialinstance.html Целия файл

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2018-03-13 Tue 12:53 -->
6
+<!-- 2018-03-13 Tue 12:58 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title>&lrm;</title>
@@ -264,9 +264,9 @@ A social instance image allows you to easily set up a fediverse server, which fe
264 264
 The installation process is the same as usual, with the only difference being that on initial setup it will go straight to the domain setup details for your instance. In summary:
265 265
 </p>
266 266
 
267
-<div id="outline-container-org74fc0f0" class="outline-2">
268
-<h2 id="org74fc0f0">Copy the image to the USB drive</h2>
269
-<div class="outline-text-2" id="text-org74fc0f0">
267
+<div id="outline-container-orga9aa61d" class="outline-2">
268
+<h2 id="orga9aa61d">Copy the image to the USB drive</h2>
269
+<div class="outline-text-2" id="text-orga9aa61d">
270 270
 <p>
271 271
 Substitute <b>sdX</b> with the device name for your USB drive.
272 272
 </p>
@@ -288,9 +288,9 @@ Also note that if the laptop has a removable SSD drive it's possible to copy the
288 288
 </div>
289 289
 </div>
290 290
 
291
-<div id="outline-container-orgf6f4dca" class="outline-2">
292
-<h2 id="orgf6f4dca">Connect the laptop to your internet router</h2>
293
-<div class="outline-text-2" id="text-orgf6f4dca">
291
+<div id="outline-container-org4454ad3" class="outline-2">
292
+<h2 id="org4454ad3">Connect the laptop to your internet router</h2>
293
+<div class="outline-text-2" id="text-org4454ad3">
294 294
 <p>
295 295
 Plug the USB drive into the laptop and connect it to your internet router with the ethernet cable.
296 296
 </p>
@@ -305,9 +305,9 @@ Plug the USB drive into the laptop and connect it to your internet router with t
305 305
 </div>
306 306
 </div>
307 307
 
308
-<div id="outline-container-orgf2de5c1" class="outline-2">
309
-<h2 id="orgf2de5c1">Boot the laptop from the USB drive</h2>
310
-<div class="outline-text-2" id="text-orgf2de5c1">
308
+<div id="outline-container-orgd646ced" class="outline-2">
309
+<h2 id="orgd646ced">Boot the laptop from the USB drive</h2>
310
+<div class="outline-text-2" id="text-orgd646ced">
311 311
 <p>
312 312
 You may need to alter the BIOS settings to get this to work reliably.
313 313
 </p>
@@ -322,9 +322,9 @@ You may need to alter the BIOS settings to get this to work reliably.
322 322
 </div>
323 323
 </div>
324 324
 
325
-<div id="outline-container-orgd5cf8ec" class="outline-2">
326
-<h2 id="orgd5cf8ec">Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop</h2>
327
-<div class="outline-text-2" id="text-orgd5cf8ec">
325
+<div id="outline-container-orgfc4d060" class="outline-2">
326
+<h2 id="orgfc4d060">Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop</h2>
327
+<div class="outline-text-2" id="text-orgfc4d060">
328 328
 <p>
329 329
 Log into your internet router using a non-Tor browser (usually it's on an address like 192.168.1.1 or 192.168.1.254). Often port forwarding settings are together with firewall settings.
330 330
 </p>
@@ -339,9 +339,9 @@ Log into your internet router using a non-Tor browser (usually it's on an addres
339 339
 </div>
340 340
 </div>
341 341
 
342
-<div id="outline-container-org44e104c" class="outline-2">
343
-<h2 id="org44e104c">From another machine ssh into the laptop</h2>
344
-<div class="outline-text-2" id="text-org44e104c">
342
+<div id="outline-container-org1de31c9" class="outline-2">
343
+<h2 id="org1de31c9">From another machine ssh into the laptop</h2>
344
+<div class="outline-text-2" id="text-org1de31c9">
345 345
 <div class="org-src-container">
346 346
 <pre class="src src-bash">ssh fbone@freedombone.local -p 2222
347 347
 </pre>
@@ -353,18 +353,18 @@ Or alternatively you can log in directly on the laptop. The initial username is
353 353
 </div>
354 354
 </div>
355 355
 
356
-<div id="outline-container-org1cb7916" class="outline-2">
357
-<h2 id="org1cb7916">Follow the setup procedure</h2>
358
-<div class="outline-text-2" id="text-org1cb7916">
356
+<div id="outline-container-org73f6c40" class="outline-2">
357
+<h2 id="org73f6c40">Follow the setup procedure</h2>
358
+<div class="outline-text-2" id="text-org73f6c40">
359 359
 <p>
360 360
 Enter your user details, domain name and dynamic DNS settings.
361 361
 </p>
362 362
 </div>
363 363
 </div>
364 364
 
365
-<div id="outline-container-org1618fd3" class="outline-2">
366
-<h2 id="org1618fd3">When installation is complete</h2>
367
-<div class="outline-text-2" id="text-org1618fd3">
365
+<div id="outline-container-org0c76d5c" class="outline-2">
366
+<h2 id="org0c76d5c">When installation is complete</h2>
367
+<div class="outline-text-2" id="text-org0c76d5c">
368 368
 <p>
369 369
 Navigate to your domain and register a new user.
370 370
 </p>
@@ -380,6 +380,14 @@ Navigate to your domain and register a new user.
380 380
 <p>
381 381
 More details about setting up and using Pleroma <a href="./app_pleroma.html">can be found here</a>.
382 382
 </p>
383
+
384
+<div class="org-center">
385
+
386
+<div class="figure">
387
+<p><img src="images/tusky.jpg" alt="tusky.jpg" />
388
+</p>
389
+</div>
390
+</div>
383 391
 </div>
384 392
 </div>
385 393
 </div>