diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18be95d..1feaa45 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,4 +2,6 @@ Hey, thanks for wanting to contribute to baseimage-docker. :) 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**. -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. +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. + +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. diff --git a/Changelog.md b/Changelog.md index 5d35291..0e207b7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ * Logrotate now reloads syslog-ng properly. Closes GH-167. * Fixed some locale issues. Closes GH-178. Thanks to David J. M. Karlsen. * Fixed problems with cron. Closes GH-115. + * Contribution by Bryan Bishop. ## 0.9.15 (release date: 2014-10-03)