Nearly gratuitous cosmetic changes to resync files that were corrupted

in the public repository.  I actually removed some unnecessary
backslashes from some string concatenations within parenthesized
expressions, or missing close-parens in a module docstring, etc.

doc/FAQ.txt

@@ -135,11 +135,10 @@ Zope Installation Frequently Asked Questions
 
   Managing the Zope process
 
-
     1. How do I find the application server in my process listing?
 
        Whether running Zope with ZServer (yay) or straight PCGI (not
-       so yay), there will be a .pid file in var with the pid of the
+       so yay), or there will be a .pid file in var with the pid of the
        process.  For ZServer, the pid file is named 'z2.pid' (and it
        contains two pids).  For PCGI, the file will be 'pcgi.pid'.
 
@@ -187,8 +186,8 @@ Zope Installation Frequently Asked Questions
   General
 
 
-    1. My browser is giving a message of 'Sorry, an error occurred.'
-       How do I find out the error?
+    1. My browser is giving a message, 'Sorry, an error occurred.'
+       How do I find out what the real error is?
 
        Step number one in these scenarios is to view the HTML source of 
        the frame containing the error. In general, the *traceback* of
@@ -198,4 +197,4 @@ Zope Installation Frequently Asked Questions
        Occassionally you won't see the error message. Rather, the HTML 
        source will contain the last good HTML returned by the request
        before the error occurred. This is due to caching by the
-       browser. Clear your cache and view the HTML source again.
+       browser.  Clear your cache and view the HTML source again.

inst/binary_install.py

@@ -85,7 +85,7 @@
 """Try to do all of the installation steps.
 
 This must be run from the top-level directory of the installation.
-\(Yes, this is cheezy.  We'll fix this when we have a chance.
+\(Yes, this is cheezy.  We'll fix this when we have a chance.)
 
 """
 

wo_pcgi.py

@@ -85,7 +85,7 @@
 """Try to do all of the installation steps.
 
 This must be run from the top-level directory of the installation.
-\(Yes, this is cheezy.  We'll fix this when we have a chance.
+\(Yes, this is cheezy.  We'll fix this when we have a chance.)
 
 """
 

z2.py

@@ -517,17 +517,17 @@ def set_locale(val):
         import locale
     except:
         raise SystemExit, (
-            'The locale module could not be imported.\n' \
-            'To use localization options, you must ensure\n' \
-            'that the locale module is compiled into your\n' \
+            'The locale module could not be imported.\n'
+            'To use localization options, you must ensure\n'
+            'that the locale module is compiled into your\n'
             'Python installation.'
             )
     try:
         locale.setlocale(locale.LC_ALL, val)
     except:
         raise SystemExit, (
-            'The specified locale is not supported by your system.\n' \
-            'See your operating system documentation for more\n' \
+            'The specified locale is not supported by your system.\n'
+            'See your operating system documentation for more\n'
             'information on locale support.'
             )
 if LOCALE_ID is not None:

zpasswd.py

@@ -85,7 +85,7 @@
 ##############################################################################
 """Zope user bootstrap system"""
 
-__version__='$Revision: 1.11 $ '[11:-2]
+__version__='$Revision: 1.12 $ '[11:-2]
 
 import sys, string, sha, binascii, whrandom, getopt, getpass, os
 
@@ -96,9 +96,9 @@ except ImportError:
 
 def generate_salt():
     """Generate a salt value for the crypt function."""
-    salt_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-                   "abcdefghijklmnopqrstuvwxyz" \
-                   "0123456789./"
+    salt_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                    "abcdefghijklmnopqrstuvwxyz"
+                    "0123456789./")
     return whrandom.choice(salt_choices)+whrandom.choice(salt_choices)
 
 def generate_passwd(password, encoding):
@@ -114,9 +114,9 @@ def generate_passwd(password, encoding):
 
 def write_generated_password(home, ac_path, username):
     import whrandom
-    pw_choices = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-                 "abcdefghijklmnopqrstuvwxyz" \
-                 "0123456789!"
+    pw_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                  "abcdefghijklmnopqrstuvwxyz"
+                  "0123456789!")
     acfile=open(ac_path, 'w')
     pw = ''
     for i in range(8):