Changeset: 360ae854f2da for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/360ae854f2da
Branch: default
Log Message:

merge with default


diffs (44 lines):

diff --git a/documentation/source/manual_pages/monetdbd.rst.in 
b/documentation/source/manual_pages/monetdbd.rst.in
--- a/documentation/source/manual_pages/monetdbd.rst.in
+++ b/documentation/source/manual_pages/monetdbd.rst.in
@@ -235,6 +235,8 @@ using the **set** command. The following
 REMOTE DATABASES
 ================
 
+**Deprecation notice:** This feature is deprecated and may be removed in the 
future.
+
 The neighbor discovery capabilities of *monetdbd* allow a user to
 contact a remote database transparently, as if it were a local database.
 By default, all local databases are announced in the network, such that
@@ -305,6 +307,8 @@ instance the following three databases w
 MULTIPLEX-FUNNELS
 =================
 
+**Deprecation notice:** This feature is deprecated and may be removed in the 
future.
+
 *Monetdbd* implements multiplex-funnel capabilities. As the name
 suggests two techniques are combined, the multiplexer and the funnel.
 
diff --git a/tools/merovingian/daemon/monetdbd.1.in 
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -358,6 +358,9 @@ Hence, in practice it is only relevant f
 databases to use redirects instead of proxies.
 Changing this property takes effect immediately at runtime.
 .SH REMOTE DATABASES
+.B Deprecation notice:
+This feature is deprecated and may be removed in the future.
+.P
 The neighbor discovery capabilities of
 .I monetdbd
 allow a user to contact a remote database transparently, as if it were
@@ -457,6 +460,9 @@ or
 and use the necessary pattern to match them.
 It is up to the user to decide how to use the tags.
 .SH MULTIPLEX-FUNNELS
+.B Deprecation notice:
+This feature is deprecated and may be removed in the future.
+.P
 .I Monetdbd
 implements multiplex-funnel capabilities.
 As the name suggests two techniques are combined, the multiplexer and
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to