From 413a61423a712871c9025e00eef40f590b5eb0e4 Mon Sep 17 00:00:00 2001
From: PeridexisErrant <PeridexisErrant@gmail.com>
Date: Sun, 25 Oct 2015 10:14:09 +1100
Subject: [PATCH] Tweak docs building

Trying to save the warnings to a file only works if the directory
exists.  Also fix digfort docs error.
---
 .gitignore         | 2 +-
 CMakeLists.txt     | 2 +-
 scripts/digfort.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63bd079c3..70ccb0445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ buntu
 build/VC2010
 
 # Sphinx generated documentation
-docs/_*/
+docs/_*
 docs/html/
 
 #except for the real one
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5d343ee4..20a964998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,7 +224,7 @@ if (BUILD_DOCS)
       -c "${CMAKE_CURRENT_SOURCE_DIR}/docs"
       "${CMAKE_CURRENT_SOURCE_DIR}"
       "${CMAKE_CURRENT_SOURCE_DIR}/docs/html"
-      -w "${CMAKE_CURRENT_SOURCE_DIR}/docs/_build/sphinx-warnings.txt"
+      -w "${CMAKE_CURRENT_SOURCE_DIR}/docs/_sphinx-warnings.txt"
     DEPENDS ${SPHINX_DEPS}
     COMMENT "Building HTML documentation with Sphinx"
   )
diff --git a/scripts/digfort.rb b/scripts/digfort.rb
index 0a0853cfd..4803e22c8 100644
--- a/scripts/digfort.rb
+++ b/scripts/digfort.rb
@@ -10,10 +10,10 @@ Your plan should be stored in a .csv file like this::
 
     # this is a comment
     d;d;u;d;d;skip this tile;d
-    d;d;d;i
+    d;d;d;j
 
 Available tile shapes are named after the 'dig' menu shortcuts:
-``d`` for dig, ``u`` for upstairs, ``d`` downstairs, ``i`` updown,
+``d`` for dig, ``u`` for upstairs, ``d`` downstairs, ``j`` updown,
 ``h`` channel, ``r`` upward ramp, ``x`` remove designation.
 Unrecognized characters are ignored (eg the 'skip this tile' in the sample).