Merge branch 'master' into joeyconfig

5 files changed, 18 insertions, 12 deletions

diff --git a/doc/install.mdwn b/doc/install.mdwn
index f64519a7..8db966f1 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -1,4 +1,3 @@
 `git clone git://propellor.branchable.com/propellor`  
-Or get it [from github](https://github.com/joeyh/propellor).
 
-Propellor is recently available in Debian.
+Propellor is also available in Debian.
diff --git a/doc/news/version_3.2.1.mdwn b/doc/news/version_3.2.1.mdwn
deleted file mode 100644
index 214ef427..00000000
--- a/doc/news/version_3.2.1.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-propellor 3.2.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Simplify Debootstrap.sourceInstall since #770217 was fixed.
-   * Debootstap.installed: Fix inverted logic that made this never install
-     debootstrap. Thanks, mithrandi."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.2.2.mdwn b/doc/news/version_3.2.2.mdwn
deleted file mode 100644
index 19acc9f7..00000000
--- a/doc/news/version_3.2.2.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-propellor 3.2.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Added Linode.serialGrub property.
-   * Clean up build warnings about redundant constraints when built with ghc 8.0.
-   * Added Group.hasUser property. Thanks, Daniel Brooks"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.4.0.mdwn b/doc/news/version_3.4.0.mdwn
new file mode 100644
index 00000000..d38716e1
--- /dev/null
+++ b/doc/news/version_3.4.0.mdwn
@@ -0,0 +1,14 @@
+propellor 3.4.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added ConfigurableValue type class, for values that can be used in a
+     config file, or to otherwise configure a program.
+   * The val function converts such values to String.
+   * Removed fromPort and fromIPAddr (use val instead). (API change)
+   * Removed several Show instances that were only used for generating
+     configuration, replacing with ConfigurableValue instances. (API change)
+   * The github mirror of propellor's git repository has been removed,
+     since github's terms of service has started imposing unwanted licensing
+     requirements.
+   * propellor --init: The option to clone propellor's git repository
+     used to use the github mirror, and has been changed to use a different
+     mirror."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.4.1.mdwn b/doc/news/version_3.4.1.mdwn
new file mode 100644
index 00000000..51d9c2ac
--- /dev/null
+++ b/doc/news/version_3.4.1.mdwn
@@ -0,0 +1,3 @@
+propellor 3.4.1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fixed https url to propellor git repository."""]]
\ No newline at end of file