Merge remote-tracking branch 'upstream/master' into patch-2

This commit is contained in:
Daniel Imms
2016-06-07 23:34:35 -07:00
2 changed files with 13 additions and 2 deletions
+12 -1
View File
@@ -8,6 +8,17 @@ Xterm.js supplies a modular, event-based interface that lets developers build ad
![xterm.js screenshot](xtermjs.png)
## Demo
To launch the demo simply run:
```
npm install
npm start
```
Then open http://0.0.0.0:3000 in a web browser.
## Addons
Addons are JavaScript modules that attach functions to the `Terminal` prototype to extend its functionality. There are a handful available in the main repository in the `addons` directory, you can even write your own (though they may break when the internals of xterm.js change across versions).
@@ -25,7 +36,7 @@ var xterm = new Terminal();
xterm.linkify();
```
### Contribution and License Agreement
## Contribution and License Agreement
If you contribute code to this project, you are implicitly allowing your code to be distributed under the MIT license. You are also implicitly verifying that all code is your original work.
+1 -1
View File
@@ -45,5 +45,5 @@ app.ws('/bash', function(ws, req) {
var port = process.env.PORT || 3000,
host = '0.0.0.0';
console.log('App listening to ' + host + ':' + port);
console.log('App listening to http://' + host + ':' + port);
app.listen(port, host);