Merge branch 'V3/develop' into V3/feature/mutes

2025-12-07 09:52:30 -05:00 · 2020-01-17 20:25:45 -05:00
parent 1cb43b11a1 8d73838d80
commit 677d700363
75 changed files with 2811 additions and 964 deletions
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -0,0 +1,9 @@
+{% extends '!layout.html' %}
+{% block document %}
+{{ super() }}
+<a href="https://github.com/Cog-Creators/Red-DiscordBot">
+    <img style="position: absolute; top: 0; right: 0; border: 0;"
+    src="https://github.blog/wp-content/uploads/2008/12/forkme_right_darkblue_121621.png?resize=149%2C149"
+    class="attachment-full size-full" alt="Fork me on GitHub">
+</a>
+{% endblock %}
--- a/docs/autostart_pm2.rst
+++ b/docs/autostart_pm2.rst
@@ -17,18 +17,20 @@ Start by installing Node.JS and NPM via your favorite package distributor. From
 After PM2 is installed, run the following command to enable your Red instance to be managed by PM2. Replace the brackets with the required information.
 You can add additional Red based arguments after the instance, such as :code:`--dev`.

-:code:`pm2 start redbot --name "<Insert a name here>" --interpreter "<Location to your Python Interpreter>" -- <Red Instance> --no-prompt`
+.. code-block:: none
+
+    pm2 start redbot --name "<Insert a name here>" --interpreter "<Location to your Python Interpreter>" --interpreter-args "-O" -- <Red Instance> --no-prompt

 .. code-block:: none

    Arguments to replace.

-    --name ""
+    <Insert a name here>
    A name to identify the bot within pm2, this is not your Red instance.

-    --interpreter ""
-    The location of your Python interpreter, to find out where that is use the following command:
-    which python3.6
+    <Location to your Python Interpreter>
+    The location of your Python interpreter, to find out where that is use the following command inside activated venv:
+    which python

    <Red Instance>
    The name of your Red instance.
--- a/docs/autostart_systemd.rst
+++ b/docs/autostart_systemd.rst
@@ -14,11 +14,11 @@ In order to create the service file, you will first need the location of your :c

    # If redbot is installed in a virtualenv
    source redenv/bin/activate
+    which python

    # If you are using pyenv
    pyenv shell <name>
-
-    which redbot
+    pyenv which python

 Then create the new service file:

@@ -33,7 +33,7 @@ Paste the following and replace all instances of :code:`username` with the usern
    After=multi-user.target

    [Service]
-    ExecStart=path %I --no-prompt
+    ExecStart=path -O -m redbot %I --no-prompt
    User=username
    Group=username
    Type=idle
@@ -71,4 +71,4 @@ type the following command in the terminal, still by adding the instance name af

 To view Red’s log, you can acccess through journalctl:

-:code:`sudo journalctl -u red@instancename`
+:code:`sudo journalctl -eu red@instancename`
--- a/docs/changelog_3_2_0.rst
+++ b/docs/changelog_3_2_0.rst
@@ -1,5 +1,68 @@
 .. 3.2.x Changelogs

+Redbot 3.2.3 (2020-01-17)
+=========================
+
+Core Bot Changes
+----------------
+
+- Further improvements have been made to bot startup and shutdown.
+- Prefixes are now cached for performance.
+- Added the means for cog creators to use a global preinvoke hook.
+- The bot now ensures it has at least the bare neccessary permissions before running commands.
+- Deleting instances works as intended again.
+- Sinbad stopped fighting it and embraced the entrypoint madness.
+
+Core Commands
+-------------
+
+- The servers command now also shows the ids.
+
+Admin Cog
+---------
+
+- The selfrole command now has reasonable expectations about hierarchy.
+
+Help Formatter
+--------------
+
+- ``[botname]`` is now replaced with the bot's display name in help text.
+- New features added for cog creators to further customize help behavior.
+  
+  - Check out our command reference for details on new ``format_help_for_context`` method.
+- Embed settings are now consistent.
+
+Downloader
+----------
+
+- Improved a few user facing messages.
+- Added pagination of output on cog update.
+- Added logging of failures.
+
+Docs
+----
+
+There's more detail to the below changes, so go read the docs.
+For some reason, documenting documentation changes is hard.
+
+- Added instructions about git version.
+- Clarified instructions for installation and update.
+- Added more details to the API key reference.
+- Fixed some typos and versioning mistakes.
+
+
+Audio
+-----
+
+Draper did things.
+
+- No seriously, Draper did things.
+- Wait you wanted details? Ok, I guess we can share those.
+- Audio properly disconnects with autodisconnect, even if notify is being used.
+- Symbolic links now work as intended for local tracks.
+- Bump play now shows the correct time till next track.
+- Multiple user facing messages have been made more correct.
+
 Redbot 3.2.2 (2020-01-10)
 =========================

