From: dan <dan@noemail.net>
Date: Sat, 28 Jan 2017 06:50:15 +0000 (+0000)
Subject: Fix a typo in the docs for sqlite3_update_hook().
X-Git-Tag: version-3.17.0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d2e4f389584fec0b27100107b18bb835ddeba94;p=thirdparty%2Fsqlite.git

Fix a typo in the docs for sqlite3_update_hook().

FossilOrigin-Name: 7c029655cc3369a1e46741fdd3701d36d420b28b
---

diff --git a/manifest b/manifest
index 5468756e11..41ba2e4d2c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssha1.c\sloadable\sextension\sthat\simplements\sthe\ssha1()\sand\ssha1_query()\nSQL\sfunctions.
-D 2017-01-27T19:27:38.700
+C Fix\sa\stypo\sin\sthe\sdocs\sfor\ssqlite3_update_hook().
+D 2017-01-28T06:50:15.642
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -393,7 +393,7 @@ F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 3856db523b942062bca8722ba03b61c324ff94d6
 F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
-F src/sqlite.h.in 1971ab9709e010d52a02a1a6276d5a2f9b947476
+F src/sqlite.h.in eefd49aa3aae3b4acd7d7e2f8f9b0db8ae0aff3b
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 F src/sqliteInt.h 341ce9e5b0397771fa6bd9dadb8ef4cbbd6224d0
@@ -1548,7 +1548,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fbb6bf1b69cfd581b4ffd778c344e3fbd9c9406f
-R 389e8cfe151c91b893dde5f7934ffeac
-U drh
-Z 4597f51eb6c4ecdd76ade7480dc74dac
+P 24e77c1cef163a9822635570b3211789ff23d5c9
+R f1c881d122d9ce415eab840d4253340a
+U dan
+Z 83c68a9a3025b00f2574a4c70122bf9b
diff --git a/manifest.uuid b/manifest.uuid
index 4866d1d1f8..140867e588 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24e77c1cef163a9822635570b3211789ff23d5c9
\ No newline at end of file
+7c029655cc3369a1e46741fdd3701d36d420b28b
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 87d5d121cb..0bf386f72a 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5417,7 +5417,7 @@ void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
 ** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
 **
 ** ^In the current implementation, the update hook
-** is not invoked when duplication rows are deleted because of an
+** is not invoked when conflicting rows are deleted because of an
 ** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
 ** invoked when rows are deleted using the [truncate optimization].
 ** The exceptions defined in this paragraph might change in a future