This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 5baa167  Updated site at revision 99c0ed2
5baa167 is described below

commit 5baa167b32f576a91aaf26f05b52626b051f57fd
Author: jenkins <[email protected]>
AuthorDate: Sat Jun 30 11:54:17 2018 +0000

    Updated site at revision 99c0ed2
---
 content/docs/latest/admin/GeoReplication/index.html | 4 +++-
 content/docs/latest/reference/RestApi/index.html    | 4 ++--
 content/ja/reference/RestApi/index.html             | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/content/docs/latest/admin/GeoReplication/index.html 
b/content/docs/latest/admin/GeoReplication/index.html
index 8e3c75e..02229c1 100644
--- a/content/docs/latest/admin/GeoReplication/index.html
+++ b/content/docs/latest/admin/GeoReplication/index.html
@@ -1069,7 +1069,9 @@
 
 <p>Given that global topics exist in multiple regions, it’s not possible to 
directly delete a global topic. Instead, you should rely on automatic topic 
garbage collection.</p>
 
-<p>In Pulsar, a topic is automatically deleted when it’s no longer used, that 
is to say, when no producers or consumers are connected <em>and</em> there are 
no subscriptions. For global topics, each region will use a fault-tolerant 
mechanism to decide when it’s safe to delete the topic locally.</p>
+<p>In Pulsar, a topic is automatically deleted when it’s no longer used, that 
is to say, when no producers or consumers are connected <em>and</em> there are 
no subscriptions <em>and</em> no more messages are kept for retention. For 
global topics, each region will use a fault-tolerant mechanism to decide when 
it’s safe to delete the topic locally.</p>
+
+<p>You can explicitly disable topic garbage collection by setting <code 
class="highlighter-rouge">brokerDeleteInactiveTopicsEnabled</code> to <code 
class="highlighter-rouge">false</code> in your <a 
href="../../reference/Configuration/#Broker-ckhlfn">broker 
configuration</a>.</p>
 
 <p>To delete a global topic, close all producers and consumers on the topic 
and delete all its local subscriptions in every replication cluster. When 
Pulsar determines that no valid subscription for the topic remains across the 
system, it will garbage collect the topic.</p>
 
diff --git a/content/docs/latest/reference/RestApi/index.html 
b/content/docs/latest/reference/RestApi/index.html
index c68dc47..eefc163 100644
--- a/content/docs/latest/reference/RestApi/index.html
+++ b/content/docs/latest/reference/RestApi/index.html
@@ -4483,7 +4483,7 @@
           <h5>
             <code class="highlighter-rouge get">GET</code>
           </h5>
-          <p>Get all namespaces that are grouped by given anti-affinity group 
in a given cluster. api can be only accessed by admin of any of the existing 
tenant</p>
+          <p>Get all namespaces that are grouped by given anti-affinity group 
in a given cluster. api can be only accessed by admin of any of the existing 
property</p>
           
           <h5>URL parameters</h5>
           <table>
@@ -4512,7 +4512,7 @@
               </tr>
               
               <tr>
-                <td><code class="highlighter-rouge">tenant</code></td>
+                <td><code class="highlighter-rouge">property</code></td>
                 <td>query</td>
                 <td>false</td>
                 <td>string</td>
diff --git a/content/ja/reference/RestApi/index.html 
b/content/ja/reference/RestApi/index.html
index 658bc876..facdbc5 100644
--- a/content/ja/reference/RestApi/index.html
+++ b/content/ja/reference/RestApi/index.html
@@ -4234,7 +4234,7 @@
           <h5>
             <code class="highlighter-rouge get">GET</code>
           </h5>
-          <p>Get all namespaces that are grouped by given anti-affinity group 
in a given cluster. api can be only accessed by admin of any of the existing 
tenant</p>
+          <p>Get all namespaces that are grouped by given anti-affinity group 
in a given cluster. api can be only accessed by admin of any of the existing 
property</p>
           
           <h5>URL parameters</h5>
           <table>
@@ -4263,7 +4263,7 @@
               </tr>
               
               <tr>
-                <td><code class="highlighter-rouge">tenant</code></td>
+                <td><code class="highlighter-rouge">property</code></td>
                 <td>query</td>
                 <td>false</td>
                 <td>string</td>

Reply via email to