Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / doc / Chats.md

diff --git a/doc/Chats.md b/doc/Chats.md
index 77b21833a50981cf42bf4df1e6882139245ef67f..4e392f8d8fc8bfbc1af01f398fe2ad585b210ab9 100644 (file)
--- a/doc/Chats.md
+++ b/doc/Chats.md
@@ -3,7 +3,7 @@ Chats
 
 * [Home](help)
 
 
 * [Home](help)
 

-There are two possibilities to use a chat on your friendica site
+There are two possibilities to use chat on your friendica site

 
 * IRC Chat
 * Jappix
 
 * IRC Chat
 * Jappix


@@ -14,16 +14,16 @@ IRC-Chat Plugin
 After activating the plugin, you can find the chat at [yoursite.com/irc](../irc).
 Note: you can use this chat without any login at your site so that everyone could use it.
 
 After activating the plugin, you can find the chat at [yoursite.com/irc](../irc).
 Note: you can use this chat without any login at your site so that everyone could use it.
 

-If you follow the link, you will see the login page of the IR chat.
+If you follow the link, you will see the login page of the IRC chat.

 Now choose a nickname and a chatroom.
 Now choose a nickname and a chatroom.

-You can choose every name for the room, even something like #superchatwhosenameisonlyknownbyme.
-At last, solve the captchas and click the connect button.
+You can choose any name you like for the room, even something like #superchatwhosenameisonlyknownbyme.
+Finally, solve the captchas and click the connect button.

 
 The following window shows some text while connecting.
 
 The following window shows some text while connecting.

-This text isn't importend for you, just wait for the next window.
+This text isn't important, just wait for the next window.

 The first line shows your name and your current IP address.
 The right part of the window shows all users.
 The first line shows your name and your current IP address.
 The right part of the window shows all users.

-The lower part of the window contains an input field. 
+The lower part of the window contains an input field.

 
 Jappix Mini
 ---
 
 Jappix Mini
 ---


@@ -41,7 +41,7 @@ You can use several servers to create an account:
 
 At first you have to get the current version. You can either pull it from [Github](https://github.com) like so:
 
 
 At first you have to get the current version. You can either pull it from [Github](https://github.com) like so:
 

-       $> cd /var/www/virtual/YOURSPACE/html/addon; git pull
+    $> cd /var/www/virtual/YOURSPACE/html/addon; git pull

 
 Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/master/jappixmini.tgz) (click at „view raw“).
 
 
 Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/master/jappixmini.tgz) (click at „view raw“).
 


@@ -63,9 +63,10 @@ At first you have to activate the addon.
 
 Now add your Jabber/XMPP name, the domain/server (without "http"; just "jappix.com").
 For „Jabber BOSH Host“ you could use "https://bind.jappix.com/".
 
 Now add your Jabber/XMPP name, the domain/server (without "http"; just "jappix.com").
 For „Jabber BOSH Host“ you could use "https://bind.jappix.com/".

+Note that you need another BOSH server if you do not use jappix.com for your XMPP account.

 You can find further information in the „Configuration Help“-section below this fields.
 At last you have enter your password (there are some more optional options, you can choose).
 You can find further information in the „Configuration Help“-section below this fields.
 At last you have enter your password (there are some more optional options, you can choose).

-Finish these steps with "send" to save the entries. 
+Finish these steps with "send" to save the entries.

 Now, you should find the chatbox at the lower right corner of your browser window.
 
 Now, you should find the chatbox at the lower right corner of your browser window.
 

-If you want to add contacts manually, you can click "add contact". 
+If you want to add contacts manually, you can click "add contact".