Merge branch 'master' into joeyconfig

2 files changed, 6 insertions, 12 deletions

diff --git a/doc/news/version_4.0.2.mdwn b/doc/news/version_4.0.2.mdwn
deleted file mode 100644
index b955c579..00000000
--- a/doc/news/version_4.0.2.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-propellor 4.0.2 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Apt.mirror can be used to set the preferred apt mirror of a host,
-     overriding the default CDN. This info is used by
-     Apt.stdSourcesList and Sbuild.builtFor.
-     Thanks, Sean Whitton.
-   * Property.Partition: Update kpartx output parser, as its output format
-     changed around version 0.6. Both output formats are supported now.
-   * Fix bug when using setContainerProps with a chroot that prevented
-     properties added to a chroot that way from being seen when propellor
-     was running inside the chroot. This affected disk image creation, and
-     possibly other things that use chroots."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.0.3.mdwn b/doc/news/version_4.0.3.mdwn
new file mode 100644
index 00000000..eb467287
--- /dev/null
+++ b/doc/news/version_4.0.3.mdwn
@@ -0,0 +1,6 @@
+propellor 4.0.3 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added Fstab.listed, Fstab.swap, and Mount.swapOn properties.
+     Thanks, Daniel Brooks.
+   * Added Propellor.Property.Bootstrap, which can be used to make
+     disk images contain their own installation of propellor."""]]
\ No newline at end of file