diff --git a/conf.py b/conf.py index 280b2f81f..d5ecc3a45 100644 --- a/conf.py +++ b/conf.py @@ -202,11 +202,11 @@ extensions = [ # short alias names to a base URL and a prefix. # See http://sphinx-doc.org/ext/extlinks.html extlinks = { - 'wiki': ('http://dwarffortresswiki.org/%s', ''), + 'wiki': ('https://dwarffortresswiki.org/%s', ''), 'forums': ('http://www.bay12forums.com/smf/index.php?topic=%s', 'Bay12 forums thread '), - 'dffd': ('http://dffd.bay12games.com/file.php?id=%s', 'DFFD file '), - 'bug': ('http://www.bay12games.com/dwarves/mantisbt/view.php?id=%s', + 'dffd': ('https://dffd.bay12games.com/file.php?id=%s', 'DFFD file '), + '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', ''), diff --git a/docs/Compile.rst b/docs/Compile.rst index 5292f758d..7e2709e74 100644 --- a/docs/Compile.rst +++ b/docs/Compile.rst @@ -368,7 +368,7 @@ Dependencies and system set-up both 32-bit and 64-bit variants. Homebrew also doesn't require constant use of ``sudo``. - Using `Homebrew `_ (recommended):: + Using `Homebrew `_ (recommended):: brew tap homebrew/versions brew install git @@ -403,14 +403,14 @@ Dependencies and system set-up * In a separate, local Perl install Rather than using system Perl, you might also want to consider - the Perl manager, `Perlbrew `_. + the Perl manager, `Perlbrew `_. This manages Perl 5 locally under ``~/perl5/``, providing an easy way to install Perl and run CPAN against it without ``sudo``. It can maintain multiple Perl installs and being local has the benefit of easy migration and insulation from OS issues and upgrades. - See http://perlbrew.pl/ for more details. + See https://perlbrew.pl/ for more details. Building -------- @@ -521,7 +521,7 @@ To install Chocolatey and the required dependencies: You can now use all of these utilities from any normal ``cmd.exe`` window. You only need Admin/elevated ``cmd.exe`` for running ``choco install`` commands; for all other purposes, including compiling DFHack, you should use -a normal ``cmd.exe`` (or, better, an improved terminal like `Cmder `_; +a normal ``cmd.exe`` (or, better, an improved terminal like `Cmder `_; details below, under Build.) **NOTE**: you can run the above ``choco install`` command even if you already have @@ -548,7 +548,7 @@ Some examples: CMake ^^^^^ You can get the win32 installer version from -`the official site `_. +`the official site `_. It has the usual installer wizard. Make sure you let it add its binary folder to your binary search PATH so the tool can be later run from anywhere. @@ -621,7 +621,7 @@ due to the tiny window size and extremely limited scrollback. For that reason yo may prefer to compile in the IDE which will always show all build output. Alternatively (or additionally), consider installing an improved Windows terminal -such as `Cmder `_. Easily installed through Chocolatey with: +such as `Cmder `_. Easily installed through Chocolatey with: ``choco install cmder -y``. **Note for Cygwin/msysgit users**: It is also possible to compile DFHack from a diff --git a/docs/Core.rst b/docs/Core.rst index 0f83b8c5a..f18adfdc1 100644 --- a/docs/Core.rst +++ b/docs/Core.rst @@ -511,5 +511,5 @@ This section is for odd but important notes that don't fit anywhere else. Older versions are available here_. *These files will eventually be migrated to GitHub.* (see :issue:`473`) - .. _DFFD: http://dffd.bay12games.com/search.php?string=DFHack&id=15&limit=1000 - .. _here: http://dethware.org/dfhack/download + .. _DFFD: https://dffd.bay12games.com/search.php?string=DFHack&id=15&limit=1000 + .. _here: https://dethware.org/dfhack/download diff --git a/docs/Documentation.rst b/docs/Documentation.rst index f447d8e2b..03531998e 100644 --- a/docs/Documentation.rst +++ b/docs/Documentation.rst @@ -6,13 +6,13 @@ DFHack Documentation System DFHack documentation, like the file you are reading now, is created as ``.rst`` files, -which are in `reStructuredText (reST) `_ format. +which are in `reStructuredText (reST) `_ format. This is a documentation format common in the Python community. It is very similar in concept - and in syntax - to Markdown, as found on GitHub and many other places. However it is more advanced than Markdown, with more features available when compiled to HTML, such as automatic tables of contents, cross-linking, special external links (forum, wiki, etc) and more. The documentation is compiled by a -Python tool, `Sphinx `_. +Python tool, `Sphinx `_. The DFHack build process will compile the documentation, but this is disabled by default due to the additional Python and Sphinx requirements. You typically diff --git a/docs/History.rst b/docs/History.rst index d382b351e..dc02d02b0 100644 --- a/docs/History.rst +++ b/docs/History.rst @@ -227,7 +227,7 @@ Internals Lua --- -- Lua has been updated to 5.3 - see http://www.lua.org/manual/5.3/readme.html for details +- Lua has been updated to 5.3 - see https://www.lua.org/manual/5.3/readme.html for details - Floats are no longer implicitly converted to integers in DFHack API calls diff --git a/docs/Introduction.rst b/docs/Introduction.rst index 7d510422f..f7525cb4f 100644 --- a/docs/Introduction.rst +++ b/docs/Introduction.rst @@ -8,7 +8,7 @@ DFHack is a Dwarf Fortress memory access library, distributed with a wide variety of useful scripts and plugins. The project is currently hosted `on GitHub `_, -and can be downloaded from `the releases page `_ +and can be downloaded from `the releases page `_ - see `installing` for installation instructions. This is also where the `DFHack bug tracker `_ is hosted. diff --git a/docs/Lua API.rst b/docs/Lua API.rst index 9ce2c3379..9807e8e1b 100644 --- a/docs/Lua API.rst +++ b/docs/Lua API.rst @@ -9,7 +9,7 @@ DFHack Lua API DFHack has extensive support for the Lua_ scripting language, providing access to: -.. _Lua: http://www.lua.org +.. _Lua: https://www.lua.org 1. Raw data structures used by the game. 2. Many C++ functions for high-level access to these @@ -39,7 +39,7 @@ DF data structure wrapper :local: Data structures of the game are defined in XML files located in :file:`library/xml` -(and `online `_, and automatically exported +(and `online `_, and automatically exported to lua code as a tree of objects and functions under the ``df`` global, which also broadly maps to the ``df`` namespace in the headers generated for C++. diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst index 8efa9e0cd..d88f10f0a 100644 --- a/docs/guides/quickfort-user-guide.rst +++ b/docs/guides/quickfort-user-guide.rst @@ -1145,7 +1145,7 @@ This section walks through the "Dreamfort" blueprints found in the DFHack blueprint library, highlighting design choices and showcasing practical techniques that can help you create better blueprints. Note that this is not a guide for how to design the best forts (there is plenty about that `on the wiki -`__). This is +`__). This is essentially an extended tips and tricks section focused on how to make usable and useful quickfort blueprints that will save you time and energy. diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp index 237014209..1ea958f5b 100644 --- a/plugins/tweak/tweak.cpp +++ b/plugins/tweak/tweak.cpp @@ -866,7 +866,6 @@ static command_result tweak(color_ostream &out, vector ¶meters) } // case #1: migrants who have the resident flag set - // see http://dffd.wimbli.com/file.php?id=6139 for a save if (unit->flags2.bits.resident) unit->flags2.bits.resident = 0;