Merge pull request #5 from vzvenyach/master

Documentation fixes

README.md

@@ -80,7 +80,7 @@ Your server is set up as a nameserver to provide DNS information for the hostnam
 
 For instance, in my case, I could tell my domain name registrar that `ns1.box.occams.info` and `ns2.box.occams.info` are the nameservers for `occams.info`.
 
-(In a more complex setup, you may have a different nameserver for your domain. In this case, you'll delegate DNS to your box for the box's own subdomain. In your main DNS, add a record like "box.occams.info. 3600 IN NS ns1.box.occams.info." and a second one for `ns2` (the final period may be important). This sets who is the authoritative server for the hostname. You'll then also need "ns1.box.ocacams.info IN A 10.20.30.40" providing the IP address of the authoritative server (and repeat for `ns2`). Then add an MX record on your main domain pointing to the hostname you chose for your server here so that you delegate mail for the domain to your new server using a record like "occams.info. 3600 IN MX 1 box.occams.info." (again the period at the end may be important). You'll also want to put an SPF record on your main domain like "occams.info IN TXT "v=spf1 a mx -all" ".)
+(In a more complex setup, you may have a different nameserver for your domain. In this case, you'll delegate DNS to your box for the box's own subdomain. In your main DNS, add a record like "box.occams.info. 3600 IN NS ns1.box.occams.info." and a second one for `ns2` (the final period may be important). This sets who is the authoritative server for the hostname. You'll then also need "ns1.box.occams.info IN A 10.20.30.40" providing the IP address of the authoritative server (and repeat for `ns2`). Then add an MX record on your main domain pointing to the hostname you chose for your server here so that you delegate mail for the domain to your new server using a record like "occams.info. 3600 IN MX 1 box.occams.info." (again the period at the end may be important). You'll also want to put an SPF record on your main domain like "occams.info IN TXT "v=spf1 a mx -all" ".)
 
 Checking Your Mail
 ------------------

tools/mail.py

@@ -12,13 +12,13 @@ c = conn.cursor()
 
 if len(sys.argv) < 2:
 	print("Usage: ")
-	print("  scripts/mail_db_tool.py user  (lists users)")
-	print("  scripts/mail_db_tool.py user add user@domain.com [password]")
-	print("  scripts/mail_db_tool.py user password user@domain.com [password]")
-	print("  scripts/mail_db_tool.py user remove user@domain.com")
-	print("  scripts/mail_db_tool.py alias  (lists aliases)")
-	print("  scripts/mail_db_tool.py alias add incoming.name@domain.com sent.to@other.domain.com")
-	print("  scripts/mail_db_tool.py alias remove incoming.name@domain.com")
+	print("  tools/mail.py user  (lists users)")
+	print("  tools/mail.py user add user@domain.com [password]")
+	print("  tools/mail.py user password user@domain.com [password]")
+	print("  tools/mail.py user remove user@domain.com")
+	print("  tools/mail.py alias  (lists aliases)")
+	print("  tools/mail.py alias add incoming.name@domain.com sent.to@other.domain.com")
+	print("  tools/mail.py alias remove incoming.name@domain.com")
 	print()
 	print("Removing a mail user does not delete their mail folders on disk. It only prevents IMAP/SMTP login.")
 	print()