[tor-commits] [flashproxy/master] Serial comma.

[dcf at torproject.org]

commit 4c430f589a65634afae0bf4637847c36e1c9749b
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Mar 6 21:46:19 2013 -0800

    Serial comma.
---
 doc/facilitator-howto.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/facilitator-howto.txt b/doc/facilitator-howto.txt
index 1de552f..bbf5a7a 100644
--- a/doc/facilitator-howto.txt
+++ b/doc/facilitator-howto.txt
@@ -7,7 +7,7 @@ The facilitator consists of a backend server that is essentially a
 dynamic database of client addresses, as well as helper programs that
 receive client registrations from the Internet over various means and
 pass them to the backend. There are three supported helper rendezvous
-methods: HTTP, URL and email.
+methods: HTTP, URL, and email.
 
 The HTTP rendezvous uses an HTTP server and a CGI program. The HTTP
 server is responsible for speaking TLS and invoking the CGI program. The