From 3c8258f54d671a92a1b379341a84ce79489397f2 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 3 Dec 2012 18:15:39 +0000 Subject: [PATCH 1/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b0fff543e..51ea9763e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,8 @@ # Developer Guidelines (Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch)) +## Important note for pull requests +Pull requests should issued against the develop branch. We never pull directly into master. **Our goal is to iterate in small steps. Release often, release early. Evolution instead of a revolution** ## General goals of Etherpad Lite From 7e4b47f3844d61d118ee82e4c6abec9a39983110 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 3 Dec 2012 18:15:55 +0000 Subject: [PATCH 2/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 51ea9763e..d3f05b677 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,6 +3,7 @@ ## Important note for pull requests Pull requests should issued against the develop branch. We never pull directly into master. + **Our goal is to iterate in small steps. Release often, release early. Evolution instead of a revolution** ## General goals of Etherpad Lite From b82af407357b093cf9c7a109c9070ad64d0b0b54 Mon Sep 17 00:00:00 2001 From: John McLear Date: Mon, 3 Dec 2012 18:16:19 +0000 Subject: [PATCH 3/4] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d3f05b677..4a69a3b65 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ (Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch)) ## Important note for pull requests -Pull requests should issued against the develop branch. We never pull directly into master. +**Pull requests should issued against the develop branch**. We never pull directly into master. **Our goal is to iterate in small steps. Release often, release early. Evolution instead of a revolution** From 110620696eebe7b8a42018ebeb7b9b857df4bd1f Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 5 Dec 2012 16:00:06 +0000 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d3a73f52..71ce8e77a 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ You'll need gzip, git, curl, libssl develop libraries, python and gcc. *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential` *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"` -Additionally, you'll need [node.js](http://nodejs.org). +Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, be careful of installing nodejs from apt. **As any user (we recommend creating a separate user called etherpad-lite):**