Merge branch 'master' of github.com:processing/p5.js-website

Author: lmccart

README.md

@@ -4,7 +4,7 @@
 
 ## How To Contribute
 
-Known bugs and intended new features are tracked using [GitHub issues](https://github.com/processing/p5.js-website/issues). If you'd like to start working on an existing issue, comment on the issue that you plan to work on it so other contributors know it's being handled and can offer help. Once you have completed your work on this issue, [submit a pull request (PR)](https://github.com/processing/p5.js/blob/master/developer_docs/preparing_a_pull_request.md) against the p5.js master branch. In the description field of the PR, include "resolves #XXXX" tagging the issue you are fixing. If the PR addresses the issue but doesn't completely resolve it (ie the issue should remain open after your PR is merged), write "addresses #XXXX".
+Known bugs and intended new features are tracked using [GitHub issues](https://github.com/processing/p5.js-website/issues). If you'd like to start working on an existing issue, comment on the issue that you plan to work on it so other contributors know it's being handled and can offer help. Once you have completed your work on this issue, [submit a pull request (PR)](https://github.com/processing/p5.js/blob/master/contributor_docs/preparing_a_pull_request.md) against the p5.js master branch. In the description field of the PR, include "resolves #XXXX" tagging the issue you are fixing. If the PR addresses the issue but doesn't completely resolve it (ie the issue should remain open after your PR is merged), write "addresses #XXXX".
 
 If you discover a bug or have an idea for a new feature you'd like to add, begin by submitting an issue. Please do not simply submit a pull request containing the fix or new feature without making an issue first, we will probably not be able to accept it. Once you have gotten some feedback on the issue and a go ahead to address it, you can follow the process above to add the fix or feature.
 

contributor_docs/i18n_contribution.md

@@ -200,7 +200,7 @@ In some cases, the text translated from the original .hbs file (written in HTML)
 * The "p5" key in the JSON object contains individual keys for each reference entry, indexed by variable/function/object name.
 * Any entries in the JSON object which are not filled in will be left in English when the page is loaded.
 * This is a somewhat hacky solution and not ideal. However, it comes from balancing the desire to have documentation directly in the source code, with the unwieldiness of having multiple languages of documentation inline. It will be our working solution until a better one is found.
-* The source content for the reference is handled inline in the [p5.js source code](https://github.com/processing/p5.js). See [Inline documentation](https://github.com/processing/p5.js/blob/master/developer_docs/inline_documentation.md) in the p5.js repo for information on how to contribute.
+* The source content for the reference is handled inline in the [p5.js source code](https://github.com/processing/p5.js). See [Inline documentation](https://github.com/processing/p5.js/blob/master/contributor_docs/inline_documentation.md) in the p5.js repo for information on how to contribute.
 
 ### Translation of Examples
 

src/assets/developer-docs/index.html

@@ -21,7 +21,7 @@
       subMaxLevel: 2,
       themeColor: '#ed225d',
       basePath:
-      'https://raw.githubusercontent.com/processing/p5.js/master/developer_docs/',
+      'https://raw.githubusercontent.com/processing/p5.js/master/contributor_docs/',
       logo: '../assets/img/p5js.svg',
       name: 'p5.js Developer Docs',
       repo: 'https://github.com/processing/p5.js',

src/data/learn/learn.json

@@ -74,7 +74,7 @@
   "contributing-to-the-community-title": [
     {
       "name": "development",
-      "url": "https://github.com/processing/p5.js/blob/master/developer_docs/"
+      "url": "https://github.com/processing/p5.js/blob/master/contributor_docs/"
     },
     {
       "name": "looking-inside",
@@ -86,7 +86,7 @@
     },
     {
       "name": "creating-libraries",
-      "url": "https://github.com/processing/p5.js/blob/master/developer_docs/creating_libraries.md"
+      "url": "https://github.com/processing/p5.js/blob/master/contributor_docs/creating_libraries.md"
     }
   ]
-}
+}

src/data/libraries/libraries.ejs

@@ -11,7 +11,7 @@ slug: libraries/
 
     <main id="content">
       <h1>{{#i18n "Libraries"}}{{/i18n}}</h1>
-      
+
       <h2>{{#i18n "using-a-library-title"}}{{/i18n}}</h2>
 
       <p>{{#i18n "using-a-library1"}}{{/i18n}}<a href="{{root}}/reference/#/libraries/dom">p5.dom</a>
@@ -35,7 +35,7 @@ slug: libraries/
       <h2>{{#i18n "create-your-own-title"}}{{/i18n}}</h2>
 
       <p>{{#i18n "create-your-own1"}}{{/i18n}}
-      <a href="https://github.com/processing/p5.js/blob/master/developer_docs/creating_libraries.md">
+      <a href="https://github.com/processing/p5.js/blob/master/contributor_docs/creating_libraries.md">
         {{#i18n "create-your-own2"}}{{/i18n}}</a>
         {{#i18n "create-your-own3"}}{{/i18n}}
         <a href="https://docs.google.com/forms/d/e/1FAIpQLSdWWb95cfvosaIFI7msA7XC5zOEVsNruaA5klN1jH95ESJVcw/viewform" target="_blank">{{#i18n "create-your-own4"}}{{/i18n}}</a></p>
@@ -51,7 +51,7 @@ slug: libraries/
             <div class="left-column">
           <% } else { %>
             <div class="right-column">
-           <% } %>  
+           <% } %>
               <div class="label">
                 <a class="nounderline" href="<%=all[c].url%>" target="_blank">
                   <img alt="" src="{{assets}}/img/libraries/<%=all[c].name.replace(' ', '_')%>.jpg">
@@ -62,7 +62,7 @@ slug: libraries/
             </div>
           <% if (col == 1 || c == all.length - 1) { %>
             <div class="spacer"></div>
-           <% } %>  
+           <% } %>
           <% col = (col+1)%2; %>
         <% } %>
       <% } %>

src/templates/pages/community/developer-docs.hbs

@@ -22,7 +22,7 @@ slug: community/
           subMaxLevel: 2,
           themeColor: '#ed225d',
           basePath:
-          'https://raw.githubusercontent.com/processing/p5.js/master/developer_docs/',
+          'https://raw.githubusercontent.com/processing/p5.js/master/contributor_docs/',
           logo: '../assets/img/p5js.svg',
           name: 'p5.js Developer Docs',
           repo: 'https://github.com/processing/p5.js',

src/templates/pages/community/index.hbs

@@ -54,9 +54,9 @@ slug: community/
       <h2 id="contribute">{{#i18n "contribute-title"}}{{/i18n}}</h2>
       <p>{{#i18n "contribute1"}}{{/i18n}}</p>
 
-      <p><b>{{#i18n "develop-title"}}{{/i18n}}</b> <a href="https://github.com/processing/p5.js" target="blank_">{{#i18n "develop1"}}{{/i18n}}</a>{{#i18n "develop2"}}{{/i18n}} <a href="https://github.com/processing/p5.js/blob/master/developer_docs/" target="blank_">{{#i18n "develop3"}}{{/i18n}} </a> {{#i18n "develop4"}}{{/i18n}} <a href="../libraries/#create-your-own"> {{#i18n "develop5"}}{{/i18n}} </a></p>
+      <p><b>{{#i18n "develop-title"}}{{/i18n}}</b> <a href="https://github.com/processing/p5.js" target="blank_">{{#i18n "develop1"}}{{/i18n}}</a>{{#i18n "develop2"}}{{/i18n}} <a href="https://github.com/processing/p5.js/blob/master/contributor_docs/" target="blank_">{{#i18n "develop3"}}{{/i18n}} </a> {{#i18n "develop4"}}{{/i18n}} <a href="../libraries/#create-your-own"> {{#i18n "develop5"}}{{/i18n}} </a></p>
 
-      <p><b>{{#i18n "document-title"}}{{/i18n}}</b>{{#i18n "document1"}}{{/i18n}}<a href="https://github.com/processing/p5.js-website/wiki/Adding-examples" target="blank_">{{#i18n "document2"}}{{/i18n}}</a>{{#i18n "document3"}}{{/i18n}}<a href="https://github.com/processing/p5.js/blob/master/developer_docs/inline_documentation.md#setup" target="blank_">{{#i18n "document4"}}{{/i18n}}</a>{{#i18n "document5"}}{{/i18n}}</p>
+      <p><b>{{#i18n "document-title"}}{{/i18n}}</b>{{#i18n "document1"}}{{/i18n}}<a href="https://github.com/processing/p5.js-website/wiki/Adding-examples" target="blank_">{{#i18n "document2"}}{{/i18n}}</a>{{#i18n "document3"}}{{/i18n}}<a href="https://github.com/processing/p5.js/blob/master/contributor_docs/inline_documentation.md#setup" target="blank_">{{#i18n "document4"}}{{/i18n}}</a>{{#i18n "document5"}}{{/i18n}}</p>
 
       <p><b>{{#i18n "teach-title"}}{{/i18n}}</b>{{#i18n "teach1"}}{{/i18n}}</p>
 

src/templates/pages/download/index.hbs

@@ -100,7 +100,7 @@ slug: download/
           <li><a href="https://github.com/processing/p5.js/releases">{{#i18n "older-releases"}}{{/i18n}}</a></li>
           <li><a href="https://github.com/processing/p5.js">{{#i18n "github-repository"}}{{/i18n}}</a></li>
           <li><a href="https://github.com/processing/p5.js/issues">{{#i18n "report-bugs"}}{{/i18n}}</a></li>
-          <li><a href="https://github.com/processing/p5.js/blob/master/developer_docs/supported_browsers.md">{{#i18n "supported-browsers"}}{{/i18n}}</a></li>
+          <li><a href="https://github.com/processing/p5.js/blob/master/contributor_docs/supported_browsers.md">{{#i18n "supported-browsers"}}{{/i18n}}</a></li>
         </ul>
 
         <div class="spacer"></div>

src/templates/pages/index.hbs

@@ -14,7 +14,7 @@ slug: /
         <input id='search_field' type="text" size="20" placeholder="Search p5js.org" name="q" >
         <label class="sr-only" for="search_field">Search p5js.org</label>
       </form>
-            
+
       <h1>{{#i18n "p1xh1"}}{{/i18n}}</h1>
       <p style="margin-top:1em">{{#i18n "p1x1"}}{{/i18n}}</p>
       <p>{{#i18n "p1x2"}}{{/i18n}}</p>
@@ -35,7 +35,7 @@ slug: /
         <li>{{#i18n "p4xp3"}}{{/i18n}}</li>
         <li>{{#i18n "p4xp4"}}{{/i18n}}</li>
         <li><a href="https://day.processing.org" target="_blank">{{#i18n "p4xp5"}}{{/i18n}}</a></li>
-        <li><a href="https://github.com/processing/p5.js/tree/master/developer_docs" target="_blank">{{#i18n "p4xp6"}}{{/i18n}}</a></li>
+        <li><a href="https://github.com/processing/p5.js/tree/master/contributor_docs" target="_blank">{{#i18n "p4xp6"}}{{/i18n}}</a></li>
       </ul>
 
     </main>