Merge remote-tracking branch 'upstream/master'

aydarbiktimirov · aydarbiktimirov · commit dc9b77e02c0b · 2016-03-11T23:03:13.000+03:00
diff --git a/README.rst b/README.rst
@@ -36,7 +36,7 @@ A Python wrapper around the Telegram Bot API.
    :alt: Coveralls
 
 .. image:: https://img.shields.io/badge/Telegram-Group-blue.svg
-   :target: https://telegram.me/joinchat/ALnA-AJQm5TcNEiy2G_4cQ
+   :target: https://telegram.me/joinchat/ALnA-AJQm5Q1D_Kxt8lFiA
    :alt: Telegram Group
 
 =================
@@ -426,7 +426,7 @@ You may copy, distribute and modify the software provided that modifications are
 _`Contact`
 ==========
 
-Feel free to join to our `Telegram group <https://telegram.me/joinchat/ALnA-AJQm5TcNEiy2G_4cQ>`_.
+Feel free to join to our `Telegram group <https://telegram.me/joinchat/ALnA-AJQm5Q1D_Kxt8lFiA>`_.
 
 =======
 _`TODO`
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -210,11 +210,11 @@ def sendMessage(self,
           chat_id:
             Unique identifier for the message recipient - telegram.Chat id.
           parse_mode:
-            Send Markdown, if you want Telegram apps to show bold, italic and
-            inline URLs in your bot's message. For the moment, only Telegram
-            for Android supports this. [Optional]
+            Send 'Markdown', if you want Telegram apps to show bold, italic and
+            inline URLs in your bot's message. [Optional]
           text:
-            Text of the message to be sent.
+            Text of the message to be sent. The current maximum length is 4096
+            UTF8 characters.
           disable_web_page_preview:
             Disables link previews for links in this message. [Optional]
           disable_notification:
