Merge branch 'master' into joeyconfig

5 files changed, 15 insertions, 12 deletions

diff --git a/doc/news/Linux.Conf.Au.presentation.mdwn b/doc/news/Linux.Conf.Au.presentation.mdwn
deleted file mode 100644
index 54180979..00000000
--- a/doc/news/Linux.Conf.Au.presentation.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-<video controls src="http://mirror.linux.org.au/pub/linux.conf.au/2017/Type_driven_configuration_management_with_Propellor.webm"></video>
-
-[video](http://mirror.linux.org.au/pub/linux.conf.au/2017/Type_driven_configuration_management_with_Propellor.webm)
-
-Also see this writeup in [Linux Weekly News](https://lwn.net/Articles/713653/)
diff --git a/doc/news/version_4.3.1.mdwn b/doc/news/version_4.3.1.mdwn
deleted file mode 100644
index 5c07307d..00000000
--- a/doc/news/version_4.3.1.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-propellor 4.3.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Added Propellor.Property.FreeDesktop module.
-   * Added reservedSpacePercentage to the PartSpec EDSL."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.3.2.mdwn b/doc/news/version_4.3.2.mdwn
deleted file mode 100644
index 1a85d2d4..00000000
--- a/doc/news/version_4.3.2.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-propellor 4.3.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Really include Propellor.Property.FreeDesktop."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.3.4.mdwn b/doc/news/version_4.3.4.mdwn
new file mode 100644
index 00000000..5d308401
--- /dev/null
+++ b/doc/news/version_4.3.4.mdwn
@@ -0,0 +1,7 @@
+propellor 4.3.4 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Propellor.Property.Versioned: New module which allows different
+     versions of a property or host to be written down in a propellor config
+     file. Has many applications, including staged upgrades and rollbacks.
+   * LightDM.autoLogin: Use [Seat:*] rather than the old [SeatDefaults].
+     The new name has been supported since lightdm 1.15."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.4.0.mdwn b/doc/news/version_4.4.0.mdwn
new file mode 100644
index 00000000..db86c536
--- /dev/null
+++ b/doc/news/version_4.4.0.mdwn
@@ -0,0 +1,8 @@
+propellor 4.4.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Propellor.Property.Timezone: New module, contributed by Sean Whitton.
+   * Propellor.Property.Sudo.enabledFor: Made revertable.
+     (minor API change)
+   * Propellor.Property.LightDM.autoLogin: Made revertable.
+     (minor API change)
+   * Propellor.Property.Conffile: Added lacksIniSetting."""]]
\ No newline at end of file