From 1b352f063f63b8709dcf80068ebbdca1578fa863 Mon Sep 17 00:00:00 2001
From: "abby.huang" <78209557+abby-cyber@users.noreply.github.com>
Date: Fri, 26 May 2023 16:56:48 +0800
Subject: [PATCH] tag-license-to-ent-only

---
 .../2.license-center.md                       | 24 +++++++++++++++++++
 .../3.license-manager.md                      |  4 ++++
 mkdocs.yml                                    | 10 ++++++++
 3 files changed, 38 insertions(+)

diff --git a/docs-2.0/9.about-license/2.license-management-suite/2.license-center.md b/docs-2.0/9.about-license/2.license-management-suite/2.license-center.md
index 429012d4154..37afb5fc41e 100644
--- a/docs-2.0/9.about-license/2.license-management-suite/2.license-center.md
+++ b/docs-2.0/9.about-license/2.license-management-suite/2.license-center.md
@@ -10,7 +10,11 @@ This article introduces how to set up an LC account, bind the LMID, and generate
 
 ## Preparations
 
+<<<<<<< HEAD
 To use LC, you must first purchase a NebulaGraph license. For more information, see [Purchase a license](../3.purchase-license.md).
+=======
+[You have purchased a NebulaGraph license](../3.purchase-license.md)
+>>>>>>> a98554885 (tag-license-to-ent-only (#2097))
 
 ## Set up an LC account
 
@@ -121,12 +125,32 @@ In the **Purchased Resources** section, you can view the purchased query and sto
 After you bind the LMID, a license key is automatically generated and the **License Key** section displays the license key information.
 
 - Online license keys
+<<<<<<< HEAD
 
   An online license allows you to obtain the latest license information from LC. 
 
   When binding your LMID, select the **Online** mode to generate an online license key. After you [load the key into the LM service](3.license-manager.md#load_a_license_key), the LM can retrieve the latest license information regularly.
 
 - Offline license keys
+=======
+  
+  An online license allows you to obtain the latest license information from LC. 
+
+  When binding your LMID, select the **Online** mode to generate an online license key. After you enter the online key into the LM service, the LM can retrieve the latest license information regularly.
+
+- Offline license keys
+  
+  Compared to an online license key, an offline license key contains fixed license information. If the license information is updated, a new offline license key must be obtained.
+
+  When binding your LMID, select the **Offline** mode to generate an offline license key. After you enter the offline license key into your LM, the LM service stores fixed license information. 
+
+!!! note 
+
+    You can choose a license key type based on your LM accessibility. 
+
+    - If your LM is accessible from the internet, you can select either **Online** or **Offline** mode. The **Online** mode is recommended, as it generates an online license key.
+    - If your LM is not accessible from the internet, then **Offline** mode is the only option available for generating an offline license key, as it can't reach out to the license server to validate the key itself.
+>>>>>>> a98554885 (tag-license-to-ent-only (#2097))
 
   Compared to an online license key, an offline license key contains fixed license information. If the license information is updated, a new offline license key must be obtained.
 
diff --git a/docs-2.0/9.about-license/2.license-management-suite/3.license-manager.md b/docs-2.0/9.about-license/2.license-management-suite/3.license-manager.md
index fb0908d36dd..667dc148a51 100644
--- a/docs-2.0/9.about-license/2.license-management-suite/3.license-manager.md
+++ b/docs-2.0/9.about-license/2.license-management-suite/3.license-manager.md
@@ -6,10 +6,14 @@ This article introduces how to deploy and use an LM service in a Linux environme
 
 ## Preparations
 
+<<<<<<< HEAD
 To use an LM, you need to make sure the following:
 
 - [You have purchased a NebulaGraph license](../3.purchase-license.md).
 
+=======
+- [You have purchased a NebulaGraph license](../3.purchase-license.md).
+>>>>>>> a98554885 (tag-license-to-ent-only (#2097))
 - You have obtained the desired LM installation package.
   
   !!! note
diff --git a/mkdocs.yml b/mkdocs.yml
index b40c7baf6ff..dd80adeb8f7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -285,14 +285,24 @@ nav:
         - Graph Service: 1.introduction/3.nebula-graph-architecture/3.graph-service.md
         - Storage Service:  1.introduction/3.nebula-graph-architecture/4.storage-service.md
   #ent
+<<<<<<< HEAD
   - Licensing: 
     - Licensing overview: 9.about-license/1.license-overview.md
+=======
+  - About NebulaGraph licenses: 
+    - License overview: 9.about-license/1.license-overview.md
+>>>>>>> a98554885 (tag-license-to-ent-only (#2097))
     - License management suites: 
       - Suite overview: 9.about-license/2.license-management-suite/1.suite-overview.md
       - License Center: 9.about-license/2.license-management-suite/2.license-center.md
       - License Manager: 9.about-license/2.license-management-suite/3.license-manager.md
     - Purchase licenses: 9.about-license/3.purchase-license.md
+<<<<<<< HEAD
     - Manage licenses: 9.about-license/4.manage-license.md
+=======
+    - Generate and load a license key: 9.about-license/4.generate-and-load-license-key.md
+    - Manage licenses: 9.about-license/5.manage-license.md
+>>>>>>> a98554885 (tag-license-to-ent-only (#2097))
   #ent 
   - Quick start:
       - Getting started with NebulaGraph: 2.quick-start/1.quick-start-workflow.md