wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Consistently spell homeserver as homeserver

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-12-02 19:23:33 +00:00
parent 138c8f88be
commit 2f3a00fe34
39 changed files with 235 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

16
supporting-docs/howtos/client-server.rst
View file

@ -11,11 +11,11 @@ How to use the client-server API
The git version of this document is ``{{git_version}}``
This guide focuses on how the client-server APIs *provided by the reference
home server* can be used. Since this is specific to a home server
homeserver* can be used. Since this is specific to a homeserver
implementation, there may be variations in relation to registering/logging in
which are not covered in extensive detail in this guide.
If you haven't already, get a home server up and running on
If you haven't already, get a homeserver up and running on
``http://localhost:8008``.
@ -48,8 +48,8 @@ if you forget the ``access_token``.
Implementation note: The matrix specification does not enforce how users
register with a server. It just specifies the URL path and absolute minimum
keys. The reference home server uses a username/password to authenticate user,
but other home servers may use different methods. This is why you need to
keys. The reference homeserver uses a username/password to authenticate user,
but other homeservers may use different methods. This is why you need to
specify the ``type`` of method.
Login
@ -74,13 +74,13 @@ The aim when logging in is to get an access token for your existing user ID::
"user_id": "@example:localhost"
}
Implementation note: Different home servers may implement different methods for
Implementation note: Different homeservers may implement different methods for
logging in to an existing account. In order to check that you know how to login
to this home server, you must perform a ``GET`` first and make sure you
to this homeserver, you must perform a ``GET`` first and make sure you
recognise the login type. If you do not know how to login, you can
``GET /login/fallback`` which will return a basic webpage which you can use to
login. The reference home server implementation support username/password login,
but other home servers may support different login methods (e.g. OAuth2).
login. The reference homeserver implementation support username/password login,
but other homeservers may support different login methods (e.g. OAuth2).
Communicating

2
supporting-docs/howtos/jsfiddles/create_room_send_msg/demo.html
View file

@ -1,5 +1,5 @@
<div>
<p>This room creation / message sending demo requires a home server to be running on http://localhost:8008</p>
<p>This room creation / message sending demo requires a homeserver to be running on http://localhost:8008</p>
</div>
<form class="loginForm">
<input type="text" id="userLogin" placeholder="Username"></input>

2
supporting-docs/howtos/jsfiddles/create_room_send_msg/demo.js
View file

@ -19,7 +19,7 @@ $('.login').live('click', function() {
showLoggedIn(data);
},
error: function(err) {
var errMsg = "To try this, you need a home server running!";
var errMsg = "To try this, you need a homeserver running!";
var errJson = $.parseJSON(err.responseText);
if (errJson) {
errMsg = JSON.stringify(errJson);

2
supporting-docs/howtos/jsfiddles/event_stream/demo.html
View file

@ -1,5 +1,5 @@
<div>
<p>This event stream demo requires a home server to be running on http://localhost:8008</p>
<p>This event stream demo requires a homeserver to be running on http://localhost:8008</p>
</div>
<form class="loginForm">
<input type="text" id="userLogin" placeholder="Username"></input>

2
supporting-docs/howtos/jsfiddles/event_stream/demo.js
View file

@ -58,7 +58,7 @@ $('.login').live('click', function() {
showLoggedIn(data);
},
error: function(err) {
var errMsg = "To try this, you need a home server running!";
var errMsg = "To try this, you need a homeserver running!";
var errJson = $.parseJSON(err.responseText);
if (errJson) {
errMsg = JSON.stringify(errJson);

2
supporting-docs/howtos/jsfiddles/example_app/demo.html
View file

@ -1,5 +1,5 @@
<div class="signUp">
<p>Matrix example application: Requires a local home server running at http://localhost:8008</p>
<p>Matrix example application: Requires a local homeserver running at http://localhost:8008</p>
<form class="registrationForm">
<p>No account? Register:</p>
<input type="text" id="userReg" placeholder="Username"></input>

4
supporting-docs/howtos/jsfiddles/example_app/demo.js
View file

@ -98,7 +98,7 @@ $('.login').live('click', function() {
onLoggedIn(data);
},
error: function(err) {
alert("Unable to login: is the home server running?");
alert("Unable to login: is the homeserver running?");
}
});
});
@ -116,7 +116,7 @@ $('.register').live('click', function() {
onLoggedIn(data);
},
error: function(err) {
var msg = "Is the home server running?";
var msg = "Is the homeserver running?";
var errJson = $.parseJSON(err.responseText);
if (errJson !== null) {
msg = errJson.error;

2
supporting-docs/howtos/jsfiddles/register_login/demo.html
View file

@ -1,5 +1,5 @@
<div>
<p>This registration/login demo requires a home server to be running on http://localhost:8008</p>
<p>This registration/login demo requires a homeserver to be running on http://localhost:8008</p>
</div>
<form class="registrationForm">
<input type="text" id="user" placeholder="Username"></input>

4
supporting-docs/howtos/jsfiddles/register_login/demo.js
View file

@ -20,7 +20,7 @@ $('.register').live('click', function() {
showLoggedIn(data);
},
error: function(err) {
var errMsg = "To try this, you need a home server running!";
var errMsg = "To try this, you need a homeserver running!";
var errJson = $.parseJSON(err.responseText);
if (errJson) {
errMsg = JSON.stringify(errJson);
@ -41,7 +41,7 @@ var login = function(user, password) {
showLoggedIn(data);
},
error: function(err) {
var errMsg = "To try this, you need a home server running!";
var errMsg = "To try this, you need a homeserver running!";
var errJson = $.parseJSON(err.responseText);
if (errJson) {
errMsg = JSON.stringify(errJson);

2
supporting-docs/howtos/jsfiddles/room_memberships/demo.html
View file

@ -1,5 +1,5 @@
<div>
<p>This room membership demo requires a home server to be running on http://localhost:8008</p>
<p>This room membership demo requires a homeserver to be running on http://localhost:8008</p>
</div>
<form class="loginForm">
<input type="text" id="userLogin" placeholder="Username"></input>

2
supporting-docs/howtos/jsfiddles/room_memberships/demo.js
View file

@ -28,7 +28,7 @@ $('.login').live('click', function() {
showLoggedIn(data);
},
error: function(err) {
var errMsg = "To try this, you need a home server running!";
var errMsg = "To try this, you need a homeserver running!";
var errJson = $.parseJSON(err.responseText);
if (errJson) {
errMsg = JSON.stringify(errJson);