@@ -49,7 +112,8 @@ Breaking Changes
    - ``bot.get_mod_role_ids`` (`#2967 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2967>`_)
 - Reserved some command names for internal Red use. These are available programatically as ``redbot.core.commands.RESERVED_COMMAND_NAMES``. (`#2973 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2973>`_)
 - Removed ``bot._counter``, Made a few more attrs private (``cog_mgr``, ``main_dir``). (`#2976 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2976>`_)
- ``bot.wait_until_ready`` should no longer be used during extension setup. (`#3073 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3073>`_)
+- Extension's ``setup()`` function should no longer assume that we are, or even will be connected to Discord.
+  This also means that cog creators should no longer use ``bot.wait_until_ready()`` inside it. (`#3073 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3073>`_)
 - Removed the mongo driver. (`#3099 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3099>`_)


@@ -174,7 +238,7 @@ Removals
 ~~~~~~~~

 - ``[p]set owner`` and ``[p]set token`` have been removed in favor of managing server side. (`#2928 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2928>`_)
- Shared libraries are marked for removal in Red 3.3. (`#3106 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3106>`_)
+- Shared libraries are marked for removal in Red 3.4. (`#3106 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3106>`_)
 - Removed ``[p]backup``. Use the cli command ``redbot-setup backup`` instead. (`#3235 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3235>`_)
 - Removed the functions ``safe_delete``, ``fuzzy_command_search``, ``format_fuzzy_results`` and ``create_backup`` from ``redbot.core.utils``. (`#3240 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3240>`_)
 - Removed a lot of the launcher's handled behavior. (`#3289 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3289>`_)
--- a/docs/changelog_3_3_0.rst
+++ b/docs/changelog_3_3_0.rst
@@ -0,0 +1,102 @@
+.. 3.3.x Changelogs
+
+Redbot 3.3.1 (2020-02-05)
+=========================
+
+
+Core Bot
+--------
+
+- Add a cli flag for setting a max size of message cache
+- Allow to edit prefix from command line using ``redbot --edit``.
+- Some functions have been changed to no longer use deprecated asyncio functions
+
+Core Commands
+-------------
+
+- The short help text for dm has been made more useful
+- dm no longer allows owners to have the bot attempt to DM itself
+
+Utils
+-----
+
+- Passing the event loop explicitly in utils is deprecated (Removal in 3.4)
+
+Mod Cog
+-------
+
+- Hackban now works properly without being provided a number of days
+
+Documentation Changes
+---------------------
+
+- Add ``-e`` flag to ``journalctl`` command in systemd guide so that it takes the user to the end of logs automatically.
+- Added section to install docs for CentOS 8
+- Improve usage of apt update in docs
+
+Redbot 3.3.0 (2020-01-26)
+=========================
+
+Core Bot
+--------
+
+- The bot's description is now configurable.
+- We now use discord.py 1.3.1, this comes with added teams support.
+- The commands module has been slightly restructured to provide more useful data to developers.
+- Help is now self consistent in the extra formatting used.
+
+Core Commands
+-------------
+
+- Slowmode should no longer error on nonsensical time quantities.
+- Embed use can be configured per channel as well.
+
+Documentation
+-------------
+
+- We've made some small fixes to inaccurate instructions about installing with pyenv.
+- Notes about deprecating in 3.3 have been altered to 3.4 to match the intended timeframe.
+
+Admin
+-----
+
+- Gives feedback when adding or removing a role doesn't make sense.
+
+Audio
+-----
+
+- Playlist finding is more intuitive.
+- disconnect and repeat commands no longer interfere with eachother.
+
+CustomCom
+---------
+
+- No longer errors when exiting an interactive menu.
+
+Cleanup
+-------
+
+- A rare edge case involving messages which are deleted during cleanup and are the only message was fixed.
+
+Downloader
+----------
+
+- Some user facing messages were improved.
+- Downloader's initialization can no longer time out at startup.
+
+General
+-------
+
+- Roll command will no longer attempt to roll obscenely large amounts.
+
+Mod
+---
+
+- You can set a default amount of days to clean up when banning.
+- Ban and hackban now use that default.
+- Users can now optionally be DMed their ban reason.
+
+Permissions
+-----------
+
+- Now has stronger enforcement of prioritizing botwide settings.
--- a/docs/framework_apikeys.rst
+++ b/docs/framework_apikeys.rst
@@ -6,7 +6,7 @@ Shared API Keys

 Red has a central API key storage utilising the core bots config. This allows cog creators to add a single location to store API keys for their cogs which may be shared between other cogs.

