Skip to content

Commit bc40f72

Browse files
committed
Update documentation
1 parent 4a41a00 commit bc40f72

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CONTRIBUTING.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ Hey, thanks for wanting to contribute to baseimage-docker. :)
22

33
If you have a question, please use the [discussion forum](https://groups.google.com/d/forum/passenger-docker). The Github issue tracker is only for **bug reports and feature requests**.
44

5-
If you want to develop baseimage-docker, use the Vagrantfile in the repository. It will setup an Ubuntu VM with Docker installed in it. Use the Makefile to build the image.
5+
If you want to develop baseimage-docker, use the Vagrantfile in the repository. It will setup an Ubuntu VM with Docker installed in it. Use the Makefile to build the Docker image.
6+
7+
All development happens on the `next` branch. The `master` branch is supposed to point to the latest stable release, because users read documentation from the `master` branch.

Changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Logrotate now reloads syslog-ng properly. Closes GH-167.
77
* Fixed some locale issues. Closes GH-178. Thanks to David J. M. Karlsen.
88
* Fixed problems with cron. Closes GH-115.
9+
* Contribution by Bryan Bishop.
910

1011
## 0.9.15 (release date: 2014-10-03)
1112

0 commit comments

Comments
 (0)