Skip to content
Permalink
Browse files

Update domain name references to pyrogram.org

  • Loading branch information...
delivrance committed May 19, 2019
1 parent 2032cec commit 0dc953c32075d6a38ba945c1bd296f088b2695fd
Showing with 48 additions and 40 deletions.
  1. +4 βˆ’4 README.md
  2. +1 βˆ’1 docs/source/conf.py
  3. +26 βˆ’18 docs/source/index.rst
  4. +1 βˆ’1 docs/source/sitemap.py
  5. +4 βˆ’4 docs/source/topics/text-formatting.rst
  6. +1 βˆ’1 examples/bot_keyboards.py
  7. +4 βˆ’4 examples/inline_queries.py
  8. +1 βˆ’1 examples/welcomebot.py
  9. +2 βˆ’2 pyrogram/client/client.py
  10. +1 βˆ’1 pyrogram/crypto/aes.py
  11. +3 βˆ’3 setup.py
@@ -5,7 +5,7 @@
<br>
<b>Telegram MTProto API Framework for Python</b>
<br>
<a href="https://docs.pyrogram.ml">
<a href="https://docs.pyrogram.org">
Documentation
</a>
β€’
@@ -66,7 +66,7 @@ ground up in Python and C. It enables you to easily create custom apps for both
### Requirements

