Merge branch 'master' of https://github.com/AgoraIO/agora_doc_source

Author: lemon-chen

en-US/dita/RTC-NG/API/api_irtcengine_setsimulcastconfig.dita

@@ -16,7 +16,7 @@
             <codeblock props="android" outputclass="language-java">public abstract int setSimulcastConfig(SimulcastConfig simulcastConfig);</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"/>
             <codeblock props="ios mac" outputclass="language-objectivec">- (int)setSimulcastConfig:(AgoraSimulcastConfig* _Nonnull)simulcastConfig NS_SWIFT_NAME(setSimulcastConfig(_:));</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfig(const SimulcastConfig&amp;amp; simulcastConfig) = 0;</codeblock>
+            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfig(const SimulcastConfig&amp; simulcastConfig) = 0;</codeblock>
             <codeblock props="bp" outputclass="language-cpp"/>
             <codeblock props="electron" outputclass="language-typescript"/>
             <codeblock props="unity cs" outputclass="language-csharp"/>

en-US/dita/RTC-NG/API/api_irtcengineex_setsimulcastconfigex.dita

@@ -16,7 +16,7 @@
             <codeblock props="android" outputclass="language-java">public abstract int setSimulcastConfigEx(SimulcastConfig simulcastConfig, RtcConnection connection);</codeblock>
             <codeblock props="hmos" outputclass="language-arkts"/>
             <codeblock props="ios mac" outputclass="language-objectivec">- (int)setSimulcastConfigEx:(AgoraSimulcastConfig*)simulcastConfig connection:(AgoraRtcConnection* _Nonnull)connection NS_SWIFT_NAME(setDualStreamModeEx(_:connection:));</codeblock>
-            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfigEx(const SimulcastConfig&amp;amp; simulcastConfig, const RtcConnection&amp;amp; connection) = 0;</codeblock>
+            <codeblock props="cpp unreal" outputclass="language-cpp">virtual int setSimulcastConfigEx(const SimulcastConfig&amp; simulcastConfig, const RtcConnection&amp; connection) = 0;</codeblock>
             <codeblock props="bp" outputclass="language-cpp"/>
             <codeblock props="electron" outputclass="language-typescript"/>
             <codeblock props="unity cs" outputclass="language-csharp"/>

en-US/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap

@@ -636,7 +636,7 @@
         <keydef keys="addVideoWatermark3" href="../API/api_irtcengine_addvideowatermark3.dita">
             <topicmeta>
                 <keywords>
-                    <keyword>addVideoWatermark</keyword>
+                    <keyword>addVideoWatermark [3/3]</keyword>
                 </keywords>
                 </topicmeta>
             </keydef>
@@ -3768,14 +3768,14 @@
             <keydef keys="addVideoWatermark1" href="../API/api_irtcengine_addvideowatermark.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>addVideoWatermark [1/2]</keyword>
+                        <keyword>addVideoWatermark [1/3]</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>
             <keydef keys="addVideoWatermark2" href="../API/api_irtcengine_addvideowatermark2.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>addVideoWatermark [2/2]</keyword>
+                        <keyword>addVideoWatermark [2/3]</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>
@@ -15276,4 +15276,4 @@
             </topicmeta>
         </keydef>
     </topichead>
-</map>
+</map>

en-US/dita/RTC-NG/config/keys-rtc-ng-api-java.ditamap

@@ -594,7 +594,7 @@
         <keydef keys="addVideoWatermark3" href="../API/api_irtcengine_addvideowatermark3.dita">
             <topicmeta>
                 <keywords>
-                    <keyword>addVideoWatermark</keyword>
+                    <keyword>addVideoWatermark [3/3]</keyword>
                 </keywords>
                 </topicmeta>
             </keydef>
@@ -608,7 +608,7 @@
         <keydef keys="addVideoWatermarkEx1" href="../API/api_irtcengineex_addvideowatermarkex1.dita">
             <topicmeta>
                 <keywords>
-                    <keyword>addVideoWatermarkEx</keyword>
+                    <keyword>addVideoWatermarkEx [2/2]</keyword>
                 </keywords>
                 </topicmeta>
             </keydef>
@@ -2192,7 +2192,7 @@
             <keydef keys="addVideoWatermarkEx" href="../API/api_irtcengineex_addvideowatermarkex.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>addVideoWatermarkEx</keyword>
+                        <keyword>addVideoWatermarkEx [1/2]</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>
@@ -4091,14 +4091,14 @@
             <keydef keys="addVideoWatermark1" href="../API/api_irtcengine_addvideowatermark.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>addVideoWatermark [1/2]</keyword>
+                        <keyword>addVideoWatermark [1/3]</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>
             <keydef keys="addVideoWatermark2" href="../API/api_irtcengine_addvideowatermark2.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>addVideoWatermark [2/2]</keyword>
+                        <keyword>addVideoWatermark [2/3]</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>
@@ -14632,4 +14632,4 @@
             </topicmeta>
         </keydef>
     </topichead>
-</map>
+</map>