You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2022/05/18 18:18:03 UTC
svn commit: r1901044 - in /db/derby/docs/branches/10.16: ./ src/adminguide/cadminreplication.dita src/adminguide/cadminreplicfailures.dita
Author: rhillegas
Date: Wed May 18 18:18:03 2022
New Revision: 1901044
URL: http://svn.apache.org/viewvc?rev=1901044&view=rev
Log:
DERBY-7138: Merge 1901043 from trunk docs to 10.16 docs.
Modified:
db/derby/docs/branches/10.16/ (props changed)
db/derby/docs/branches/10.16/src/adminguide/cadminreplication.dita
db/derby/docs/branches/10.16/src/adminguide/cadminreplicfailures.dita
Propchange: db/derby/docs/branches/10.16/
------------------------------------------------------------------------------
Merged /db/derby/docs/trunk:r1901043
Modified: db/derby/docs/branches/10.16/src/adminguide/cadminreplication.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.16/src/adminguide/cadminreplication.dita?rev=1901044&r1=1901043&r2=1901044&view=diff
==============================================================================
--- db/derby/docs/branches/10.16/src/adminguide/cadminreplication.dita (original)
+++ db/derby/docs/branches/10.16/src/adminguide/cadminreplication.dita Wed May 18 18:18:03 2022
@@ -84,8 +84,7 @@ therefore not be reflected. When the sla
is transformed into a normal
<ph conref="../conrefs.dita#prod/productshortname"></ph> instance that is ready
to process transactions. For more details, see
-<xref href="cadminreplicfailover.dita#cadminreplicfailover"></xref> and
-<xref href="cadminreplicsecurity.dita#cadminreplicsecurity"></xref>.
+<xref href="cadminreplicfailover.dita#cadminreplicfailover"></xref>.
</p>
<p>Several <ph conref="../conrefs.dita#prod/productshortname"></ph> properties
allow you to specify the size of the replication log buffers and the intervals
Modified: db/derby/docs/branches/10.16/src/adminguide/cadminreplicfailures.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.16/src/adminguide/cadminreplicfailures.dita?rev=1901044&r1=1901043&r2=1901044&view=diff
==============================================================================
--- db/derby/docs/branches/10.16/src/adminguide/cadminreplicfailures.dita (original)
+++ db/derby/docs/branches/10.16/src/adminguide/cadminreplicfailures.dita Wed May 18 18:18:03 2022
@@ -70,8 +70,8 @@ shut down without further actions.</entr
the same slave.</entry>
<entry colname="col2">The slave will only accept the connection from the first
master attempting to connect. Note that authentication is required to start
-both the slave and the master, as described in
-<xref href="cadminreplicsecurity.dita#cadminreplicsecurity"></xref>.</entry>
+both the slave and the master.
+</entry>
</row>
<row>
<entry colname="col1">The master and slave