summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Di Gregorio <fog@initd.org>2008-09-24 01:29:20 +0200
committerFederico Di Gregorio <fog@initd.org>2008-09-24 01:29:20 +0200
commitb9157c8ba12ad7838a6013a14d2c833ae7da2bd6 (patch)
tree138fa4f89caf29e6a48cb224c6a8be047e9d7c89
parent4c8e80038ecff169664f06e6d561b29468baaae8 (diff)
parentcc2aa0a9caac9b9ea1a3d30da2302ba1118b7da6 (diff)
downloadpsycopg2-b9157c8ba12ad7838a6013a14d2c833ae7da2bd6.tar.gz
Merged changed by JH from head
-rw-r--r--ChangeLog5
-rw-r--r--psycopg/psycopg.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e1693f8..f70aa2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
* lib/extras.py: added inet support and related tests.
+2008-09-23 James Henstridge <james@jamesh.id.au>
+
+ * psycopg/psycopg.h (NotSupportedError_doc): clean up
+ spelling/grammar a bit, using exception description from the PEP.
+
2008-09-23 Federico Di Gregorio <fog@initd.org>
* Applied patch from Brian Sutherland that fixes NULL
diff --git a/psycopg/psycopg.h b/psycopg/psycopg.h
index c2effb5..5706c5a 100644
--- a/psycopg/psycopg.h
+++ b/psycopg/psycopg.h
@@ -174,7 +174,7 @@ HIDDEN size_t qstring_escape(char *to, char *from, size_t len, PGconn *conn);
"Error related to problems with the processed data."
#define NotSupportedError_doc \
-"A not supported datbase API was called."
+"A method or database API was used which is not supported by the database."
#ifdef PSYCOPG_EXTENSIONS
#define QueryCanceledError_doc \