summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE4
-rw-r--r--README.md2
-rw-r--r--lib/generate/index.js2
-rw-r--r--lib/generate/plugin.js10
-rw-r--r--package.json2
-rw-r--r--test/plugin.js4
-rw-r--r--theme/stylesheets/book/highlight.less4
-rw-r--r--theme/stylesheets/page/highlight.less4
8 files changed, 16 insertions, 16 deletions
diff --git a/LICENSE b/LICENSE
index ad410e1..3e53c4e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright {yyyy} {name of copyright owner}
+ Copyright 2014 FriendCode Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Apache License
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License. \ No newline at end of file
+ limitations under the License.
diff --git a/README.md b/README.md
index 48a8d71..a633db3 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ GitBook will read the `.gitignore`, `.bookignore` and `.ignore` files to get a l
#### Plugins
-PLugins can used to extend your book functionnalities. Read [GitbookIO/plugin](https://github.com/GitbookIO/plugin) for more informations about how to build a plugin for gitbook.
+Plugins can used to extend your book functionnalities. Read [GitbookIO/plugin](https://github.com/GitbookIO/plugin) for more informations about how to build a plugin for gitbook.
##### Default plugins:
diff --git a/lib/generate/index.js b/lib/generate/index.js
index bbe5ec2..0c3e693 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -166,7 +166,7 @@ var generate = function(options) {
);
})
- // Finish gneration
+ // Finish generation
.then(function() {
return generator.finish();
})
diff --git a/lib/generate/plugin.js b/lib/generate/plugin.js
index 5bd332b..1d56ca0 100644
--- a/lib/generate/plugin.js
+++ b/lib/generate/plugin.js
@@ -15,10 +15,10 @@ var Plugin = function(name) {
this.infos = {};
_.each([
- name,
- "gitbook-"+name,
"gitbook-plugin-"+name,
- "gitbook-theme-"+name
+ "gitbook-theme-"+name,
+ "gitbook-"+name,
+ name,
], function(_name) {
if (this.load(_name)) return false;
}.bind(this));
@@ -112,7 +112,7 @@ Plugin.normalizeNames = function(names) {
.uniq()
.value();
- // Remove plugins starting with
+ // Remove plugins starting with
names = _.filter(names, function(name) {
return !_.contains(toremove, name) && !(name.length > 0 && name[0] == "-");
});
@@ -167,7 +167,7 @@ Plugin.fromList = function(names) {
if (!withTpl) return null;
return withTpl.resolveFile(withTpl.infos.templates[name]);
- }
+ }
});
};
diff --git a/package.json b/package.json
index e95bc60..0ba9156 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gitbook",
- "version": "0.3.0",
+ "version": "0.3.1",
"homepage": "http://www.gitbook.io/",
"description": "Library and cmd utility to generate GitBooks",
"main": "lib/index.js",
diff --git a/test/plugin.js b/test/plugin.js
index 518ea3c..6d09d8a 100644
--- a/test/plugin.js
+++ b/test/plugin.js
@@ -5,7 +5,7 @@ var assert = require('assert');
var Plugin = require('../').generate.Plugin;
describe('Plugin validation', function () {
- var plugin = new Plugin("gitbook-plugin");
+ var plugin = new Plugin("plugin");
it('should be valid', function() {
assert(plugin.isValid());
@@ -41,7 +41,7 @@ describe('Plugin defaults loading', function () {
})
.fin(done);
});
-
+
it('should load defaults addons', function() {
assert(ret != null);
diff --git a/theme/stylesheets/book/highlight.less b/theme/stylesheets/book/highlight.less
index 33e0040..004e7a5 100644
--- a/theme/stylesheets/book/highlight.less
+++ b/theme/stylesheets/book/highlight.less
@@ -1,4 +1,4 @@
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
+/* http://jmblog.github.io/color-themes-for-highlightjs */
/* Tomorrow Comment */
.hljs-comment {
@@ -87,4 +87,4 @@
.xml .css,
.xml .hljs-cdata {
opacity: 0.5;
-} \ No newline at end of file
+}
diff --git a/theme/stylesheets/page/highlight.less b/theme/stylesheets/page/highlight.less
index ae9d1f8..26078cb 100644
--- a/theme/stylesheets/page/highlight.less
+++ b/theme/stylesheets/page/highlight.less
@@ -1,4 +1,4 @@
-/* http://jmblog.github.com/color-themes-for-google-code-highlightjs */
+/* http://jmblog.github.io/color-themes-for-highlightjs */
/* Tomorrow Comment */
.hljs-comment,
@@ -87,4 +87,4 @@
.xml .css,
.xml .hljs-cdata {
opacity: 0.5;
-} \ No newline at end of file
+}