-There needs to be some consistency between cog creators when using shared API keys between cogs. To help make this easier service should be all **lowercase** and the key names should match the naming convetion of the API being accessed. 
+There needs to be some consistency between cog creators when using shared API keys between cogs. To help make this easier service should be all **lowercase** and the key names should match the naming convention of the API being accessed.

 Example:

@@ -60,3 +60,16 @@ Event Reference
    :type service_name: :class:`str`
    :param api_tokens: New Mapping of token names to tokens. This contains api tokens that weren't changed too.
    :type api_tokens: Mapping[:class:`str`, :class:`str`]
+
+
+*********************
+Additional References
+*********************
+
+.. py:currentmodule:: redbot.core.bot
+
+.. automethod:: Red.get_shared_api_tokens
+
+.. automethod:: Red.set_shared_api_tokens
+
+.. automethod:: Red.remove_shared_api_tokens
--- a/docs/framework_commands.rst
+++ b/docs/framework_commands.rst
@@ -7,7 +7,7 @@ Commands Package
 This package acts almost identically to :doc:`discord.ext.commands <dpy:ext/commands/api>`; i.e.
 all of the attributes from discord.py's are also in ours. 
 Some of these attributes, however, have been slightly modified, while others have been added to
-extend functionlities used throughout the bot, as outlined below.
+extend functionalities used throughout the bot, as outlined below.

 .. autofunction:: redbot.core.commands.command

@@ -15,6 +15,7 @@ extend functionlities used throughout the bot, as outlined below.

 .. autoclass:: redbot.core.commands.Command
    :members:
+    :inherited-members: format_help_for_context

 .. autoclass:: redbot.core.commands.Group
    :members:
@@ -22,5 +23,14 @@ extend functionlities used throughout the bot, as outlined below.
 .. autoclass:: redbot.core.commands.Context
    :members:

+.. autoclass:: redbot.core.commands.GuildContext
+
+.. autoclass:: redbot.core.commands.DMContext
+
 .. automodule:: redbot.core.commands.requires
    :members: PrivilegeLevel, PermState, Requires
+
+.. automodule:: redbot.core.commands.converter
+    :members:
+    :exclude-members: convert
+    :no-undoc-members:
--- a/docs/framework_modlog.rst
+++ b/docs/framework_modlog.rst
@@ -25,7 +25,7 @@ Basic Usage
        async def ban(self, ctx, user: discord.Member, reason: str = None):
            await ctx.guild.ban(user)
            case = await modlog.create_case(
-                ctx.bot, ctx.guild, ctx.message.created_at, action="ban",
+                ctx.bot, ctx.guild, ctx.message.created_at, action_type="ban",
                user=user, moderator=ctx.author, reason=reason
            )
            await ctx.send("Done. It was about time.")
