Merge branch 'develop' into asyncio

# Conflicts:
#	pyrogram/__init__.py

README.rst

@@ -3,8 +3,6 @@
 Pyrogram
 ========
 
-    `A fully asynchronous variant is also available! <https://github.com/pyrogram/pyrogram/issues/181>`_
-
 .. code-block:: python
 
     from pyrogram import Client, Filters
@@ -20,17 +18,19 @@ Pyrogram
     app.run()
 
 **Pyrogram** is an elegant, easy-to-use Telegram_ client library and framework written from the ground up in Python and C.
-It enables you to easily build custom Telegram applications that interact with the MTProto API as both user and bot.
+It enables you to easily create custom apps using both user and bot identities (bot API alternative) via the `MTProto API`_.
+
+    `A fully-asynchronous variant is also available » <https://github.com/pyrogram/pyrogram/issues/181>`_
 
 Features
 --------
 
--   **Easy**: You can install Pyrogram with pip and start building your app right away.
+-   **Easy**: You can install Pyrogram with pip and start building your applications right away.
 -   **Elegant**: Low-level details are abstracted and re-presented in a much nicer and easier way.
 -   **Fast**: Crypto parts are boosted up by TgCrypto_, a high-performance library written in pure C.
 -   **Documented**: Pyrogram API methods, types and public interfaces are well documented.
 -   **Type-hinted**: Exposed Pyrogram types and method parameters are all type-hinted.
--   **Updated**, to the latest Telegram API version, currently Layer 91 on top of MTProto 2.0.
+-   **Updated**, to the latest Telegram API version, currently Layer 91 on top of `MTProto 2.0`_.
 -   **Pluggable**: The Smart Plugin system allows to write components with minimal boilerplate code.
 -   **Comprehensive**: Execute any advanced action an official client is able to do, and even more.
 
@@ -47,8 +47,8 @@ Installing
 
     pip3 install pyrogram
 
-Getting Started
----------------
+Resources
+---------
 
 -   The Docs contain lots of resources to help you getting started with Pyrogram: https://docs.pyrogram.ml.
 -   Reading `Examples in this repository`_ is also a good way for learning how Pyrogram works.
@@ -69,6 +69,7 @@ Copyright & License
 -   Licensed under the terms of the `GNU Lesser General Public License v3 or later (LGPLv3+)`_
 
 .. _`Telegram`: https://telegram.org/
+.. _`MTProto API`: https://core.telegram.org/api#telegram-api
 .. _`Telegram API key`: https://docs.pyrogram.ml/start/ProjectSetup#api-keys
 .. _`Community`: https://t.me/PyrogramChat
 .. _`Examples in this repository`: https://github.com/pyrogram/pyrogram/tree/master/examples
@@ -76,6 +77,7 @@ Copyright & License
 .. _`Email`: admin@pyrogram.ml
 .. _`Message`: https://t.me/haskell
 .. _TgCrypto: https://github.com/pyrogram/tgcrypto
+.. _`MTProto 2.0`: https://core.telegram.org/mtproto
 .. _`GNU Lesser General Public License v3 or later (LGPLv3+)`: COPYING.lesser
 
 .. |header| raw:: html
@@ -118,10 +120,10 @@ Copyright & License
 
 .. |description| replace:: **Telegram MTProto API Framework for Python**
 
-.. |schema| image:: "https://img.shields.io/badge/schema-layer%2091-eda738.svg?longCache=true&colorA=262b30"
+.. |schema| image:: https://img.shields.io/badge/schema-layer%2091-eda738.svg?longCache=true&colorA=262b30
     :target: compiler/api/source/main_api.tl
     :alt: Schema Layer
 
-.. |tgcrypto| image:: "https://img.shields.io/badge/tgcrypto-v1.1.1-eda738.svg?longCache=true&colorA=262b30"
+.. |tgcrypto| image:: https://img.shields.io/badge/tgcrypto-v1.1.1-eda738.svg?longCache=true&colorA=262b30
     :target: https://github.com/pyrogram/tgcrypto
     :alt: TgCrypto Version

docs/source/index.rst

@@ -56,18 +56,18 @@ using the Next button at the end of each page. But first, here's a brief overvie
 About
 -----
 
-**Pyrogram** is an elegant, easy-to-use Telegram_ client library and framework written from the ground up in Python and
-C. It enables you to easily build custom Telegram applications that interact with the MTProto API as both user and bot.
+**Pyrogram** is an elegant, easy-to-use Telegram_ client library and framework written from the ground up in Python and C.
+It enables you to easily create custom apps using both user and bot identities (bot API alternative) via the `MTProto API`_.
 
 Features
 --------
 
--   **Easy**: You can install Pyrogram with pip and start building your app right away.
+-   **Easy**: You can install Pyrogram with pip and start building your applications right away.
 -   **Elegant**: Low-level details are abstracted and re-presented in a much nicer and easier way.
 -   **Fast**: Crypto parts are boosted up by TgCrypto_, a high-performance library written in pure C.
 -   **Documented**: Pyrogram API methods, types and public interfaces are well documented.
 -   **Type-hinted**: Exposed Pyrogram types and method parameters are all type-hinted.
--   **Updated**, to the latest Telegram API version, currently Layer 91 on top of MTProto 2.0.
+-   **Updated**, to the latest Telegram API version, currently Layer 91 on top of `MTProto 2.0`_.
 -   **Pluggable**: The Smart Plugin system allows to write components with minimal boilerplate code.
 -   **Comprehensive**: Execute any advanced action an official client is able to do, and even more.
 
@@ -117,3 +117,5 @@ To get started, press the Next button.
 
 .. _`Telegram`: https://telegram.org/
 .. _TgCrypto: https://docs.pyrogram.ml/resources/TgCrypto/
+.. _`MTProto API`: https://core.telegram.org/api#telegram-api
+.. _`MTProto 2.0`: https://core.telegram.org/mtproto

setup.py

@@ -39,10 +39,10 @@ def get_version():
 
 
 def get_readme():
-    # PyPI doesn"t like raw html
+    # PyPI doesn't like raw html
     with open("README.rst", encoding="utf-8") as f:
         readme = re.sub(r"\.\. \|.+\| raw:: html(?:\s{4}.+)+\n\n", "", f.read())
-        return re.sub(r"\|header\|", "|logo|\n\n|description|\n\n|scheme| |tgcrypto|", readme)
+        return re.sub(r"\|header\|", "|logo|\n\n|description|\n\n|schema| |tgcrypto|", readme)
 
 
 class Clean(Command):