Merge remote-tracking branch 'origin/NLPCRAFT-41' into NLPCRAFT-120
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
index 1276c8e..b56137d 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCConversation.java
@@ -24,14 +24,14 @@
  * Conversation container.
  * <p>
  * Conversation management is based on idea of a short-term-memory (STM). STM can be viewed as a condensed
- * short-term history of the user input for a given user and data model. Every submitted user request that wasn't
+ * short-term history of the input for a given user and data model. Every submitted user request that wasn't
  * rejected is added to the conversation STM as a list of {@link NCToken tokens}. Existing STM tokens belonging to
  * the same {@link NCElement#getGroups() group} will be overridden by the more recent tokens from the same group.
- * Note also that tokens in STM automatically expire (i.e. context is "forgotten") after a certain period of time
- * or based on other internal logic. Note that you should not rely on a specific expiration behavior as its logic
- * may be changed in the future.
+ * Note also that tokens in STM automatically expire (i.e. context is "forgotten") after a certain period of time.
  *
  * @see NCContext#getConversation()
+ * @see NCModelView#getConversationDepth()
+ * @see NCModelView#getConversationTimeout()
  */
 public interface NCConversation {
     /**
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelView.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelView.java
index 328734e..2d363da 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelView.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCModelView.java
@@ -980,7 +980,7 @@
      * combined define the expiration policy for the conversation management. These two properties allow to
      * fine tune for different types of dialogs. For example, setting longer timeout and smaller depth mimics
      * slow-moving but topic-focused conversation. Alternatively, settings shorter timeout and longer depth better
-     * supports fast-moving wide-ranged conversation.
+     * supports fast-moving wide-ranged conversation that may cover multiple topics.
      * <p>
      * <b>Default</b>
      * <br>
@@ -1012,7 +1012,7 @@
      * combined define the expiration policy for the conversation management. These two properties allow to
      * fine tune for different types of dialogs. For example, setting longer timeout and smaller depth mimics
      * slow-moving but topic-focused conversation. Alternatively, settings shorter timeout and longer depth better
-     * supports fast-moving wide-ranged conversation.
+     * supports fast-moving wide-ranged conversation that may cover multiple topics.
      * <p>
      * <b>Default</b>
      * <br>