Merge branch 'master' into typed-os-requirements

4 files changed, 45 insertions, 11 deletions

diff --git a/doc/news/version_2.15.1.mdwn b/doc/news/version_2.15.1.mdwn
deleted file mode 100644
index ea750b6a..00000000
--- a/doc/news/version_2.15.1.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-propellor 2.15.1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Added git configs propellor.spin-branch and propellor.forbid-dirty-spin.
-     Thanks, Sean Whitton.
-   * Added User.systemAccountFor and User.systemAccountFor' properties.
-     Thanks, Félix Sipma.
-   * Gpg.keyImported converted to not use a flag file and instead check
-     if gpg has the provided key already.
-     Thanks, Félix Sipma.
-   * Merged Utility changes from git-annex.
-   * Clean build with ghc 7.10."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.17.0.mdwn b/doc/news/version_2.17.0.mdwn
new file mode 100644
index 00000000..4149dbab
--- /dev/null
+++ b/doc/news/version_2.17.0.mdwn
@@ -0,0 +1,30 @@
+propellor 2.17.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Added initial support for FreeBSD.
+     Thanks, Evan Cofsky.
+   * Added Propellor.Property.ZFS.
+     Thanks, Evan Cofsky.
+   * Firewall: Reorganized Chain data type. (API change)
+     Thanks, Félix Sipma.
+   * Firewall: Separated Table and Target (API change)
+     Thanks, Félix Sipma.
+   * Ssh: change type of listenPort from Int to Port (API change)
+     Thanks, Félix Sipma.
+   * Firewall: add TCPFlag, Frequency, TCPSyn, ICMPTypeMatch, NatDestination
+     Thanks, Félix Sipma.
+   * Network: Filter out characters not allowed in interfaces.d files.
+     Thanks, Félix Sipma.
+   * Apt.upgrade: Run dpkg --configure -a first, to recover from
+     interrupted upgrades.
+   * Apt: Add safeupgrade.
+   * Force ssh, scp, and git commands to be run in the foreground.
+     Should fix intermittent hangs of propellor --spin.
+   * Avoid repeated re-building on systems such as FreeBSD where building
+     re-links the binary even when there are no changes.
+   * Locale.available: Run locale-gen, instead of dpkg-reconfigure locales,
+     which modified the locale.gen file and sometimes caused the property to
+     need to make changes every time.
+   * Speed up propellor's build of itself, by asking cabal to only build
+     the propellor-config binary and not all the libraries.
+   * Tor.named: Fix bug that sometimes caused the property to fail the first
+     time, though retrying succeeded."""]]
\ No newline at end of file
diff --git a/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp b/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp
deleted file mode 100644
index 79380a08..00000000
--- a/doc/todo/type_level_OS_requirements/.comment_1_507e3b74c2a3b8f41da5d3eddf197c6f._comment.swp
+++ /dev/null
diff --git a/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment b/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment
new file mode 100644
index 00000000..f4c6a8a7
--- /dev/null
+++ b/doc/todo/type_level_OS_requirements/comment_10_b0203dee6e00ea956b10ccfdaf3934f7._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 10"""
+ date="2016-03-20T17:29:48Z"
+ content="""
+The list of child properties is a problem, because it would need to be
+`[Property proptypes]` and the proptypes will vary, so heterogenious list.
+
+The proptypes of the child properties needs to influence the proptypes of
+the parent anyway. Take intersection of the parent's targets and its
+children's targets, plus both's non-target types.
+
+So, could calculate that proptypes, and use it as the type of both the
+parent property, and each child property in the list.
+"""]]