Fix typos in sqlite3session.h preventing documentation webpages from being

generated. Also mark all new sessions functions (those related to rebasing) as
experimental.

FossilOrigin-Name: de974235a8fefab0d08673c1b1da4e425e1d8bbfc8c35dac30943c05337b2950

diff --git a/ext/session/sqlite3session.h b/ext/session/sqlite3session.h
index 597b42c03e4cec1447ccc9375b668b7d0cb666a0..d4da20dbb9309f2c6fdddf08e2a7782a7215906c 100644 (file)
--- a/ext/session/sqlite3session.h
+++ b/ext/session/sqlite3session.h
@@ -1226,6 +1226,7 @@ int sqlite3changeset_apply_v2(
 
 /* 
 ** CAPI3REF: Rebasing changesets
+** EXPERIMENTAL
 **
 ** Suppose there is a site hosting a database in state S0. And that
 ** modifications are made that move that database to state S1 and a
@@ -1324,7 +1325,8 @@ int sqlite3changeset_apply_v2(
 typedef struct sqlite3_rebaser sqlite3_rebaser;
 
 /*
-** CAPIREF: Create a changeset rebaser object.
+** CAPI3REF: Create a changeset rebaser object.
+** EXPERIMENTAL
 **
 ** Allocate a new changeset rebaser object. If successful, set (*ppNew) to
 ** point to the new object and return SQLITE_OK. Otherwise, if an error
@@ -1334,7 +1336,8 @@ typedef struct sqlite3_rebaser sqlite3_rebaser;
 int sqlite3rebaser_create(sqlite3_rebaser **ppNew);
 
 /*
-** CAPIREF: Configure a changeset rebaser object.
+** CAPI3REF: Configure a changeset rebaser object.
+** EXPERIMENTAL
 **
 ** Configure the changeset rebaser object to rebase changesets according
 ** to the conflict resolutions described by buffer pRebase (size nRebase
@@ -1347,7 +1350,8 @@ int sqlite3rebaser_configure(
 ); 
 
 /*
-** CAPIREF: Rebase a changeset
+** CAPI3REF: Rebase a changeset
+** EXPERIMENTAL
 **
 ** Argument pIn must point to a buffer containing a changeset nIn bytes
 ** in size. This function allocates and populates a buffer with a copy
@@ -1366,7 +1370,8 @@ int sqlite3rebaser_rebase(
 );
 
 /*
-** CAPIREF: Delete a changeset rebaser object.
+** CAPI3REF: Delete a changeset rebaser object.
+** EXPERIMENTAL
 **
 ** Delete the changeset rebaser object and all associated resources. There
 ** should be one call to this function for each successful invocation

diff --git a/manifest b/manifest
index cbcfe7ac84c9a585bdcb05a37ea24e402b4cca69..726258c0a782b504aef4eaea67ff3d96691204bb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sminor\sproblems\swith\spassing\sNULL\spointers\sto\smemcmp()\sand\smemcpy()\sfound\sby\s-fsanitize=undefined.
-D 2018-03-23T16:31:34.359
+C Fix\stypos\sin\ssqlite3session.h\spreventing\sdocumentation\swebpages\sfrom\sbeing\ngenerated.\sAlso\smark\sall\snew\ssessions\sfunctions\s(those\srelated\sto\srebasing)\sas\nexperimental.
+D 2018-03-23T17:36:31.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -405,7 +405,7 @@ F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0
 F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
 F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
 F ext/session/sqlite3session.c ad85f3e528dd320c55e67e0f567a2d3af4cee65b7cc547cace6899b0e544e67e
-F ext/session/sqlite3session.h 5f40a0660ff972c0c50f5fd6b33488fdbd2eb0c1244ea95777f8dbd5e529be04
+F ext/session/sqlite3session.h 85fd2dc3df1532b0695beb345e2ff375c2745a4654b405fcbe33afa18baa6cc7
 F ext/session/test_session.c f253742ea01b089326f189b5ae15a5b55c1c9e97452e4a195ee759ba51b404d5
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
@@ -1717,7 +1717,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 0477fb3fd68509547f3bfd588247aac59aa4aa885ed8a21269852eda64e257ad
-R 4d19ed142580e06d97255ee7223aa6ae
+P 0b06ce6d8e7cff5cd5d467a94522dfef5593d7c26663ce03c2c2b663a2641551
+R ee50f1cd31ab90aa2bc35de099ffed2c
 U dan
-Z 6a2da4769910a829b6c436ffbebdac05
+Z ea119ad03ada267ffb29194d81f0e0ba

diff --git a/manifest.uuid b/manifest.uuid
index 60520c48772051ea40c13991d307eceae19a9b7a..1aca0cb8a47c9dcfef1d91dbd838153e03dc9cdf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b06ce6d8e7cff5cd5d467a94522dfef5593d7c26663ce03c2c2b663a2641551
\ No newline at end of file
+de974235a8fefab0d08673c1b1da4e425e1d8bbfc8c35dac30943c05337b2950
\ No newline at end of file