--- a/docs/guide_publish_cogs.rst
+++ b/docs/guide_publish_cogs.rst
@@ -81,5 +81,5 @@ Keys specific to the cog info.json (case sensitive)
  ``SHARED_LIBRARY``. If ``SHARED_LIBRARY`` then ``hidden`` will be ``True``.

 .. warning::
-    Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.3.
+    Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.4.

--- a/docs/index.rst
+++ b/docs/index.rst
@@ -57,6 +57,7 @@ Welcome to Red - Discord Bot's documentation!
    :maxdepth: 2
    :caption: Changelogs:

+    changelog_3_3_0
    release_notes_3_2_0
    changelog_3_2_0
    changelog_3_1_0
--- a/docs/install_linux_mac.rst
+++ b/docs/install_linux_mac.rst
@@ -19,12 +19,22 @@ Please install the pre-requirements using the commands listed for your operating
 The pre-requirements are:
 - Python 3.8.1 or greater
 - Pip 18.1 or greater
- - Git
+ - Git 2.11+
 - Java Runtime Environment 11 or later (for audio support)

 We also recommend installing some basic compiler tools, in case our dependencies don't provide
 pre-built "wheels" for your architecture.

+
+*****************
+Operating systems
+*****************
+
+.. contents::
+    :local:
+
+----
+
 .. _install-arch:

 ~~~~~~~~~~
@@ -35,6 +45,10 @@ Arch Linux

    sudo pacman -Syu python python-pip git jre-openjdk-headless base-devel

+Continue by `creating-venv-linux`.
+
+----
+
 .. _install-centos:
 .. _install-rhel:

@@ -51,15 +65,63 @@ CentOS and RHEL 7

 Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.

+----
+
+.. _install-centos8:
+.. _install-rhel8:
+
+~~~~~~~~~~~~~~~~~
+CentOS and RHEL 8
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: none
+
+    yum -y install epel-release
+    yum update -y
+    yum -y groupinstall development
+    yum -y install git zlib-devel bzip2 bzip2-devel readline-devel sqlite \
+     sqlite-devel openssl-devel xz xz-devel libffi-devel findutils java-11-openjdk
+     
+Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
+
+.. _install-debian-stretch:
+
+~~~~~~~~~~~~~~
+Debian Stretch
+~~~~~~~~~~~~~~
+
+.. note::
+
+    This guide is only for Debian Stretch users, these instructions won't work with
+    Raspbian Stretch. Raspbian Buster is the only version of Raspbian supported by Red.
+
+We recommend installing pyenv as a method of installing non-native versions of python on
+Debian Stretch. This guide will tell you how. First, run the following commands:
+
+.. code-block:: none
+
+    sudo echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/red-sources.list
+    sudo apt update
+    sudo apt -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
+      libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
+      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre
+    CXX=/usr/bin/g++
+
+Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
+
 .. _install-debian:
 .. _install-raspbian:

-~~~~~~~~~~~~~~~~~~~
-Debian and Raspbian
-~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Debian and Raspbian Buster
+~~~~~~~~~~~~~~~~~~~~~~~~~~

 We recommend installing pyenv as a method of installing non-native versions of python on
-Debian/Raspbian. This guide will tell you how. First, run the following commands:
+Debian/Raspbian Buster. This guide will tell you how. First, run the following commands:

 .. code-block:: none

@@ -71,6 +133,8 @@ Debian/Raspbian. This guide will tell you how. First, run the following commands

 Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.

+----
+
 .. _install-fedora:

 ~~~~~~~~~~~~
@@ -84,6 +148,10 @@ them with dnf:

    sudo dnf -y install python38 git java-latest-openjdk-headless @development-tools

+Continue by `creating-venv-linux`.
+
+----
+
 .. _install-mac:

 ~~~
