summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2014-05-10 11:13:47 -0300
committerJoey Hess2014-05-10 11:13:47 -0300
commiteb6e6fe11290971b37a18d9a78f6d9b78228c06f (patch)
tree5c7669b6ce12a8e7c95e918e69548de31eb4fba7 /doc
parent6088df9105a10ef446cc236982c2e30857182a84 (diff)
parentd7ad05acaaf05c7af066c1d41f3e70e61a9bec96 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-rw-r--r--doc/index.mdwn2
-rw-r--r--doc/todo/docker_todo_list.mdwn4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/index.mdwn b/doc/index.mdwn
index f0e0befe..5311baf7 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,7 +24,7 @@ hosts :: [Host] -- * \ | | '--------'
hosts = -- (o) `
</pre>
-Propellor is free software, licensed under the terms of the GNU GPL 3.
+Propellor is free software, licensed under the BSD license.
## news
diff --git a/doc/todo/docker_todo_list.mdwn b/doc/todo/docker_todo_list.mdwn
index 2f215a50..9cb9e4da 100644
--- a/doc/todo/docker_todo_list.mdwn
+++ b/doc/todo/docker_todo_list.mdwn
@@ -8,4 +8,6 @@
are assigned to the container.
* It seems that provisionContainer sometimes hangs when the container
is already running. This seems likely to be a problem with the simpleSh
- socket hack.
+ socket hack. (I think this was an uncaught exception crashing the
+ simpleSh server thread, and if so, it's fixed. Waiting some weeks to see,
+ as this bug rarely occurred..)