summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authoraccolade <at.github@athoma.net>2013-03-16 17:05:23 +0100
committeraccolade <at.github@athoma.net>2013-03-16 17:05:23 +0100
commitf972d2a92d574648d20bd5d41c3115c3563a83d6 (patch)
tree730aac423f36e478f53869ebd5e45742c9f4b577 /CONTRIBUTING.md
parenta31605216fe72b8ae213394385aecee0bfb24ff2 (diff)
downloadetherpad-lite-f972d2a92d574648d20bd5d41c3115c3563a83d6.zip
(( 2 typos
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a69a3b6..4e59afbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,8 +11,8 @@ To make sure everybody is going in the same direction:
* easy to install for admins and easy to use for people
* easy to integrate into other apps, but also usable as standalone
* using less resources on server side
-* extensible, as much functionality should be extendable with plugins so changes don't have to be done in core
-Also, keep it maintainable. We don't wanna end ob as the monster Etherpad was!
+* extensible, as much functionality should be extendable with plugins so changes don't have to be done in core.
+Also, keep it maintainable. We don't wanna end up as the monster Etherpad was!
## How to work with git?
* Don't work in your master branch.
@@ -62,4 +62,4 @@ The docs are in the `doc/` folder in the git repository, so people can easily fi
Documentation should be kept up-to-date. This means, whenever you add a new API method, add a new hook or change the database model, pack the relevant changes to the docs in the same pull request.
-You can build the docs e.g. produce html, using `make docs`. At some point in the future we will provide an online documentation. The current documentation in the github wiki should always reflect the state of `master` (!), since there are no docs in master, yet. \ No newline at end of file
+You can build the docs e.g. produce html, using `make docs`. At some point in the future we will provide an online documentation. The current documentation in the github wiki should always reflect the state of `master` (!), since there are no docs in master, yet.