summaryrefslogtreecommitdiffstats
path: root/docs/Rakefile
diff options
context:
space:
mode:
authorAndrew O'Brien <obrien.andrew@gmail.com>2015-04-21 08:00:28 -0400
committerNicolas Williams <nico@cryptonector.com>2015-04-22 11:01:39 -0500
commit943090846f1b1836478dddeb83172a21bf51392b (patch)
tree5aa5658c99d028e80945dbb415103cab9e53ee12 /docs/Rakefile
parent2dc8621d05f616f0e656ad6debfede2c3567bbb8 (diff)
Fixes manual generation with psych
When running `make` I ran into a couple of problems building the manual. While I'm not entirely sure that this is the root cause, it appears to have been related to the fact that ruby 2.0 dropped syck completely in favor of psych (which was introduced in 1.9.2) for YAML processing. I'm currently using ruby 2.1.0p0. I'm assuming that the fact that the YAML engine was explicitly set to syck in the Rakefile was an attempt to work around some incompatibility between the two libraries, so I looked into what would be necessary to get it to work with the newer one. The changes to `manual.yml` ended up being pretty minor: I ran it through `iconv` to convert some ISO-8859-1 characters to UTF-8 and added some quotes in places (apparently you can't start a string value with '`').
Diffstat (limited to 'docs/Rakefile')
-rw-r--r--docs/Rakefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/Rakefile b/docs/Rakefile
index 67cdeb28..167ee87d 100644
--- a/docs/Rakefile
+++ b/docs/Rakefile
@@ -87,7 +87,6 @@ task :binaries => ["output/download"] do
end
def load_manual
- YAML::ENGINE.yamler = 'syck'
YAML::load(File.open("content/3.manual/manual.yml"))
end