diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 996058f3102..4ee04f8e727 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -5,7 +5,7 @@

Warning

This document is for Red's development version, which can be significantly different from previous releases. - If you're a regular user, you should read the Red documentation for the current stable release. + If you're a regular user, you should read the Red documentation for the current stable release.

{% endif %} diff --git a/docs/conf.py b/docs/conf.py index b967f299d28..c280f1b2978 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -139,6 +139,9 @@ "github_user": "Cog-Creators", "github_repo": "Red-DiscordBot", "github_version": "V3/develop", + "version_slug": os.environ.get("READTHEDOCS_VERSION", ""), + "rtd_language": os.environ.get("READTHEDOCS_LANGUAGE", ""), + "READTHEDOCS": os.environ.get("READTHEDOCS", "") == "True", } # Add any paths that contain custom static files (such as style sheets) here, diff --git a/redbot/cogs/downloader/downloader.py b/redbot/cogs/downloader/downloader.py index 267d5e8d1c7..fc496f0c7ed 100644 --- a/redbot/cogs/downloader/downloader.py +++ b/redbot/cogs/downloader/downloader.py @@ -608,7 +608,11 @@ async def _repo_add( else: await ctx.send(_("Repo `{name}` successfully added.").format(name=name)) if repo.install_msg: - await ctx.send(repo.install_msg.replace("[p]", ctx.clean_prefix)) + await ctx.send( + repo.install_msg.replace("[p]", ctx.clean_prefix).replace( + "[botname]", ctx.me.display_name + ) + ) @repo.command(name="delete", aliases=["remove", "del"], require_var_positional=True) async def _repo_del(self, ctx: commands.Context, *repos: Repo) -> None: diff --git a/tools/release_helper.py b/tools/release_helper.py index c6952283498..83a86836298 100755 --- a/tools/release_helper.py +++ b/tools/release_helper.py @@ -324,8 +324,11 @@ def set_release_stage(stage: ReleaseStage) -> None: @click.group(invoke_without_command=True) @click.option("--continue", "abort", flag_value=False, default=None) @click.option("--abort", "abort", flag_value=True, default=None) -def cli(*, abort: Optional[bool] = None): +@click.pass_context +def cli(ctx: click.Context, *, abort: Optional[bool] = None): """Red's release helper, guiding you through the whole process!""" + if ctx.invoked_subcommand is not None: + return stage = get_release_stage() if abort is True: if stage is not ReleaseStage.WELCOME: @@ -397,7 +400,7 @@ def cli(*, abort: Optional[bool] = None): rich.print(Markdown("# Step 8+: Follow the release process documentation")) rich.print( "You can continue following the release process documentation from step 8:\n" - "https://red-devguide.readthedocs.io/core-devs/release-process/" + "https://red-devguide.readthedocs.io/core-devs/release-process/#write-announcement" ) wipe_git_config_values()