Merge github.com:vysheng/tg

README.md

@@ -76,6 +76,13 @@ By default public key is stored in the same folder named tg.pub:
     ./telegram -k tg.pub
 
 Client support TAB completion and command history.
+
+Peer refers to the name of the contact or dialog and can be accessed by TAB completion.
+For user contacts peer name is Name <underscore> Lastname with all spaces changed to underscores.
+For chats it is it's title with all spaces changed to underscores
+For encrypted chats it is <Exсlamation mark> <underscore> Name <underscore> Lastname with all spaces changed to underscores. 
+
+If two or more peers have same name, <sharp>number is appended to the name. (for example A_B, A_B#1, A_B#2 and so on)
   
 ### Supported commands
 
@@ -84,6 +91,7 @@ Client support TAB completion and command history.
 
 * **msg** \<peer\> Text - sends message to this peer
 * **fwd** \<user\> \<msg-seqno\> - forward message to user. You can see message numbers starting client with -N
+* **chat_with_peer** \<peer\> starts one on one chat session with this peer. /exit or /quit to end this mode.
 * **add_contact** \<phone-number\> \<first-name\> \<last-name\> - tries to add contact to contact-list by phone
 * **rename_contact** \<user\> \<first-name\> \<last-name\> - tries to rename contact. If you have another device it will be a fight
 * **mark_read** \<peer\> - mark read all received messages with peer

interface.c

@@ -868,7 +868,7 @@ void interpreter (char *line UU) {
       "msg <peer> Text - sends message to this peer\n"
       "contact_list - prints info about users in your contact list\n"
       "stats - just for debugging \n"
-      "history <peerd> [limit] - prints history (and marks it as read). Default limit = 40\n"
+      "history <peer> [limit] - prints history (and marks it as read). Default limit = 40\n"
       "dialog_list - prints info about your dialogs\n"
       "send_photo <peer> <photo-file-name> - sends photo to peer\n"
       "send_video <peer> <video-file-name> - sends video to peer\n"