- Python 3.4 or higher.
- A [Telegram API key](https://docs.pyrogram.ml/intro/setup#api-keys).
- A [Telegram API key](https://docs.pyrogram.org/intro/setup#api-keys).

### Installing

@@ -76,11 +76,11 @@ pip3 install pyrogram

### Resources

- The Docs contain lots of resources to help you getting started with Pyrogram: https://docs.pyrogram.ml.
- The Docs contain lots of resources to help you getting started with Pyrogram: https://docs.pyrogram.org.
- Reading [Examples in this repository](https://github.com/pyrogram/pyrogram/tree/master/examples) is also a good way
for learning how Pyrogram works.
- Seeking extra help? Don't be shy, come join and ask our [Community](https://t.me/PyrogramChat)!
- For other requests you can send an [Email](mailto:admin@pyrogram.ml) or a [Message](https://t.me/haskell).
- For other requests you can send an [Email](mailto:dan@pyrogram.org) or a [Message](https://t.me/haskell).

### Contributing

@@ -113,7 +113,7 @@
# documentation.
#
html_theme_options = {
'canonical_url': "https://docs.pyrogram.ml/",
'canonical_url': "https://docs.pyrogram.org/",
'collapse_navigation': True,
'sticky_navigation': False,
'logo_only': True,
@@ -4,7 +4,7 @@ Welcome to Pyrogram
.. raw:: html

<div align="center">
<a href="https://docs.pyrogram.ml">
<a href="https://docs.pyrogram.org">
<div><img src="_static/logo.png" alt="Pyrogram Logo"></div>
</a>
</div>
@@ -45,7 +45,7 @@ C. It enables you to easily create custom apps for both user and bot identities
`MTProto API`_.

.. _Telegram: https://telegram.org
.. _MTProto API: topics/faq#what-can-mtproto-do-more-than-the-bot-api
.. _MTProto API: topics/mtproto-vs-botapi#what-is-the-mtproto-api

How the Documentation is Organized
----------------------------------
@@ -62,7 +62,7 @@ First Steps
- `Handling Updates`_ - How to handle Telegram updates.
- `Error Handling`_ - How to handle API errors correctly.

.. _Quick Start: intro/start
.. _Quick Start: intro/quickstart
.. _Calling Methods: start/invoking
.. _Handling Updates: start/updates
.. _Error Handling: start/errors
@@ -80,34 +80,34 @@ API Reference
.. _Available Types: api/types
.. _Bound Methods: api/bound-methods

Relevant Topics
^^^^^^^^^^^^^^^
Meta
^^^^

- `Smart Plugins`_ - How to modularize your application.
- `Advanced Usage`_ - How to use Telegram's raw API.
- `Release Notes`_ - Release notes for Pyrogram releases.
- `Pyrogram FAQ`_ - Answers to common Pyrogram questions.
- `Pyrogram Glossary`_ - A list of words with brief explanations.
- `Release Notes`_ - Release notes for Pyrogram releases.
- `Powered by Pyrogram`_ - A collection of Pyrogram Projects.
- `Support Pyrogram Development`_ - Ways to show your appreciation.

.. _Smart Plugins: topics/smart-plugins
.. _Advanced Usage: topics/advanced-usage
.. _Release Notes: topics/releases
.. _Pyrogram FAQ: topics/faq
.. _Pyrogram Glossary: topics/glossary
.. _Pyrogram FAQ: meta/faq
.. _Pyrogram Glossary: meta/glossary
.. _Release Notes: meta/releases
.. _Powered by Pyrogram: meta/powered-by
.. _Support Pyrogram Development: meta/support-pyrogram

.. toctree::
:hidden:
:caption: Introduction

intro/start
intro/quickstart
intro/install
intro/setup

.. toctree::
:hidden:
:caption: Getting Started

intro/auth
start/auth
start/invoking
start/updates
start/errors
@@ -139,12 +139,20 @@ Relevant Topics
topics/text-formatting
topics/proxy
topics/bots-interaction
topics/mtproto-vs-botapi
topics/test-servers
topics/advanced-usage
topics/voice-calls
topics/releases
topics/faq
topics/glossary

.. toctree::
:hidden:
:caption: Meta

meta/faq
meta/glossary
meta/releases
meta/powered-by
meta/support-pyrogram

.. toctree::
:hidden:
@@ -20,7 +20,7 @@
import os
import re

canonical = "https://docs.pyrogram.ml"
canonical = "https://docs.pyrogram.org/"

dirs = {
"start": ("weekly", 0.9),
@@ -20,7 +20,7 @@ To use this mode, pass "markdown" in the *parse_mode* field when using

__italic text__

[inline URL](https://docs.pyrogram.ml/)
[inline URL](https://docs.pyrogram.org/)

[inline mention of a user](tg://user?id=23122162)

@@ -43,7 +43,7 @@ The following tags are currently supported:

<i>italic</i>, <em>italic</em>

<a href="http://docs.pyrogram.ml/">inline URL</a>
<a href="http://docs.pyrogram.org/">inline URL</a>

<a href="tg://user?id=23122162">inline mention of a user</a>

@@ -66,7 +66,7 @@ Examples
"**bold**, "
"__italic__, "
"[mention](tg://user?id=23122162), "
"[URL](https://docs.pyrogram.ml), "
"[URL](https://docs.pyrogram.org), "
"`code`, "
"```"
"for i in range(10):\n"
@@ -84,7 +84,7 @@ Examples
"<b>bold</b>, "
"<i>italic</i>, "
"<a href=\"tg://user?id=23122162\">mention</a>, "
"<a href=\"https://pyrogram.ml/\">URL</a>, "
"<a href=\"https://pyrogram.org/\">URL</a>, "
"<code>code</code>, "
"<pre>"
"for i in range(10):\n"
@@ -39,7 +39,7 @@
),
InlineKeyboardButton( # Opens a web URL
"URL",
url="https://docs.pyrogram.ml"
url="https://docs.pyrogram.org"
),
],
[ # Second row
@@ -22,12 +22,12 @@ def answer(client, inline_query):
input_message_content=InputTextMessageContent(
"Here's how to install **Pyrogram**"
),
url="https://docs.pyrogram.ml/start/Installation",
url="https://docs.pyrogram.org/intro/install",
description="How to install Pyrogram",
thumb_url="https://i.imgur.com/JyxrStE.png",
reply_markup=InlineKeyboardMarkup(
[
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.ml/start/Installation")]
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.org/intro/install")]
]
)
),
@@ -37,12 +37,12 @@ def answer(client, inline_query):
input_message_content=InputTextMessageContent(
"Here's how to use **Pyrogram**"
),
url="https://docs.pyrogram.ml/start/Usage",
url="https://docs.pyrogram.org/start/invoking",
description="How to use Pyrogram",
thumb_url="https://i.imgur.com/JyxrStE.png",
reply_markup=InlineKeyboardMarkup(
[
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.ml/start/Usage")]
[InlineKeyboardButton("Open website", url="https://docs.pyrogram.org/start/invoking")]
]
)
)
@@ -8,7 +8,7 @@

TARGET = "PyrogramChat" # Target chat. Can also be a list of multiple chat ids/usernames
MENTION = "[{}](tg://user?id={})" # User mention markup
MESSAGE = "{} Welcome to [Pyrogram](https://docs.pyrogram.ml/)'s group chat {}!" # Welcome message
MESSAGE = "{} Welcome to [Pyrogram](https://docs.pyrogram.org/)'s group chat {}!" # Welcome message

app = Client("my_account")

@@ -275,7 +275,7 @@ def start(self):
log.warning('\nWARNING: You are using a bot token as session name!\n'
'This usage will be deprecated soon. Please use a session file name to load '
'an existing session and the bot_token argument to create new sessions.\n'
'More info: https://docs.pyrogram.ml/start/Setup#bot-authorization\n')
'More info: https://docs.pyrogram.org/intro/auth#bot-authorization\n')

self.load_config()
self.load_session()
@@ -1091,7 +1091,7 @@ def load_config(self):
else:
raise AttributeError(
"No API Key found. "
"More info: https://docs.pyrogram.ml/intro/setup#configuration"
"More info: https://docs.pyrogram.org/intro/setup#configuration"
)

for option in ["app_version", "device_model", "system_version", "lang_code"]:
@@ -56,7 +56,7 @@ def xor(a: bytes, b: bytes) -> bytes:
log.warning(
"TgCrypto is missing! "
"Pyrogram will work the same, but at a much slower speed. "
"More info: https://docs.pyrogram.ml/resources/TgCrypto"
"More info: https://docs.pyrogram.org/topics/tgcrypto"
)


@@ -126,13 +126,13 @@ def run(self):
setup(
name="Pyrogram",
version=version,
description="Telegram MTProto API Client Library for Python",
description="Telegram MTProto API Client Library and Framework for Python",
long_description=readme,
long_description_content_type="text/markdown",
url="https://github.com/pyrogram",
download_url="https://github.com/pyrogram/pyrogram/releases/latest",
author="Dan Tès",
author_email="admin@pyrogram.ml",
author_email="dan@pyrogram.org",
license="LGPLv3+",
classifiers=[
"Development Status :: 4 - Beta",
@@ -162,7 +162,7 @@ def run(self):
"Tracker": "https://github.com/pyrogram/pyrogram/issues",
"Community": "https://t.me/PyrogramChat",
"Source": "https://github.com/pyrogram/pyrogram",
"Documentation": "https://docs.pyrogram.ml",
"Documentation": "https://docs.pyrogram.org",
},
python_requires="~=3.4",
packages=find_packages(exclude=["compiler*"]),

0 comments on commit 0dc953c

Please sign in to comment.
You can’t perform that action at this time.