Bump version to 2.0.0-beta.3

CHANGES.md

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0-beta.3
+- Fix odd cases with code blocks escaping
+
+## 2.0.0-beta.2
+- Fix definition of entry point title using SUMMARY.md
+
+## 2.0.0-beta.1
+- Fix windows incompatibility
+- Add support for rtl (enabled by default for `ar` and `fa`)
+- Escape code blocks in markdown parser
+- Add Persian/Farsi translation (`fa`)
+- Add Arabic translation (`ar`)
+- Add Bengali translation (`bn`)
+- Provide generator name in template context
+
 ## 2.0.0-alpha.9
 - Fix links in sidebar
 - Fix normalization of html link (README to index)

bin/gitbook.js

@@ -3,5 +3,5 @@
 var color = require('bash-color');
 
 console.log(color.red("You need to install 'gitbook-cli' to have access to the gitbook command anywhere on your system."));
-console.log(color.red("If you've installe this package globally, you need to uninstall it."));
+console.log(color.red("If you've installed this package globally, you need to uninstall it."));
 console.log(color.red(">> Run 'npm uninstall -g gitbook' then 'npm install -g gitbook-cli'"));

lib/book.js

@@ -420,6 +420,7 @@ Book.prototype.parseSummary = function() {
 		.then(function(content) {
 			return summary.parser.summary(content, {
 				entryPoint: that.readmeFile,
+                entryPointTitle: "",
 				files: that.files
 			});
 		});

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "2.0.0-beta.1",
+    "version": "2.0.0-beta.3",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
@@ -12,7 +12,7 @@
         "resolve": "0.6.3",
         "fs-extra": "0.16.5",
         "fstream-ignore": "1.0.2",
-        "gitbook-parsers": "0.5.2",
+        "gitbook-parsers": "0.5.4",
         "nunjucks": "git+https://github.com/mozilla/nunjucks.git#0f8b21b8df7e8e852b2e1889388653b7075f0d09",
         "nunjucks-autoescape": "0.1.1",
         "nunjucks-filter": "0.1.0",

test/parsing.js

@@ -71,12 +71,12 @@ describe('Book parsing', function () {
 
         assert.equal(_.size(NAVIGATION), 2);
         assert(NAVIGATION["intro.md"])
-        assert.equal(NAVIGATION["intro.md"].title, "Introduction");
+        assert.equal(NAVIGATION["intro.md"].title, "");
         assert.equal(NAVIGATION["intro.md"].prev, null);
         assert.equal(NAVIGATION["intro.md"].next.title, "Article 1");
 
         assert.equal(NAVIGATION["sub/test1.md"].title, "Article 1");
-        assert.equal(NAVIGATION["sub/test1.md"].prev.title, "Introduction");
+        assert.equal(NAVIGATION["sub/test1.md"].prev.title, "");
         assert.equal(NAVIGATION["sub/test1.md"].next, null);
     });
 });

theme/templates/website/includes/summary.html

@@ -8,7 +8,7 @@
                         {% if item.level != "0" %}
                             <b>{{ item.level }}.</b>
                         {% endif %}
-                        {% if item.introduction %}{% i18n "SUMMARY_INTRODUCTION" %}Introduction{% endi18n %}{% else %}{{ item.title }}{% endif %}
+                        {% if item.introduction and not item.title %}{% i18n "SUMMARY_INTRODUCTION" %}Introduction{% endi18n %}{% else %}{{ item.title }}{% endif %}
                     </a>
                 {% else %}
                     <a target="_blank" href="{{ item.path }}">