Gh pages ud3 (#790)

* es6 changes and node andnpm version update

* Update index.pug

* Update token.md

* modify vitalik's website (#766)

* Update crowdsale.md (#765)

The token is actually defined as an interface not a contract

* Update footer 2017 -> 2018 (#764)

* A tiny typo fix (#762)

* Update recipes.pug (#757)

* Update index.pug (#756)

* Update Ether FAQ (#752)

* Docs improvement to match interface (#751)

Case & space now better match interface.
Comment naming step unnecessarily confuses due to interface mismatch.  
Also, some grammar cleanup.

* Updating deprecated .send(...) to .transfer(...) (#734)

.send(...) is now deprecated.
Send vs transfer comparsion:
https://vomtom.at/solidity-send-vs-transfer/
Also the Solidity by Example Documentation got updated and now uses the .transfer() function.
http://solidity.readthedocs.io/en/develop/solidity-by-example.html
We dont need to use require, as transfer fully propagates errors.

* Update contract Token name (#732)

It should be "contract Token", not "contract token".
Also transferFrom is missing in the contract, added it to contract Token.

* English grammatical mistakes (#767)

* Corrected English grammatical mistake

* Corrected English grammatical mistake

* Gh pages 2017 01 04 (#768)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* update dependencies

* new build

* update 2018 dates

* update 2018

* Develop (#727)

* fixes Greeter tutorial see #14738

* removes unneeded kine

* tidy grammer slightly

* Update Timeline.md ethereum -> Ethereum

* Fix Constructor word typo

Fix Constructor word typo

* Fixed phrase for better clarity. (#776)

"The console has auto completion and history support"
was changed to:
"The console has auto completion of commands and command-history support"

* Rephrased for better clarity.

Changed:
generate an account
to:
create an account

*  Used 'CAUTION' to highlight POTENTIAL MONEY LOSS.

'CAUTION' is a more suitable word than 'ATTENTION', in order to highlight POTENTIAL MONEY LOSS.
For reference, on Technical Writing, visit:
http://www.stevensstrategic.com/technical-writing-the-difference-between-warnings-and-cautions/

* remove duplicated line

this line had been duplicated
"If you have not installed a compiler, then you need to install one. You can find [instructions for installing Solidity here](http://solidity.readthedocs.io/en/develop/installing-solidity.html)."

* Add necessary 'public' to function in tutorial

Without adding 'public' to that line of code, Ethereum Wallet returns the error:

No visibility specified. Defaulting to "public".
    function Token(uint256 initialSupply)  {
    ^
Spanning multiple lines.

Proposing to add that in so tutorial takers don't run into this error, get confused, etc.

* missing '>'

* [admin.nodeInfo.nodeURL] >> [admin.nodeInfo.enode]

The command 'admin.nodeInfo.nodeURL', results in 'undefined', in the recent version of Geth.
Here is the actual output, based on the recent version of Geth:

myMac:console2 admin$ geth attach ipc:../node2/geth.ipc 
Welcome to the Geth JavaScript console!

instance: Geth/v1.7.3-stable/darwin-amd64/go1.9.2
coinbase: 0x3fd97155061e47960b59b563a178fa248493017c
at block: 2 (Thu, 11 Jan 2018 20:25:58 +04)
 datadir: /Users/admin/EtherNet/testnet/node2
 modules: admin:1.0 clique:1.0 debug:1.0 eth:1.0 miner:1.0 net:1.0 personal:1.0 rpc:1.0 txpool:1.0 web3:1.0

> web3.eth.accounts
["0x3fd97155061e47960b59b563a178fa248493017c"]
> admin.nodeInfo.nodeURL
undefined
> admin.nodeInfo.enode
"enode://f48fcf69ba27442ff3813912ec12ea1ad249f14739dabfcadb3985c3654540e047700030adba5800bf33d0adbdd9ca5f1c47aae2498a0d9dafb8c2fd730969b4@[::]:3002?discport=0"
>

* Follow correct style guide for code

* Update Greeter tutorial to comply with change in Remix's UI (#779)

* Clarifications on installing Solc vs using Remix

* update docs to reflect Remix GUI change

* Clarifications on retrieving ABI from Remix

* formatting cleanup

* Fixed app.js and updated /dist

* Add error handling to Greeter tutorial (#774)

* Add error handling to Greeter tutorial

While trying to get up and running with contract deployment through geth, I spent multiple hours trying to debug the `greeterFactory.new(...)` command in this tutorial without realizing that I was getting an "Error: exceeds block gas limit" error. This change makes it so that the console will log if contract deployment fails.

* Use early return for error handling.

* Removed the Ethereum Alarm Clock (#729)

Removed the Ethereum Alarm Clock as it is not available on all networks

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* Update Foundation Page (#789)

* updating foundation page

* updating foundation page again

* update/fix on foundation page

* updating greeter to the current on on gh-pages

* update to foundation page

app.js

@@ -1,10 +1,11 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('serve-favicon');
-var bodyParser = require('body-parser');
+const express = require('express');
+const path = require('path');
+const favicon = require('serve-favicon');
+const bodyParser = require('body-parser');
 
 // Init the app
-var app = express();
+
+const app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
@@ -17,109 +18,105 @@ app.use(express.static(path.join(__dirname, 'dist')));
 app.set('port', process.env.PORT || 8080);
 
 // Routes
-app.get('/', function(req, res) {
-	res.render('index');
+app.get('/', (request, response) => {
+	response.render('index');
 });
 
-app.get('/wallet', function(req, res) {
-	res.render('wallet')
+app.get('/wallet', (request, response) => {
+	response.render('wallet')
 });
 
-app.get('/cli', function(req, res) {
-	res.render('cli');
+app.get('/cli', (request, response) => {
+	response.render('cli');
 });
 
-app.get('/ether', function(req, res) {
-	res.render('ether');
+app.get('/ether', (request, response) => {
+	response.render('ether');
 });
 
-app.get('/greeter', function(req, res) {
-	res.render('greeter');
+app.get('/greeter', (request, response) => {
+	response.render('greeter');
 });
 
-app.get('/token', function(req, res) {
-	res.render('token');
+app.get('/token', (request, response) => {
+	response.render('token');
 });
 
-app.get('/crowdsale', function(req, res) {
-	res.render('crowdsale');
+app.get('/crowdsale', (request, response) => {
+	response.render('crowdsale');
 });
 
-app.get('/dao', function(req, res) {
-	res.render('dao');
+app.get('/dao', (request, response) => {
+	response.render('dao');
 });
 
-app.get('/agreement', function(req, res) {
-	res.render('agreement');
+app.get('/agreement', (request, response) => {
+	response.render('agreement');
 });
 
-app.get('/assets', function(req, res) {
-	res.render('assets');
+app.get('/assets', (request, response) => {
+	response.render('assets');
 });
 
-app.get('/brand', function(req, res) {
-	res.render('brand');
+app.get('/brand', (request, response) => {
+	response.render('brand');
 });
 
-app.get('/foundation', function(req, res) {
-	res.render('foundation');
+app.get('/foundation', (request, response) => {
+	response.render('foundation');
 });
 
-app.get('/donate', function(req, res) {
-	res.render('donate');
+app.get('/donate', (request, response) => {
+	response.render('donate');
 });
 
-app.get('/devgrants', function(req, res) {
-	res.render('devgrants');
+app.get('/devgrants', (request, response) => {
+	response.render('devgrants');
 });
 
-app.get('/swarm', function(req, res) {
-	res.render('swarm');
+app.get('/devcontwo', (request, response) => {
+	response.render('devcon2');
 });
 
-app.get('/privacy-policy', function(req, res) {
-	res.render('privacy-policy');
+app.get('/swarm', (request, response) => {
+	response.render('swarm');
 });
 
-app.get('/cookie-policy', function(req, res) {
-	res.render('cookie-policy');
+app.get('/privacy-policy',(request, response) => {
+	response.render('privacy-policy');
 });
 
-app.get('/terms-of-use', function(req, res) {
-	res.render('terms-of-use');
+app.get('/cookie-policy',(request, response) => {
+	response.render('cookie-policy');
 });
-// catch 404 and forward to error handler
-app.use(function(req, res, next) {
-	var err = new Error('Not Found');
-	err.status = 404;
-
-	// respond with html page
-	if (req.accepts('html')) {
-	    res.render('404', { url: req.url });
-	    return;
-	}
-
-	next(err);
+
+app.get('/terms-of-use', (request, response) => {
+	response.render('terms-of-use');
+});
+
+app.get('/*', (request,response,next) => {
+		let errStatus = 404;
+
+		// respond with html page
+		if (request.accepts('html')) {
+				response.render('404', { url: request.url });
+				return;
+		}else{
+			 response.status(errStatus).end();
+		}
+
 });
 
 // error handlers
 if (app.get('env') === 'development') {
-	app.use(function(err, req, res, next) {
-		res.status(err.status || 500);
-		res.render('error', {
+	// development error handler(Not needed for now)
+	app.use((err, request, response, next) => {
+		response.status(err.status || 500);
+		response.render('error', {
 			message: err.message,
 			error: err
 		});
 	});
 }
 
-// production error handler
-app.use(function(err, req, res, next) {
-	res.status(err.status || 500);
-	res.render('error', {
-		message: err.message,
-		error: {}
-	});
-});
-
 module.exports = app;

dist/cli.html

@@ -105,7 +105,7 @@ <h4>Connecting to a private test net</h4>
 <p>Replace 12345 with any random number you want to use as the network ID. It's a good idea to change the content of the genesis block because if someone accidentally connects to your testnet using the real chain, your local copy will be considered a stale fork and updated to the <em>&quot;real&quot;</em> one. Changing the datadir also changes your local copy of the blockchain, otherwise, in order to successfully mine a block, you would need to mine against the difficulty of the last block present in your local copy of the blockchain - which may take several hours.</p>
 <p>If you want to create a private network you should, for security reasons, use a different genesis block (a database that contains all the transactions from the Ether sales). You can <a href="https://blog.ethereum.org/2015/07/27/final-steps/">read our announcement blog post on how to generate your file</a>. In the near future we will provide better ways to get other genesis blocks.</p>
 <p>These commands prevent anyone who doesn't know your chosen — secret — nonce, network id and genesis file, from connecting to you or providing you with unwanted data. If you <em>want</em> to connect to other peers and create a small private network of multiple computers they will all need to use the same networkid and an identical genesis block. You will also have to help each node find the others. To do that, first you need your own Node URL:</p>
-<pre><code>admin.nodeInfo.NodeUrl
+<pre><code>admin.nodeInfo.enode
 </code></pre>
 <p>Which will return your node url - make a note of it and then on the other clients, tell them to add your peer by executing this command:</p>
 <pre><code>admin.addPeer(&quot;YOURNODEURL&quot;)
@@ -121,16 +121,16 @@ <h4>Logs</h4>
 <p>Geth supports multiple terminal windows and you may start a new one with the logs in one and your console in another. This will give you the exact same functionality as the original console, but without the clutter. To do this open a new terminal window and input:</p>
 <pre><code>geth attach
 </code></pre>
-<p>The console has auto completion and history support that persists between sessions. You can complete a command by pressing the tab key, geth will then auto complete the current statement or show a list of available completions when multiple completions are possible. You can navigate your command history by using the up and down arrow keys.</p>
+<p>The console has auto completion of commands and command-history support that persists between sessions. You can complete a command by pressing the tab key, geth will then auto complete the current statement or show a list of available completions when multiple completions are possible. You can navigate your command history by using the up and down arrow keys.</p>
 <h4>Learn More on Running a node</h4>
 <ul>
 <li><a href="http://ethdocs.org/en/latest/account-management.html#backup-and-restore-accounts">Backup and restore</a></li>
 <li><a href="http://ethdocs.org/en/latest/network/connecting-to-the-network.html">Connecting to the network</a></li>
 </ul>
 <h3>Usage examples</h3>
 <h4>Creating accounts</h4>
-<p>In order to do anything on an Ethereum network you need ether, and to get it, you will need to generate an account. There are <a href="http://ethdocs.org/en/latest/account-management.html">various ways to go around this</a>, but the simplest one is through the console.</p>
-<p><strong>ATTENTION:</strong> If you were running Ethereum during the olympic phase or earlier in the development, <strong>do not reuse keys</strong> generated before the release of the Frontier client software 1.0, because otherwise they might be vulnerable to <a href="https://en.wikipedia.org/wiki/Replay_attack">replay attacks</a>. Backup those keys, and create new ones using the Frontier release clients.</p>
+<p>In order to do anything on an Ethereum network you need ether, and to get it, you will need to create an account. There are <a href="http://ethdocs.org/en/latest/account-management.html">various ways to go around this</a>, but the simplest one is through the console.</p>
+<p><strong>CAUTION:</strong> If you were running Ethereum during the olympic phase or earlier in the development, <strong>do not reuse keys</strong> generated before the release of the Frontier client software 1.0, because otherwise they might be <strong>vulnerable to <a href="https://en.wikipedia.org/wiki/Replay_attack">replay attacks</a></strong>. Backup those keys, and create new ones using the Frontier release clients.</p>
 <pre><code>personal.newAccount(&quot;Write here a good, randomly generated, passphrase!&quot;)
 </code></pre>
 <p><strong>Note: Pick up a good passphrase and write it down. If you lose the passphrase you used to encrypt your account, you will not be able to access that account. Repeat: There are no safety nets. It is NOT possible to access your account without a valid passphrase and there is no &quot;forgot my password&quot; option here. See <a href="https://xkcd.com/936/">this XKCD</a> for details.</strong></p>