Skip to content

Commit cf7a3bb

Browse files
committed
Merge pull request #1562 from RocketChat/Sing-Li-readme-fix-1
Distinguish Deployment from Development Install
2 parents c3729bb + 4bc2458 commit cf7a3bb

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

README.md

+28-23
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ The Ultimate Open Source WebChat Platform
66
* [Mobile apps](#mobile-apps)
77
* [Desktop apps](#desktop-apps)
88
* [Deployment](#deployment)
9-
* [Development Installation](#development-installation)
109
* [Heroku](#heroku)
1110
* [Sandstorm.io](#sandstormio)
1211
* [Sloppy.io](#sloppyio)
@@ -23,6 +22,7 @@ The Ultimate Open Source WebChat Platform
2322
* [Documentation](#documentation)
2423
* [License](#license)
2524
* [Development](#development)
25+
* [Installation](#installation)
2626
* [Branching Model](#branching-model)
2727
* [Translations](#translations)
2828
* [Community](#community)
@@ -55,27 +55,6 @@ Now compatible with all Android devices as old as version 4.0.x - [download here
5555
# Deployment
5656
`Host your own Rocket.Chat server in four seconds flat`
5757

58-
## Development Installation
59-
Prerequisites:
60-
61-
* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
62-
* [Meteor](https://www.meteor.com/install)
63-
64-
Now just clone and start the app:
65-
66-
```sh
67-
git clone https://github.com/RocketChat/Rocket.Chat.git
68-
cd Rocket.Chat
69-
meteor
70-
```
71-
72-
or use docker:
73-
74-
```
75-
git clone https://github.com/RocketChat/Rocket.Chat.git
76-
cd Rocket.Chat
77-
docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
78-
```
7958

8059
## Heroku
8160
Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
@@ -254,8 +233,34 @@ Note that Rocket.Chat is distributed under the [MIT License](http://opensource.o
254233

255234

256235
# Development
236+
237+
## Installation
238+
Prerequisites:
239+
240+
* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
241+
* [Meteor](https://www.meteor.com/install)
242+
243+
Now just clone and start the app:
244+
245+
```sh
246+
git clone https://github.com/RocketChat/Rocket.Chat.git
247+
cd Rocket.Chat
248+
meteor
249+
```
250+
251+
or use docker:
252+
253+
```
254+
git clone https://github.com/RocketChat/Rocket.Chat.git
255+
cd Rocket.Chat
256+
docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
257+
```
258+
257259
## Branching Model
258-
The [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/) section below is derived from Vincent Driessen at nvie.
260+
261+
See [Branches and Releases](https://github.com/RocketChat/Rocket.Chat/wiki/Branches-and-Releases).
262+
263+
It is based on [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/), reference section below is derived from Vincent Driessen at nvie.
259264

260265
See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more details.
261266

0 commit comments

Comments
 (0)