summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--repo/README2
-rw-r--r--www/protocol-transition.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/repo/README b/repo/README
index d24e7ef8..c7319d55 100644
--- a/repo/README
+++ b/repo/README
@@ -9,7 +9,7 @@ config: Repository configuration, including config details for the
hooks/acl.sh: see hooks/update
-hooks/ciabot.sh: see hooks/update
+hooks/ciabot.py: see hooks/update
hooks/post-receive: This script is run after receive-pack has accepted a
pack and the repository has been updated.
diff --git a/www/protocol-transition.txt b/www/protocol-transition.txt
index 416ab700..1caffd73 100644
--- a/www/protocol-transition.txt
+++ b/www/protocol-transition.txt
@@ -49,8 +49,8 @@ Lynx, the Ubuntu LTS release of April 2010.
If you follow our transition advice now, you will be able to talk to
all old-protocol and new-protocol versions of the daemon until the 3.0
shared client library is deployed, at which point your runtime will
-silently get smaller but you won't be able to use 2.x daemon versions
-any more.
+silently get smaller but you may no longer be able to use 2.x daemon
+versions any more.
We're counting on binary-package dependencies to make the transition
easier. When you ship a release using the new interface library,
@@ -404,8 +404,8 @@ these express dilution of precision in longitude and latitude,
respectively.
There is a gps_waiting() method analogous to the waiting() method in
-the Python class -- a non-blocking way to check if input is waiting
-from the daemon.
+the Python class -- a way to check if input is waiting from the
+daemon. It blocks but takes a timeout value.
The raw_hook member is gone.