summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--pragmatics.html2
-rw-r--r--pragmatics.md2
-rw-r--r--pragmatics.txt2
-rw-r--r--pragmatics.xml2
5 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 3219102..5fa652a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
+update: pragmatics.txt
+	git add .
+	git commit
+	git push
+
 pragmatics.txt: pragmatics.xml
 	xml2rfc --text --html pragmatics.xml
 
 pragmatics.xml: pragmatics.md
 	mmark pragmatics.md > pragmatics.xml
 
-update:
-	git add .
-	git commit
-	git push
diff --git a/pragmatics.html b/pragmatics.html
index 321a8b7..92492d8 100644
--- a/pragmatics.html
+++ b/pragmatics.html
@@ -1269,7 +1269,7 @@ li > p:last-of-type {
 <p id="section-1-5">There are numerous free replacements to proprietary services such as Discord, such as Internet Relay Chat, the Extensible Messaging and Presense Protocol, the Matrix protocol, and email.  As Free Software activists, we generally prefer these protocols over nonfree services.  This section explains the reasons to consider nonfree services and protocols.<a href="#section-1-5" class="pilcrow">¶</a></p>
 <p id="section-1-6">Generally, users on IRC and XMPP have a fair understanding of the Free Software Movement, and it is quick and easy to inform them what we mean by "free", "the four freedoms", and similar ideas.  For users on the Libera Chat IRC network, which by far has the most users of any network, it is exceptionally easy to introduce a user into the #fsf channel for discussions with people supporting Free Software.  Introducing ignorant users on these protocols and platforms are a day-to-day simple task.<a href="#section-1-6" class="pilcrow">¶</a></p>
 <p id="section-1-7">Furthermore, the amount of users we can reach on these protocols are rather limiting.  Libera has around forty thousand users according to the <code>USERS</code> command, and considering the fact that around 90% of these people aren't ignorant, there isn't much we can do.<a href="#section-1-7" class="pilcrow">¶</a></p>
-<p id="section-1-8">Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish isea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.<a href="#section-1-8" class="pilcrow">¶</a></p>
+<p id="section-1-8">Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish idea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.<a href="#section-1-8" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="the-plan">
diff --git a/pragmatics.md b/pragmatics.md
index c9b9ad7..e9c115d 100644
--- a/pragmatics.md
+++ b/pragmatics.md
@@ -52,7 +52,7 @@ Generally, users on IRC and XMPP have a fair understanding of the Free Software
 
 Furthermore, the amount of users we can reach on these protocols are rather limiting.  Libera has around forty thousand users according to the `USERS` command, and considering the fact that around 90% of these people aren't ignorant, there isn't much we can do.
 
-Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish isea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.
+Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish idea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.
 
 # The Plan
 
diff --git a/pragmatics.txt b/pragmatics.txt
index 00ee04c..1a6cca0 100644
--- a/pragmatics.txt
+++ b/pragmatics.txt
@@ -99,7 +99,7 @@ Yu                            Informational                     [Page 1]
    specifies that third-party platform identities, such as email and
    GitHub, are how users should be referenced both internally by servers
    and shown to other users.  This is obviously an increadibly foolish
-   isea, especially considering the use of centralized identity servers
+   idea, especially considering the use of centralized identity servers
    (similar to X509 certificate authorities) for 3PIDs.  These are our
    first targets, but these should also be easy to get the idea across.
 
diff --git a/pragmatics.xml b/pragmatics.xml
index effda7a..d10da9e 100644
--- a/pragmatics.xml
+++ b/pragmatics.xml
@@ -33,7 +33,7 @@
 <t>There are numerous free replacements to proprietary services such as Discord, such as Internet Relay Chat, the Extensible Messaging and Presense Protocol, the Matrix protocol, and email.  As Free Software activists, we generally prefer these protocols over nonfree services.  This section explains the reasons to consider nonfree services and protocols.</t>
 <t>Generally, users on IRC and XMPP have a fair understanding of the Free Software Movement, and it is quick and easy to inform them what we mean by &quot;free&quot;, &quot;the four freedoms&quot;, and similar ideas.  For users on the Libera Chat IRC network, which by far has the most users of any network, it is exceptionally easy to introduce a user into the #fsf channel for discussions with people supporting Free Software.  Introducing ignorant users on these protocols and platforms are a day-to-day simple task.</t>
 <t>Furthermore, the amount of users we can reach on these protocols are rather limiting.  Libera has around forty thousand users according to the <tt>USERS</tt> command, and considering the fact that around 90% of these people aren't ignorant, there isn't much we can do.</t>
-<t>Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish isea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.</t>
+<t>Matrix users, in particular users of the matrix.org homeserver, typically know but don't completely understand Free Software.  Rather than using Matrix IDs to identify users, the Matrix specification specifies that third-party platform identities, such as email and GitHub, are how users should be referenced both internally by servers and shown to other users.  This is obviously an increadibly foolish idea, especially considering the use of centralized identity servers (similar to X509 certificate authorities) for 3PIDs.  These are our first targets, but these should also be easy to get the idea across.</t>
 </section>
 
 <section anchor="the-plan"><name>The Plan</name>
> ^
16fbdedc ^
b4482b9f ^
216493ef ^

b4482b9f ^
216493ef ^

b4482b9f ^
216493ef ^
5bccee93 ^
abc2f0de ^
97d96746 ^

cce01f1d ^
5bccee93 ^
f91b21a1 ^
2bda22c3 ^
a00095c8 ^
2bda22c3 ^

30b5f112 ^
b21edfaa ^
57dc5f14 ^
f0f3a739 ^
35239ee3 ^

fb7001cf ^
72c1c496 ^
bab75cae ^
0aa758cb ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141