Make tests work with both Nevow 0.11 and 0.12

[tahoe-lafs/tahoe-lafs.git] / docs / convergence-secret.rst

diff --git a/docs/convergence-secret.rst b/docs/convergence-secret.rst
index 90b56e30b54f0d7ac30a971128b29861360714f2..e94392bbe490071a530706a183919d61a03809f8 100644 (file)
--- a/docs/convergence-secret.rst
+++ b/docs/convergence-secret.rst
@@ -1,9 +1,9 @@
-
+.. -*- coding: utf-8-with-signature -*-
 
 What Is It?
 -----------
 
-The identifer of a file (also called the "capability" to a file) is derived
+The identifier of a file (also called the "capability" to a file) is derived
 from two pieces of information when the file is uploaded: the content of the
 file and the upload client's "convergence secret". By default, the
 convergence secret is randomly generated by the client when it first starts
@@ -14,7 +14,7 @@ file from a different client with a different convergence secret would result
 in a different cap -- and in a second copy of the file's contents stored on
 the grid. If you want files you upload to converge (also known as
 "deduplicate") with files uploaded by someone else, just make sure you're
-using the same convergence secret when you upload files as they
+using the same convergence secret when you upload files as them.
 
 The advantages of deduplication should be clear, but keep in mind that the
 convergence secret was created to protect confidentiality. There are two