MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix whitespace issues in rst files

develop
lethosor 2015-03-04 17:33:12 -05:00
parent 284b4832bc
commit 52fb1858b2
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Compile.rst
Unescape Escape View File

@ -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 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:: 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 git clone git://github.com/DFHack/dfhack.git
cd dfhack cd dfhack
git submodule init git submodule init
@ -47,7 +47,7 @@ To build Stonesense, you'll also need OpenGL headers.
Build Build
===== =====
Building is fairly straightforward. Enter the ``build`` folder and start the build like this:: Building is fairly straightforward. Enter the ``build`` folder and start the build like this::
cd build cd build
cmake .. -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=/home/user/DF cmake .. -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=/home/user/DF
make install 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. along with the normal set of plugins and install them into your DF folder.
Alternatively, you can use ccmake instead of cmake:: Alternatively, you can use ccmake instead of cmake::
cd build cd build
ccmake .. ccmake ..
make install make install
@ -96,15 +96,15 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa
4. Install dependencies 4. Install dependencies
Option 1: Using MacPorts: Option 1: Using MacPorts:
* `Install MacPorts <http://www.macports.org/>`_ * `Install MacPorts <http://www.macports.org/>`_
* Run ``sudo port install gcc45 +universal cmake +universal git-core +universal`` * Run ``sudo port install gcc45 +universal cmake +universal git-core +universal``
This will take some time—maybe hours, depending on your machine. 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. At some point during this process, it may ask you to install a Java environment; let it do so.
Option 2: Using Homebrew: Option 2: Using Homebrew:
* `Install Homebrew <http://brew.sh/>`_ and run: * `Install Homebrew <http://brew.sh/>`_ and run:
* ``brew tap homebrew/versions`` * ``brew tap homebrew/versions``
* ``brew install git`` * ``brew install git``
@ -153,12 +153,12 @@ Snow Leopard Changes
==================== ====================
1. Add a step 6.2a (before Install XML::LibXSLT):: 1. Add a step 6.2a (before Install XML::LibXSLT)::
In a separate Terminal window or tab, run: In a separate Terminal window or tab, run:
``sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml`` ``sudo ln -s /usr/include/libxml2/libxml /usr/include/libxml``
2. Add a step 7a (before building):: 2. Add a step 7a (before building)::
In <dfhack directory>/library/LuaTypes.cpp, change line 467 to In <dfhack directory>/library/LuaTypes.cpp, change line 467 to
``int len = strlen((char*)ptr);`` ``int len = strlen((char*)ptr);``
Yosemite Changes 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 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:: 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 git clone git://github.com/DFHack/dfhack.git
cd dfhack cd dfhack
git submodule init git submodule init
@ -241,7 +241,7 @@ Build types
variable: ``CMAKE_BUILD_TYPE`` variable: ``CMAKE_BUILD_TYPE``
:: ::
cmake .. -DCMAKE_BUILD_TYPE:string=BUILD_TYPE cmake .. -DCMAKE_BUILD_TYPE:string=BUILD_TYPE
Without specifying a build type or 'None', cmake uses the Without specifying a build type or 'None', cmake uses the

2
Contributing.rst
Unescape Escape View File

@ -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. * Use new branches for each feature/fix so that your changes can be merged independently.
* If possible, compile on multiple platforms * If possible, compile on multiple platforms
* Do update NEWS/Contributors.rst * 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 * Create a Github Pull Request once finished
* Work done against `issues <http://github.com/DFHack/dfhack/issues>`_ that are tagged "bug report" gets priority * Work done against `issues <http://github.com/DFHack/dfhack/issues>`_ that are tagged "bug report" gets priority

2
Lua API.rst
Unescape Escape View File

@ -3383,7 +3383,7 @@ for obscure developer-oriented scripts and scripts used by tools.
When calling such scripts, always use '/' as the separator for When calling such scripts, always use '/' as the separator for
directories, e.g. ``devel/lua-example``. 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. Global variable values persist in memory between calls, unless the file has changed.
Every script gets its own separate environment for global Every script gets its own separate environment for global
variables. variables.

2
Readme.rst
Unescape Escape View File

@ -1323,7 +1323,7 @@ Subcommands that persist until disabled or DF quit:
category when discussing an import agreement with the liaison category when discussing an import agreement with the liaison
:manager-quantity: Removes the limit of 30 jobs per manager order :manager-quantity: Removes the limit of 30 jobs per manager order
:civ-view-agreement: Fixes overlapping text on the "view agreement" screen :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 :eggs-fertile: Displays a fertility indicator on nestboxes
:max-wheelbarrow: Allows assigning more than 3 wheelbarrows to a stockpile :max-wheelbarrow: Allows assigning more than 3 wheelbarrows to a stockpile
:tradereq-pet-gender: Displays pet genders on the trade request screen :tradereq-pet-gender: Displays pet genders on the trade request screen

2
travis/lint.py
Unescape Escape View File

@ -1,7 +1,7 @@
import re, os, sys import re, os, sys
valid_extensions = ['c', 'cpp', 'h', 'hpp', 'mm', 'lua', 'rb', 'proto', valid_extensions = ['c', 'cpp', 'h', 'hpp', 'mm', 'lua', 'rb', 'proto',
'init', 'init-example'] 'init', 'init-example', 'rst']
path_blacklist = [ path_blacklist = [
'^library/include/df/', '^library/include/df/',
'^plugins/stonesense/allegro', '^plugins/stonesense/allegro',