Adding latest minor and docco documentation.

afaden · Apr 9, 2014 · 8501366 · 8501366
2 parents b430603 + fba27ca
commit 8501366
Show file tree

Hide file tree

Showing 154 changed files with 5,462 additions and 2,282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ docs*
 *.DS_Store
 .idea
 bower_components/
-test/pluginified/latest.js
+test/pluginified/latest.js
+docco
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -376,15 +376,22 @@ module.exports = function (grunt) {
 			}
 		},
 		docco: {
-			dev: {
-				src: [
-					'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
-					'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
-					'!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js','!**/*_test.js'
+			options: {
+				dst: 'docco/',
+				layout : 'parallel',
+				css : 'resources/docco.css'
+			},
+			docs: {
+				files : [
+					{
+						src : [
+							'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
+							'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
+							'!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js','!**/*_test.js'
+						],
+						expand : true
+					}
 				],
-				options: {
-					output: 'docco/'
-				}
 			}
 		},
 		plato: {
@@ -450,7 +457,7 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-shell');
 	grunt.loadNpmTasks('bitovi-tools');
 	grunt.loadNpmTasks('grunt-jsbeautifier');
-	grunt.loadNpmTasks('grunt-docco');
+	grunt.loadNpmTasks('grunt-docco2');
 	grunt.loadNpmTasks('grunt-plato');
 
 	grunt.registerTask('quality', [ 'jsbeautifier', 'jshint']);

diff --git a/component/component.md b/component/component.md
@@ -3,7 +3,7 @@
 @test can/component/test.html
 @parent canjs
 @release 2.0
-@link ../docco/component.html docco
+@link ../docco/component/component.html docco
 
 
 @description Create widgets that use a template, a view-model