conflict fixes

This commit is contained in:
iDutchy
2021-01-14 18:03:09 -06:00
39 changed files with 1181 additions and 184 deletions

View File

@ -30,41 +30,57 @@ Features
- Easy to use with an object oriented design
- Optimised for both speed and memory
Documentation Contents
-----------------------
Getting started
-----------------
.. toctree::
:maxdepth: 2
Is this your first time using the library? This is the place to get started!
intro
quickstart
migrating
logging
api
- **First steps:** :doc:`intro` | :doc:`quickstart` | :doc:`logging`
- **Working with Discord:** :doc:`discord` | :doc:`intents`
- **Examples:** Many examples are available in the :resource:`repository <examples>`.
Getting help
--------------
If you're having trouble with something, these resources might help.
- Try the :doc:`faq` first, it's got answers to all common questions.
- Ask us and hang out with us in our :resource:`Discord <discord>` server.
- If you're looking for something specific, try the :ref:`index <genindex>` or :ref:`searching <search>`.
- Report bugs in the :resource:`issue tracker <issues>`.
- Ask in our :resource:`GitHub discussions page <discussions>`.
Extensions
-----------
------------
These extensions help you during development when it comes to common tasks.
.. toctree::
:maxdepth: 3
:maxdepth: 1
ext/commands/index.rst
ext/tasks/index.rst
Manuals
---------
Additional Information
-----------------------
These pages go into great detail about everything the API can do.
.. toctree::
:maxdepth: 2
:maxdepth: 1
discord
intents
faq
whats_new
version_guarantees
api
discord.ext.commands API Reference <ext/commands/api.rst>
discord.ext.tasks API Reference <ext/tasks/index.rst>
If you still can't find what you're looking for, try in one of the following pages:
Meta
------
* :ref:`genindex`
* :ref:`search`
If you're looking for something related to the project itself, it's here.
.. toctree::
:maxdepth: 1
whats_new
version_guarantees
migrating