Merge branch 'master' of https://github.com/matrix-org/matrix-doc

README.rst

@@ -68,10 +68,10 @@ Windows users
 ~~~~~~~~~~~~~
 
 If you're on Windows Vista or higher, be sure that the "Symbolic Links"
-option was selected when installing Git prior to cloning this repository. If 
-you're still seeing errors about files not being found it is likely because 
-the symlink at ``api/client-server/definitions/event-schemas`` looks like a 
-file. To correct the problem, open an Administrative/Elevated shell in your 
+option was selected when installing Git prior to cloning this repository. If
+you're still seeing errors about files not being found it is likely because
+the symlink at ``api/client-server/definitions/event-schemas`` looks like a
+file. To correct the problem, open an Administrative/Elevated shell in your
 cloned matrix-doc directory and run the following::
 
   cd api\client-server\definitions
@@ -121,7 +121,7 @@ changes.
 It is written in Go, so you will need the ``go`` compiler installed on your
 computer. You will also need to install fsnotify by running::
 
-  go get gopkg.in/fsnotify.v1
+  go get gopkg.in/fsnotify/fsnotify.v1
 
 Then, create a virtualenv as described above under `Preparation`_,
 and::

scripts/continuserv/README

@@ -1,6 +0,0 @@
-continuserv proactively re-generates the spec on filesystem changes, and serves it over HTTP.
-
-To run it, you must install the `go` tool. You will also need to install fsnotify by running:
- `go get gopkg.in/fsnotify/fsnotify.v1`
-You can then run continuserv by running:
- `go run main.go`

scripts/continuserv/README.md

@@ -0,0 +1,3 @@
+continuserv proactively re-generates the spec on filesystem changes, and serves
+it over HTTP. For notes on using it, see [the main
+readme](../../README.rst#continuserv).