From f27d622e2cfb68ed771ba6ffcefb1b7daffa83be Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sat, 11 Apr 2015 17:12:31 +0200
Subject: [PATCH] Include changelog in docs (converted it to rst)

---
 CHANGELOG          | 48 -----------------------------
 CHANGELOG.rst      | 77 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/changelog.rst |  1 +
 docs/index.rst     |  1 +
 4 files changed, 79 insertions(+), 48 deletions(-)
 delete mode 100644 CHANGELOG
 create mode 100644 CHANGELOG.rst
 create mode 100644 docs/changelog.rst

diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 9d5b2de..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,48 +0,0 @@
-2014-11-23:
-	Noah Fontes:
-		* Add support for enhanced networking on EC2 images
-2014-07-12:
-	Tiago Ilieve:
-		* Fixes #96: AddBackports is now a common task
-2014-07-09:
-	Anders Ingemann:
-		* Allow passing data into the manifest
-		* Refactor logging setup to be more modular
-		* Convert every JSON file to YAML
-		* Convert "provider" into provider specific section
-2014-07-02:
-	Vladimir Vitkov:
-		* Improve grub options to work better with virtual machines
-2014-06-30:
-	Tomasz Rybak:
-		* Return information about created image
-2014-06-22:
-	Victor Marmol:
-		* Enable the memory cgroup for the Docker plugin
-2014-06-19:
-	Tiago Ilieve:
-		* Fixes #94: allow stable/oldstable as release name on manifest
-	Vladimir Vitkov:
-		* Improve ami listing performance
-2014-06-07:
-	Tiago Ilieve:
-		* Download `gsutil` tarball to workspace instead of working directory
-		* Fixes #97: remove raw disk image created by GCE after build
-2014-06-06:
-	Ilya Margolin:
-		* pip_install plugin
-2014-05-23:
-	Tiago Ilieve:
-		* Fixes #95: check if the specified APT proxy server can be reached
-2014-05-04:
-	Dhananjay Balan:
-		* Salt minion installation & configuration plugin
-		* Expose debootstrap --include-packages and --exclude-packages options to manifest
-2014-05-03:
-	Anders Ingemann:
-		* Require hostname setting for vagrant plugin
-		* Fixes #14: S3 images can now be bootstrapped outside EC2.
-		* Added enable_agent option to puppet plugin
-2014-05-02:
-	Tomasz Rybak:
-		* Added Google Compute Engine Provider
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..420540c
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,77 @@
+Changelog
+=========
+
+2014-11-23:
+
+Noah Fontes:
+	+ Add support for enhanced networking on EC2 images
+
+2014-07-12:
+
+Tiago Ilieve:
+	+ Fixes #96: AddBackports is now a common task
+
+2014-07-09:
+
+Anders Ingemann:
+	+ Allow passing data into the manifest
+	+ Refactor logging setup to be more modular
+	+ Convert every JSON file to YAML
+	+ Convert "provider" into provider specific section
+
+2014-07-02:
+
+Vladimir Vitkov:
+	+ Improve grub options to work better with virtual machines
+
+2014-06-30:
+
+Tomasz Rybak:
+	+ Return information about created image
+
+2014-06-22:
+
+Victor Marmol:
+	+ Enable the memory cgroup for the Docker plugin
+
+2014-06-19:
+
+Tiago Ilieve:
+	+ Fixes #94: allow stable/oldstable as release name on manifest
+
+Vladimir Vitkov:
+	+ Improve ami listing performance
+
+2014-06-07:
+
+Tiago Ilieve:
+	+ Download `gsutil` tarball to workspace instead of working directory
+	+ Fixes #97: remove raw disk image created by GCE after build
+
+2014-06-06:
+
+Ilya Margolin:
+	+ pip_install plugin
+
+2014-05-23:
+
+Tiago Ilieve:
+	+ Fixes #95: check if the specified APT proxy server can be reached
+
+2014-05-04:
+
+Dhananjay Balan:
+	+ Salt minion installation & configuration plugin
+	+ Expose debootstrap --include-packages and --exclude-packages options to manifest
+
+2014-05-03:
+
+Anders Ingemann:
+	+ Require hostname setting for vagrant plugin
+	+ Fixes #14: S3 images can now be bootstrapped outside EC2.
+	+ Added enable_agent option to puppet plugin
+
+2014-05-02:
+
+Tomasz Rybak:
+	+ Added Google Compute Engine Provider
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 0000000..565b052
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1 @@
+.. include:: ../CHANGELOG.rst
diff --git a/docs/index.rst b/docs/index.rst
index d17042b..f10ebe0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,6 +14,7 @@ bootstrap-vz
    manifest
    providers/index
    plugins/index
+   changelog
 
    api/index
    contributing