From 5d397ad0b0dfb4b9869dfe936b98cf51bb5de389 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 11 May 2021 19:46:01 -0400 Subject: [PATCH] [cherry-pick] Fix invalid role name Cherry-pick of 001e608aa72ec24002303740acd2061d3fe7e39f Conflicts (used version from master): docs/changelog.txt --- conf.py | 2 +- docs/Core.rst | 2 +- docs/Lua API.rst | 2 +- docs/guides/quickfort-user-guide.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.py b/conf.py index d5ecc3a45..bf1dde2c4 100644 --- a/conf.py +++ b/conf.py @@ -209,7 +209,7 @@ extlinks = { 'bug': ('https://www.bay12games.com/dwarves/mantisbt/view.php?id=%s', 'Bug '), 'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''), - 'source:scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''), + 'source-scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''), 'issue': ('https://github.com/DFHack/dfhack/issues/%s', 'Issue '), 'commit': ('https://github.com/DFHack/dfhack/commit/%s', 'Commit '), } diff --git a/docs/Core.rst b/docs/Core.rst index 4fdecbf63..cb4f8cf8f 100644 --- a/docs/Core.rst +++ b/docs/Core.rst @@ -492,7 +492,7 @@ the root DF folder. .. admonition:: Tip - When developing scripts in the :source:scripts:`dfhack/scripts repo <>`, + When developing scripts in the :source-scripts:`dfhack/scripts repo <>`, it may be useful to add the path to your local copy of the repo with ``+``. This will allow you to make changes in the repo and have them take effect immediately, without needing to re-install or copy scripts over manually. diff --git a/docs/Lua API.rst b/docs/Lua API.rst index 764e56dd6..020bd2191 100644 --- a/docs/Lua API.rst +++ b/docs/Lua API.rst @@ -4377,7 +4377,7 @@ the extension omitted. For example: Scripts can also be placed in other folders - by default, these include :file:`raw/scripts` and :file:`data/save/{region}/raw/scripts`, but additional folders can be added (for example, a copy of the -:source:scripts:`scripts repository <>` for local development). See +:source-scripts:`scripts repository <>` for local development). See `script-paths` for more information on how to configure this behavior. If the first line of the script is a one-line comment (starting with ``--``), diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst index 89d1d4997..b539279c3 100644 --- a/docs/guides/quickfort-user-guide.rst +++ b/docs/guides/quickfort-user-guide.rst @@ -1564,7 +1564,7 @@ Links - :source:`Quickfort blueprints library ` - :forums:`Quickfort forum thread <176889>` - :issue:`DFHack issue tracker <>` -- :source:scripts:`Quickfort source code ` +- :source-scripts:`Quickfort source code ` **Related tools:**