From 52fb1858b20b2152a4e6a707234acbd87cc51274 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 4 Mar 2015 17:33:12 -0500 Subject: [PATCH] Fix whitespace issues in rst files --- Compile.rst | 26 +++++++++++++------------- Contributing.rst | 2 +- Lua API.rst | 2 +- Readme.rst | 2 +- travis/lint.py | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Compile.rst b/Compile.rst index 002f60dad..ce4449524 100644 --- a/Compile.rst +++ b/Compile.rst @@ -19,7 +19,7 @@ Having a 'git' package installed is the minimal requirement, but some sort of gi The code resides here: https://github.com/DFHack/dfhack If you just want to compile DFHack or work on it by contributing patches, it's quite enough to clone from the read-only address:: - + git clone git://github.com/DFHack/dfhack.git cd dfhack git submodule init @@ -47,7 +47,7 @@ To build Stonesense, you'll also need OpenGL headers. Build ===== Building is fairly straightforward. Enter the ``build`` folder and start the build like this:: - + cd build cmake .. -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=/home/user/DF make install @@ -56,7 +56,7 @@ Obviously, replace the install path with path to your DF. This will build the li along with the normal set of plugins and install them into your DF folder. Alternatively, you can use ccmake instead of cmake:: - + cd build ccmake .. make install @@ -96,15 +96,15 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa 4. Install dependencies Option 1: Using MacPorts: - + * `Install MacPorts `_ * Run ``sudo port install gcc45 +universal cmake +universal git-core +universal`` This will take some time—maybe hours, depending on your machine. - + At some point during this process, it may ask you to install a Java environment; let it do so. Option 2: Using Homebrew: - + * `Install Homebrew `_ and run: * ``brew tap homebrew/versions`` * ``brew install git`` @@ -153,12 +153,12 @@ Snow Leopard Changes ==================== 1. Add a step 6.2a (before Install XML::LibXSLT):: - In a separate Terminal window or tab, run: - ``sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml`` - + In a separate Terminal window or tab, run: + ``sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml`` + 2. Add a step 7a (before building):: - In /library/LuaTypes.cpp, change line 467 to - ``int len = strlen((char*)ptr);`` + In /library/LuaTypes.cpp, change line 467 to + ``int len = strlen((char*)ptr);`` Yosemite Changes ================ @@ -183,7 +183,7 @@ You will need some sort of Windows port of git, or a GUI. Some examples: The code resides here: https://github.com/DFHack/dfhack If you just want to compile DFHack or work on it by contributing patches, it's quite enough to clone from the read-only address:: - + git clone git://github.com/DFHack/dfhack.git cd dfhack git submodule init @@ -241,7 +241,7 @@ Build types variable: ``CMAKE_BUILD_TYPE`` :: - + cmake .. -DCMAKE_BUILD_TYPE:string=BUILD_TYPE Without specifying a build type or 'None', cmake uses the diff --git a/Contributing.rst b/Contributing.rst index a1ec54d1c..8cd21172a 100644 --- a/Contributing.rst +++ b/Contributing.rst @@ -31,7 +31,7 @@ How to get new code into DFHack * Use new branches for each feature/fix so that your changes can be merged independently. * If possible, compile on multiple platforms * Do update NEWS/Contributors.rst -* Do **NOT** run fix-texts.sh or update .html files (except to locally test changes to .rst files) +* Do **NOT** run fix-texts.sh or update .html files (except to locally test changes to .rst files) * Create a Github Pull Request once finished * Work done against `issues `_ that are tagged "bug report" gets priority diff --git a/Lua API.rst b/Lua API.rst index ab5cd1683..cd418a5e2 100644 --- a/Lua API.rst +++ b/Lua API.rst @@ -3383,7 +3383,7 @@ for obscure developer-oriented scripts and scripts used by tools. When calling such scripts, always use '/' as the separator for directories, e.g. ``devel/lua-example``. -Scripts are re-read from disk if they have changed since the last time they were read. +Scripts are re-read from disk if they have changed since the last time they were read. Global variable values persist in memory between calls, unless the file has changed. Every script gets its own separate environment for global variables. diff --git a/Readme.rst b/Readme.rst index c1e3f1b28..ac4953f54 100644 --- a/Readme.rst +++ b/Readme.rst @@ -1323,7 +1323,7 @@ Subcommands that persist until disabled or DF quit: category when discussing an import agreement with the liaison :manager-quantity: Removes the limit of 30 jobs per manager order :civ-view-agreement: Fixes overlapping text on the "view agreement" screen -:nestbox-color: Fixes the color of built nestboxes +:nestbox-color: Fixes the color of built nestboxes :eggs-fertile: Displays a fertility indicator on nestboxes :max-wheelbarrow: Allows assigning more than 3 wheelbarrows to a stockpile :tradereq-pet-gender: Displays pet genders on the trade request screen diff --git a/travis/lint.py b/travis/lint.py index 74be3e853..5d16eca70 100644 --- a/travis/lint.py +++ b/travis/lint.py @@ -1,7 +1,7 @@ import re, os, sys valid_extensions = ['c', 'cpp', 'h', 'hpp', 'mm', 'lua', 'rb', 'proto', - 'init', 'init-example'] + 'init', 'init-example', 'rst'] path_blacklist = [ '^library/include/df/', '^plugins/stonesense/allegro',