Merge pull request #424 from a1346054/fixes

Minor cleanup

.appveyor.yml

@@ -47,7 +47,7 @@ test_script:
   # Put your test command here.
   # Note that you must use the environment variable %PYTHON% to refer to
   # the interpreter you're using - Appveyor does not do anything special
-  # to put the Python evrsion you want to use on PATH.
+  # to put the Python version you want to use on PATH.
   - |
     misc\windows-build.cmd %PYTHON%\Scripts\tox.exe
 

NEWS.md

@@ -1,4 +1,3 @@
-
 User-visible changes in "magic-wormhole":
 
 ## Release 0.12.0 (04-Apr-2020)

docs/api.md

@@ -102,7 +102,7 @@ author. Application developers can use this one, or they can run their own
 (see the [warner/magic-wormhole-mailbox-server
 ](https://github.com/warner/magic-wormhole-mailbox-server) repository)
 and configure their clients to use it instead. The URL of the public
-rendevouz server is passed as a unicode string. Note that because the server
+rendezvous server is passed as a unicode string. Note that because the server
 actually speaks WebSockets, the URL starts with `ws:` instead of `http:`.
 
 ## Wormhole Parameters
@@ -699,4 +699,3 @@ w.send_message(msg) |                    |
 .                   | d=w.get_message()  | dg.wormhole_got_message(msg)
 w.close()           |                    | dg.wormhole_closed(result)
 .                   | d=w.close()        |
-

docs/attacks.md

@@ -59,7 +59,7 @@ ones that I've considered (but haven't implemented yet) include:
   would-be vandals from feeling a sense of accomplishment at writing
   their own :). Not sure it would help much, but I vaguely remember
   hearing about something similar in the early multi-user unix systems
-  (a publically-executable /bin/crash or something, which new users
+  (a publicly-executable /bin/crash or something, which new users
   tended to only run once before learning some responsibility).
 
 Using the secret words as part of the "channel id" isn't safe, since it

docs/client-protocol.md

@@ -62,5 +62,3 @@ message body will be the hex-encoded output of a NaCl `SecretBox`, keyed by a
 phase+side -specific key (computed with HKDF-SHA256, using the shared PAKE
 key as the secret input, and `wormhole:phase:%s%s % (SHA256(side),
 SHA256(phase))` as the CTXinfo), with a random nonce.
-
-

docs/conf.py

@@ -180,6 +180,3 @@ texinfo_documents = [
      author, 'Magic-Wormhole', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-

docs/introduction.md

@@ -2,7 +2,7 @@
 
 The magic-wormhole (Python) distribution provides several things: an
 executable tool ("bin/wormhole"), an importable library (`import wormhole`),
-the URL of a publically-available Rendezvous Server, and the definition of a
+the URL of a publicly-available Rendezvous Server, and the definition of a
 protocol used by all three.
 
 The executable tool provides basic sending and receiving of files,
@@ -53,4 +53,3 @@ describes this application's use of the client messages.
 Application use the `wormhole` library to establish wormhole connections and
 exchange data through them. Please see `api.md` for a complete description of
 this interface.
-

docs/state-machines/Makefile

@@ -1,4 +1,3 @@
-
 default: images
 
 images: allocator.png boss.png code.png input.png key.png lister.png machines.png mailbox.png nameplate.png order.png receive.png send.png terminator.png dilation.png

docs/state-machines/boss.dot

@@ -76,5 +76,4 @@ digraph {
                label="rx_welcome -> process (maybe rx_unwelcome)\nsend -> S.send\ngot_message -> got_version or got_phase\ngot_key -> W.got_key\ngot_verifier -> W.got_verifier\nallocate_code -> C.allocate_code\ninput_code -> C.input_code\nset_code -> C.set_code"
                ]
 
-
 }

docs/state-machines/nameplate.dot

@@ -97,5 +97,4 @@ digraph {
         S3B -> P3_release [label="close" color="red"]
         S4B -> S4B [label="close" color="red"]
 
-
 }

docs/state-machines/terminator.dot

@@ -46,5 +46,4 @@ digraph {
         other [shape="box" style="dashed"
                label="close -> N.close, M.close"]
 
-
 }

misc/dump-timing.py

@@ -56,4 +56,3 @@ def web():
     reactor.callLater(0, launch_browser)
     reactor.run()
 web()
-

pyi/build-exe

@@ -14,4 +14,3 @@
 pyinstaller --clean --distpath=dist wormhole.exe.spec
 
 # result will be in dist/wormhole.exe
-

src/wormhole/_dilation/outbound.py

@@ -77,7 +77,7 @@ from .connection import KCM, Ping, Pong, Ack
 #     time.
 #   * If we're writing too slowly, we'll be left in the "unpaused" state: all
 #     Subchannel producers are unpaused, and the aggregate is unpaused too
-#     (resumeProducing is the last thing we've been told). In this satte,
+#     (resumeProducing is the last thing we've been told). In this state,
 #     activity is driven by the Subchannels doing a transport.write, which
 #     queues some data on the TCP connection (and then might call
 #     pauseProducing if it's now full).

src/wormhole/_wordlist.py

@@ -8,7 +8,7 @@ from zope.interface import implementer
 from ._interfaces import IWordlist
 
 # The PGP Word List, which maps bytes to phonetically-distinct words. There
-# are two lists, even and odd, and encodings should alternate between then to
+# are two lists, even and odd, and encodings should alternate between them to
 # detect dropped words. https://en.wikipedia.org/wiki/PGP_Words
 
 # Thanks to Warren Guy for transcribing them:

src/wormhole/test/dilate/test_connect.py

@@ -88,5 +88,3 @@ class Connect(unittest.TestCase):
 
         yield t_left.d
         yield t_right.d
-
-

src/wormhole/test/dilate/test_manager.py

@@ -624,4 +624,3 @@ class TestManager(unittest.TestCase):
         self.flushLoggedErrors(UnknownDilationMessageType)
 
     # TODO: test transit relay is used
-