Merge pull request #1 from processing/master

merge master

Author: lm-n

.gitignore

@@ -24,6 +24,8 @@ node_modules
 .idea/
 
 src/templates/pages/examples/*
+src/templates/pages/learn/index.hbs
+src/templates/pages/libraries/index.hbs
 src/offline-reference
 !src/templates/pages/examples/.gitkeep
 dist/*

Gruntfile.js

@@ -23,7 +23,9 @@ module.exports = function(grunt) {
       dist: 'dist'
     },
     exec: {
-      build_examples: 'node <%= config.src %>/data/examples/build_examples/build.js <%= config.src %>/templates/pages/examples/'
+      build_examples: 'node <%= config.src %>/data/examples/build_examples/build.js <%= config.src %>/templates/pages/examples/',
+      build_libraries: 'node <%= config.src %>/data/libraries/build.js <%= config.src %>/templates/pages/libraries/',
+      build_learn: 'node <%= config.src %>/data/learn/build.js <%= config.src %>/templates/pages/learn/'
     },
     watch: {
       assemble: {
@@ -316,6 +318,23 @@ module.exports = function(grunt) {
         src: ['**/*'],
         dest: 'p5-reference/'
       }
+    },  
+    htmllint: {
+      all: {
+        src: ['<%= config.dist %>/**/*.html',
+            '!<%= config.dist %>/es/**/*.html',
+            '!<%= config.dist %>/zh-Hans/**/*.html',
+            '!<%= config.dist %>/**/CHANGES.html',
+            '!<%= config.dist %>/**/README.html',
+            '!<%= config.dist %>/**/p5_featured/**/*.html',
+            '!<%= config.dist %>/**/learn/*.html',
+            '!<%= config.dist %>/**/examples/*.html'],
+        options: {
+          ignore: [/^This document appears to be written in English/,
+                  /^Bad value “https:/,
+                  /^Consider adding a “lang” attribute to the “html”/]
+        }
+      }
     }
   });
 
@@ -341,6 +360,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-file-append');
   grunt.loadNpmTasks('grunt-contrib-compress');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
+  grunt.loadNpmTasks('grunt-html');
 
   // multi-tasks: collections of other tasks
   grunt.registerTask('server', [
@@ -368,7 +388,7 @@ module.exports = function(grunt) {
     require("./i18n.js")(done);
   });
 
-  // runs three tasks in order
+  // runs tasks in order
   grunt.registerTask('build', [
     'update-version',
     'exec',
@@ -379,7 +399,8 @@ module.exports = function(grunt) {
     'optimize',
     'file_append',
     'compress',
-    'i18n'
+    'i18n',
+    'htmllint'
   ]);
 
   // runs with just grunt command

README.md

@@ -12,9 +12,10 @@ We recognize all types of contributions. This project follows the [all-contribut
 
 ## Setup
 
-0. Install [node.js](https://nodejs.org/en/download/).
-1. Download this repo as a [zip file](https://github.com/processing/p5.js-website/archive/master.zip) or [clone this repository](https://help.github.com/articles/cloning-a-repository/). 
-2. Navigate to the `p5.js-website` directory in the terminal and type `npm install`.
+0. Ensure Java is installed. Not installed?  Head over to https://java.oracle.com
+1. Install [node.js](https://nodejs.org/en/download/).
+2. Download this repo as a [zip file](https://github.com/processing/p5.js-website/archive/master.zip) or [clone this repository](https://help.github.com/articles/cloning-a-repository/). 
+3. Navigate to the `p5.js-website` directory in the terminal and type `npm install`.
 
 ## Running