@@ -110,6 +178,10 @@ one-by-one:
 It's possible you will have network issues. If so, go in your Applications folder, inside it, go in
 the Python 3.8 folder then double click ``Install certificates.command``.

+Continue by `creating-venv-linux`.
+
+----
+
 .. _install-opensuse:

 ~~~~~~~~
@@ -150,6 +222,8 @@ Now, install pip with easy_install:

    sudo /opt/python/bin/easy_install-3.8 pip

+Continue by `creating-venv-linux`.
+
 openSUSE Tumbleweed
 *******************

@@ -161,35 +235,74 @@ with zypper:
    sudo zypper install python3-base python3-pip git-core java-12-openjdk-headless
    sudo zypper install -t pattern devel_basis

+Continue by `creating-venv-linux`.
+
+----
+
 .. _install-ubuntu:

-~~~~~~
-Ubuntu
-~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Ubuntu LTS versions (18.04 and 16.04)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-.. note:: **Ubuntu Python Availability**
-
-   We recommend using the deadsnakes ppa to ensure up to date python availability.
-
-    .. code-block:: none
-
-        sudo apt update
-        sudo apt install software-properties-common
-        sudo add-apt-repository ppa:deadsnakes/ppa
-
-Install the pre-requirements with apt:
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:

 .. code-block:: none

    sudo apt update
+    sudo apt -y install software-properties-common
+    sudo add-apt-repository -yu ppa:git-core/ppa
+
+We recommend adding the ``deadsnakes`` ppa to install Python 3.8.1 or greater:
+
+.. code-block:: none
+
+    sudo add-apt-repository -yu ppa:deadsnakes/ppa
+
+Now install the pre-requirements with apt:
+
+.. code-block:: none
+
    sudo apt -y install python3.8 python3.8-dev python3.8-venv python3-pip git default-jre-headless \
      build-essential

+Continue by `creating-venv-linux`.
+
+----
+
+.. _install-ubuntu-non-lts:
+
+~~~~~~~~~~~~~~~~~~~~~~~
+Ubuntu non-LTS versions
+~~~~~~~~~~~~~~~~~~~~~~~
+
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
+
+.. code-block:: none
+
+    sudo apt update
+    sudo apt -y install software-properties-common
+    sudo add-apt-repository -yu ppa:git-core/ppa
+
+Now, to install non-native version of python on non-LTS versions of Ubuntu, we recommend
+installing pyenv. To do this, first run the following commands:
+
+.. code-block:: none
+
+    sudo apt -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
+      libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
+      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre
+    CXX=/usr/bin/g++
+
+And then complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
+
 .. _install-python-pyenv:

-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+****************************
 Installing Python with pyenv
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+****************************

 .. note::

@@ -227,11 +340,15 @@ After that is finished, run:

 Pyenv is now installed and your system should be configured to run Python 3.8.

+Continue by `creating-venv-linux`.
+
+.. _creating-venv-linux:
+
 ------------------------------
 Creating a Virtual Environment
 ------------------------------

-We **strongly** recommend installing Red into a virtual environment. Don't be scared, it's very
+We require installing Red into a virtual environment. Don't be scared, it's very
 straightforward. See the section `installing-in-virtual-environment`.

 .. _installing-red-linux-mac:
@@ -242,31 +359,25 @@ Installing Red

 Choose one of the following commands to install Red.

-.. note::
-
-    If you're not inside an activated virtual environment, include the ``--user`` flag with all
-    ``python3.8 -m pip install`` commands, like this:
-
-    .. code-block:: none
-
-        python3.8 -m pip install --user -U setuptools wheel
-        python3.8 -m pip install --user -U Red-DiscordBot
-
 To install without additional config backend support:

 .. code-block:: none

-    python3.8 -m pip install -U setuptools wheel
-    python3.8 -m pip install -U Red-DiscordBot
+    python -m pip install -U pip setuptools wheel
+    python -m pip install -U Red-DiscordBot

 Or, to install with PostgreSQL support:

 .. code-block:: none

