free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Mention Riot Web

Bob Mottram 7 years ago
parent
8bda053fd9
commit
1b341b87e1
2 changed files with 14 additions and 14 deletions
Split View Show Diff Stats
  1. 2
    2
      doc/EN/app_matrix.org
  2. 12
    12
      website/EN/app_matrix.html

+ 2
- 2
doc/EN/app_matrix.org View File 

@@ -36,9 +36,9 @@ Select *Add/Remove Apps* then *matrix*. You will then be asked for a domain name
36 36 
 * Initial setup
37 37 
 Go to the *Administrator control panel* and select *Passwords* then *matrix*. This will give you the password to initially log in to the system and you can change it later from a client app if needed.
38 38
39 
-Install the *Riot* app from F-droid on a mobile device. You can then log in with your username and password, making sure to select a custom server and then entering your Matrix domain name for both the main server and identity server.
39 
+Install the *Riot* app from *F-droid* on a mobile device. You can then log in with your username and password, making sure to select a custom server and then entering your Matrix domain name for both the main server and identity server.
40 40
41 
-Other client apps are available but are currently mostly only at the alpha stage. For details see the main [[https://matrix.org][matrix.org site]].
41 
+Other client apps are available but are currently mostly only at the alpha stage. A popular one seems to be [[https://riot.im][Riot Web]]. For details see the main [[https://matrix.org][matrix.org site]].
42 42
43 43 
 * DNS setup
44 44 
 It's recommended that you add an SRV record for Matrix to your DNS setup. How you do this will depend upon your dynamic DNS provider and their web interface. On FreeDNS on the subdomains settings in addition to the subdomain which you are using for the matrix server create an extra entry as follows:

+ 12
- 12
website/EN/app_matrix.html View File 

@@ -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 
-<!-- 2017-05-06 Sat 14:38 -->
6 
+<!-- 2017-05-06 Sat 14:43 -->
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></title>
 
@@ -260,9 +260,9 @@ for the JavaScript code in this tag.
260 260 
 Matrix is a federated communications system, typically for multi-user chat, with end-to-end content security features. You can consider it to be like a modernized version of IRC chat where the crypto and access controls have been built in by default. At present Matrix is really only a creature of the clearnet and so there isn't any way to protect the metadata. Despite the talk of security the lack of metadata defenses make this really only suitable for public communications, similar to microblogging or public IRC channels.
261 261 
 </p>
262 262
263 
-<div id="outline-container-org46fb6b7" class="outline-2">
264 
-<h2 id="org46fb6b7">Installation</h2>
265 
-<div class="outline-text-2" id="text-org46fb6b7">
263 
+<div id="outline-container-orgd1a358f" class="outline-2">
264 
+<h2 id="orgd1a358f">Installation</h2>
265 
+<div class="outline-text-2" id="text-orgd1a358f">
266 266 
 <p>
267 267 
 Log into your system with:
268 268 
 </p>
 
@@ -282,26 +282,26 @@ Select <b>Add/Remove Apps</b> then <b>matrix</b>. You will then be asked for a d
282 282 
 </div>
283 283 
 </div>
284 284
285 
-<div id="outline-container-org290b604" class="outline-2">
286 
-<h2 id="org290b604">Initial setup</h2>
287 
-<div class="outline-text-2" id="text-org290b604">
285 
+<div id="outline-container-org912b25e" class="outline-2">
286 
+<h2 id="org912b25e">Initial setup</h2>
287 
+<div class="outline-text-2" id="text-org912b25e">
288 288 
 <p>
289 289 
 Go to the <b>Administrator control panel</b> and select <b>Passwords</b> then <b>matrix</b>. This will give you the password to initially log in to the system and you can change it later from a client app if needed.
290 290 
 </p>
291 291
292 292 
 <p>
293 
-Install the <b>Riot</b> app from F-droid on a mobile device. You can then log in with your username and password, making sure to select a custom server and then entering your Matrix domain name for both the main server and identity server.
293 
+Install the <b>Riot</b> app from <b>F-droid</b> on a mobile device. You can then log in with your username and password, making sure to select a custom server and then entering your Matrix domain name for both the main server and identity server.
294 294 
 </p>
295 295
296 296 
 <p>
297 
-Other client apps are available but are currently mostly only at the alpha stage. For details see the main <a href="https://matrix.org">matrix.org site</a>.
297 
+Other client apps are available but are currently mostly only at the alpha stage. A popular one seems to be <a href="https://riot.im">Riot Web</a>. For details see the main <a href="https://matrix.org">matrix.org site</a>.
298 298 
 </p>
299 299 
 </div>
300 300 
 </div>
301 301
302 
-<div id="outline-container-orgba35485" class="outline-2">
303 
-<h2 id="orgba35485">DNS setup</h2>
304 
-<div class="outline-text-2" id="text-orgba35485">
302 
+<div id="outline-container-org15b7466" class="outline-2">
303 
+<h2 id="org15b7466">DNS setup</h2>
304 
+<div class="outline-text-2" id="text-org15b7466">
305 305 
 <p>
306 306 
 It's recommended that you add an SRV record for Matrix to your DNS setup. How you do this will depend upon your dynamic DNS provider and their web interface. On FreeDNS on the subdomains settings in addition to the subdomain which you are using for the matrix server create an extra entry as follows:
307 307 
 </p>