-    python3.8 -m pip install -U setuptools wheel
-    python3.8 -m pip install -U Red-DiscordBot[postgres]
+    python -m pip install -U pip setuptools wheel
+    python -m pip install -U Red-DiscordBot[postgres]


+.. note::
+
+    These commands are also used for updating Red
+
 --------------------------
 Setting Up and Running Red
 --------------------------
--- a/docs/install_windows.rst
+++ b/docs/install_windows.rst
@@ -64,6 +64,13 @@ Manually installing dependencies

 .. _installing-red-windows:

+------------------------------
+Creating a Virtual Environment
+------------------------------
+
+We require installing Red into a virtual environment. Don't be scared, it's very
+straightforward. See the section `installing-in-virtual-environment`.
+
 --------------
 Installing Red
 --------------
@@ -72,34 +79,27 @@ Installing Red
               for the PATH changes to take effect.

 1. Open a command prompt (open Start, search for "command prompt", then click it)
-2. Create and activate a virtual environment (strongly recommended), see the section `using-venv`
-3. Run **one** of the following commands, depending on what extras you want installed
-
-  .. note::
-
-      If you're not inside an activated virtual environment, use ``py -3.8`` in place of
-      ``python``, and include the ``--user`` flag with all ``pip install`` commands, like this:
-
-      .. code-block:: none
-
-          py -3.8 -m pip install --user -U setuptools wheel
-          py -3.8 -m pip install --user -U Red-DiscordBot
+2. Run **one** of the following set of commands, depending on what extras you want installed

  * Normal installation:

    .. code-block:: none

-        python -m pip install -U setuptools wheel
+        python -m pip install -U pip setuptools wheel
        python -m pip install -U Red-DiscordBot

  * With PostgreSQL support:

    .. code-block:: none

-        python -m pip install -U setuptools wheel
+        python -m pip install -U pip setuptools wheel
        python -m pip install -U Red-DiscordBot[postgres]


+.. note::
+
+    These commands are also used for updating Red
+
 --------------------------
 Setting Up and Running Red
 --------------------------
--- a/docs/venv_guide.rst
+++ b/docs/venv_guide.rst
@@ -9,14 +9,9 @@ problems. Firstly, simply choose how you'd like to create your virtual environme
 * :ref:`using-venv` (quick and easy, involves two commands)
 * :ref:`using-pyenv-virtualenv` (recommended if you installed Python with pyenv)

-**Why Should I Use a Virtual Environment?**
-
-90% of the installation and setup issues raised in our support channels are resolved when the user
-creates a virtual environment.
-
 **What Are Virtual Environments For?**

-Virtual environments allow you to isolate red's library dependencies, cog dependencies and python
+Virtual environments allow you to isolate Red's library dependencies, cog dependencies and python
 binaries from the rest of your system. It also makes sure Red and its dependencies are installed to
 a predictable location. It makes uninstalling Red as simple as removing a single folder, without
 worrying about losing your data or other things on your system becoming broken.
@@ -31,18 +26,18 @@ python.

 First, choose a directory where you would like to create your virtual environment. It's a good idea
 to keep it in a location which is easy to type out the path to. From now, we'll call it
-``redenv``.
+``redenv`` and it will be located in your home directory.

 ~~~~~~~~~~~~~~~~~~~~~~~~
 ``venv`` on Linux or Mac
 ~~~~~~~~~~~~~~~~~~~~~~~~
 Create your virtual environment with the following command::

-    python3.8 -m venv redenv
+    python3.8 -m venv ~/redenv

 And activate it with the following command::

-    source redenv/bin/activate
+    source ~/redenv/bin/activate

 .. important::

@@ -56,11 +51,11 @@ Continue reading `below <after-activating-virtual-environment>`.
 ~~~~~~~~~~~~~~~~~~~
 Create your virtual environment with the following command::

-    py -3.8 -m venv redenv
+    py -3.8 -m venv %userprofile%\redenv

 And activate it with the following command::

-    redenv\Scripts\activate.bat
+    %userprofile%\redenv\Scripts\activate.bat

 .. important::