diff --git a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/force-update.markdown b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/force-update.markdown
index 99adff658b..bc11dedac6 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/force-update.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/force-update.markdown
@@ -12,8 +12,8 @@
* You have an active connection to RavenDB's License Server (api.ravendb.net).
* [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) is set to false.
-* If changes were made to your current license and you want to __apply immediately__,
- then you can __force the update from Studio__.
+* If changes were made to your current license and you want to **apply immediately**,
+ then you can **force the update from Studio**.
This action also requires an active connection to the [License Server](../../start/licensing/licensing-overview#license-server).
* In this page:
@@ -27,10 +27,10 @@

-1. __About__
+1. **About**
Navigate to the _About_ page in Studio.
-2. __Force Update__
+2. **Force Update**
* Click the _FORCE UPDATE_ button.
This will update your current license immediately.
diff --git a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
index 6c7e549448..90f4dd4817 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
@@ -6,7 +6,7 @@
* The license key is in JSON format.
It is sent to the email address that was provided when obtaining the license.
-* There are a few __license types__ available, see below.
+* There are a few **license types** available, see below.
* Each license has a specific date on which it will expire.
To renew your license see [renew license](../../start/licensing/renew-license).
@@ -26,7 +26,7 @@ Visit the [pricing page](https://ravendb.net/buy) to see which features are incl
{INFO/}
{NOTE: }
-__Developer__
+**Developer**
* The developer license is for development use only and isn't applicable for commercial use.
You must upgrade this license before going into production.
@@ -41,28 +41,28 @@ __Developer__
{NOTE/}
{NOTE: }
-__Community__
+**Community**
* A basic production-grade license.
* Community licenses last for one year and can be renewed every year.
{NOTE/}
{NOTE: }
-__Professional__
+**Professional**
* A standard production-grade license.
* Extended automatically if the server has access to RavenDB's License Server.
{NOTE/}
{NOTE: }
-__Enterprise__
+**Enterprise**
* A high-performance, fully-featured production-grade license.
* Extended automatically if the server has access to RavenDB's License Server.
{NOTE/}
{NOTE: }
-__ISV Licenses__
+**ISV Licenses**
* ISV licenses are commercial licenses that allow you to redistribute RavenDB with your software
for on-premise installation and use by your customers.
@@ -82,23 +82,23 @@ __ISV Licenses__
* Go to the About page to see the version, license, and support info.
#### 2. Version
-* __Current version__:
+* **Current version**:
Specifies the current Server and Studio client versions used.
Knowing the version is important as documentation, features, and patches are version sensitive.
-* __Send Feedback__:
+* **Send Feedback**:
You can send RavenDB feedback about any issues you've encountered.
-* __Latest version info__:
+* **Latest version info**:
Specifies whether you are using the latest Server version.
If you need to upgrade to a new version see [upgrading instructions](../../start/installation/upgrading-to-new-version).
#### 3. License Information
-* __Type__:
+* **Type**:
Specifies which license type you're using.
-* __Expires__:
+* **Expires**:
Specifies the date on which the license will expire.
-* __Available features__:
+* **Available features**:
The features included with this license are listed.
-* __License Server__:
+* **License Server**:
Notifies if there is an active connection to RavenDB's License Server.
If you aren't connected, it is usually either because a firewall is blocking the connection,
or your server is running offline.
@@ -114,9 +114,9 @@ __ISV Licenses__
* Specifies the support options available under your current support plan.
#### 6. Links
-* __Access__:
+* **Access**:
Click to select RavenDB Community Discussions in GitHub, or Google Groups archive.
-* __Upgrade__:
+* **Upgrade**:
Click to go to the RavenDB support options page.
diff --git a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/renew-license.markdown b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/renew-license.markdown
index eca71cd501..26591156f2 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/renew-license.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/renew-license.markdown
@@ -4,12 +4,12 @@
{NOTE: }
-* When your license __expires__ the Studio is blocked.
+* When your license **expires** Studio is blocked.
Client API operations and other RavenDB features will continue to work.
However, any usage of expired RavenDB licenses is outside the license agreement
and doesn't comply with the [EULA terms](https://ravendb.net/terms).
-* __Renew your license__ as described below.
+* **Renew your license** as described below.
* In this page:
* [Renew commercial licenses](../../start/licensing/renew-license#renew-commercial-licenses)
@@ -21,10 +21,10 @@
{PANEL: Renew commercial licenses}
-* This section relates to all commercial licenses: __Professional__, __Enterprise__, and all __ISV licenses__.
+* This section relates to all commercial licenses: **Professional**, **Enterprise**, and all **ISV licenses**.
{NOTE: }
-__Automatic renewal__:
+**Automatic renewal**:
---
If your server has an active connection to RavenDB's [License Server](../../start/licensing/licensing-overview#license-server),
@@ -33,18 +33,18 @@ then these commercial licenses will be automatically renewed.
{NOTE/}
{NOTE: }
-__Manual (offline) renewal__:
+**Manual (offline) renewal**:
---
If the connection to the License Server is unavailable, contact [customer service](https://ravendb.net/contact) to extend your license.
-A license renewal email will be sent to you (the license ID will stay the __same__).
+A license renewal email will be sent to you (the license ID will stay the **same**).
Copy the new license key from the mail and proceed with one of the following options.
-__Either__:
+**Either**:
-* Replace the existing license key with the new one from the Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
+* Replace the existing license key with the new one from Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
-__Or__:
+**Or**:
* Set [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) to true.
@@ -57,28 +57,28 @@ __Or__:
{PANEL: Renew Developer & Community licenses}
-* The __Developer__ and __Community__ licenses are renewed from the Studio,
+* The **Developer** and **Community** licenses are renewed from Studio,
the 'Renew' button is available only for those license types.
* They can be renewed when there are less than 30 days remaining on your current license.

-1. __About__
+1. **About**
Navigate to the _About_ page in Studio
-2. __Renew__
+2. **Renew**
Click the _RENEW LICENSE_ button
* 
-3. __Renew__
+3. **Renew**
Click to renew the current license.
The renewed license will be sent to you by mail.
-4. __Submit__
+4. **Submit**
Paste the renewed license key and click Submit.
{PANEL/}
diff --git a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/replace-license.markdown b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/replace-license.markdown
index 7c7bc393d9..ee2161c3c4 100644
--- a/Documentation/5.2/Raven.Documentation.Pages/start/licensing/replace-license.markdown
+++ b/Documentation/5.2/Raven.Documentation.Pages/start/licensing/replace-license.markdown
@@ -5,7 +5,7 @@
{NOTE: }
* Upon [upgrading your license](https://ravendb.net/buy),
- RavenDB will send the __new license key__ to the email provided when obtaining the license.
+ RavenDB will send the **new license key** to the email provided when obtaining the license.
* You need to replace the existing license with the new one from the Studio, see below.
diff --git a/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/overview.markdown b/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/overview.markdown
index 3a1733f8e4..2e9378307c 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/overview.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/overview.markdown
@@ -28,16 +28,15 @@
{PANEL: Enabling PostgreSQL support}
----
-
### License
-* Your RavenDB license determines which features are available.
-* Visit Studio's **About** page to find which features are included in your license.
-
- 
-
-* If your current license doesn't include the PostgreSQL support, acquire [one that does](https://ravendb.net/buy).
+* Your RavenDB license determines which features are available for your server.
+* Visit Studio's [About](../../start/licensing/licensing-overview#manage-license-view)
+ page to find which features are included in your license.
+* PostgreSQL is enabled for all licenses.
+* To [use Power BI with RavenDB as its PostgreSQL server](../../integrations/postgresql-protocol/power-bi),
+ your license must explicitly enable Power BI.
+ If your current license doesn't include Power BI Support, you can acquire one that does [here](https://ravendb.net/buy).
---
@@ -48,13 +47,12 @@
{CODE-BLOCK:json}
"Integrations.PostgreSQL.Enabled": true
{CODE-BLOCK/}
-* If your license includes the **PostgreSQL Protocol Support** but not
- **Power BI Support**, enable RavenDB's [Experimental Features](../../server/configuration/core-configuration#features.availability)
+* PostgreSQL is an experimental feature. To enable it, enable RavenDB's
+ [Experimental Features](../../server/configuration/core-configuration#features.availability)
by adding this line to your server's `settings.json` file:
{CODE-BLOCK:json}
"Features.Availability": "Experimental"
{CODE-BLOCK/}
- If your license allows both features, you do **not** need to enable Experimental Features.
---
diff --git a/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/power-bi.markdown b/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/power-bi.markdown
index fddd54ab2b..b636ca9cdc 100644
--- a/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/power-bi.markdown
+++ b/Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/power-bi.markdown
@@ -10,6 +10,9 @@
* Easily select RavenDB collections and retrieve chosen data.
* Query RavenDB using [RQL](../../client-api/session/querying/what-is-rql).
+* To use RavenDB with Power BI, your [license](../../integrations/postgresql-protocol/overview#license)
+ must explicitly enable **Power BI** Support.
+
* In this page:
* [Using RavenDB From Power BI Desktop](../../integrations/postgresql-protocol/power-bi#using-ravendb-from-power-bi-desktop)
* [Connect to RavenDB](../../integrations/postgresql-protocol/power-bi#connect-to-ravendb)
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/activate-license.markdown b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/activate-license.markdown
new file mode 100644
index 0000000000..a3a643ffba
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/activate-license.markdown
@@ -0,0 +1,59 @@
+# Activate License
+
+---
+
+{NOTE: }
+
+* Each RavenDB cluster must be registered with its own license.
+
+* The license key is sent to the email that was provided when obtaining the license.
+ There are a few ways to **activate your license**, see below.
+
+* In this page:
+
+ * [Activate license with configuration keys](../../start/licensing/activate-license#activate-license-with-configuration-keys)
+ * [Activate license from Studio](../../start/licensing/activate-license#activate-license-from-studio)
+
+{NOTE/}
+
+---
+
+{PANEL: Activate license with configuration keys}
+
+* You can activate the license using either one of the following configuration keys:
+ * [License](../../server/configuration/license-configuration#license)
+ * [License.Path](../../server/configuration/license-configuration#license.path)
+
+* These configuration keys can be set in _setting.json_ or as environment variables.
+ Learn more in [configuration overview](../../server/configuration/configuration-options).
+
+{PANEL/}
+
+{PANEL: Activate license from Studio}
+
+You can activate the license from Studio:
+
+
+
+1. **About**
+ Navigate to the _About_ page in Studio
+
+2. **Activate**
+ Click the _REGISTER LICENSE_ button
+
+
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Licensing overview](../../start/licensing/licensing-overview)
+- [Replace license](../../start/licensing/replace-license)
+- [Renew license](../../start/licensing/renew-license)
+- [Force update license](../../start/licensing/force-update)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
+
+
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/force-update.markdown b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/force-update.markdown
new file mode 100644
index 0000000000..bc11dedac6
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/force-update.markdown
@@ -0,0 +1,55 @@
+# Force License Update
+
+---
+
+{NOTE: }
+
+* Every 24 hours (counted from server startup), RavenDB will check the [License Server](../../start/licensing/licensing-overview#license-server)
+ to see if there are any updates made to your current license that need to be applied.
+ This is done for all license types.
+
+* This automatic update will be applied provided that:
+ * You have an active connection to RavenDB's License Server (api.ravendb.net).
+ * [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) is set to false.
+
+* If changes were made to your current license and you want to **apply immediately**,
+ then you can **force the update from Studio**.
+ This action also requires an active connection to the [License Server](../../start/licensing/licensing-overview#license-server).
+
+* In this page:
+ * [Force license update from Studio](../../start/licensing/force-update#force-license-update-from-studio)
+
+{NOTE/}
+
+---
+
+{PANEL: Force license update from Studio}
+
+
+
+1. **About**
+ Navigate to the _About_ page in Studio.
+
+2. **Force Update**
+
+ * Click the _FORCE UPDATE_ button.
+ This will update your current license immediately.
+
+ * If [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) is set to _true_,
+ the license will be updated from the [configuration keys](../../start/licensing/activate-license#activate-license-with-configuration-keys).
+ If set to _false_, the license will be updated from the [License Server](../../start/licensing/licensing-overview#license-server), provided you have an active connection.
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Licensing overview](../../start/licensing/licensing-overview)
+- [Activate license](../../start/licensing/activate-license)
+- [Replace license](../../start/licensing/replace-license)
+- [Renew license](../../start/licensing/renew-license)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
+
+
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/about-page.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/about-page.png
new file mode 100644
index 0000000000..3c6827ff4f
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/about-page.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/force-update.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/force-update.png
new file mode 100644
index 0000000000..5a11c769fe
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/force-update.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/license-server.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/license-server.png
new file mode 100644
index 0000000000..285667127d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/license-server.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-1.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-1.png
new file mode 100644
index 0000000000..1017a56d04
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-1.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-2.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-2.png
new file mode 100644
index 0000000000..ef77f8ac80
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/register-2.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-1.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-1.png
new file mode 100644
index 0000000000..9a8c633213
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-1.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-2.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-2.png
new file mode 100644
index 0000000000..f0006a4dce
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/renew-2.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-1.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-1.png
new file mode 100644
index 0000000000..342dbce4d2
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-1.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-2.png b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-2.png
new file mode 100644
index 0000000000..c605d40c66
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/replace-2.png differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx
new file mode 100644
index 0000000000..63193559ab
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx
new file mode 100644
index 0000000000..67c9f221ec
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snagx
new file mode 100644
index 0000000000..d18e7cbd59
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-1.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-1.snagx
new file mode 100644
index 0000000000..bf4e286f4d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-1.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-2.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-2.snagx
new file mode 100644
index 0000000000..6586084caf
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/register-2.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-1.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-1.snagx
new file mode 100644
index 0000000000..e1477e0bf8
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-1.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-2.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-2.snagx
new file mode 100644
index 0000000000..453012dcf8
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/renew-2.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-1.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-1.snagx
new file mode 100644
index 0000000000..35797ba59d
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-1.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-2.snagx b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-2.snagx
new file mode 100644
index 0000000000..0ba8a4c5bf
Binary files /dev/null and b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/images/snag/replace-2.snagx differ
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
new file mode 100644
index 0000000000..b9adb2357f
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
@@ -0,0 +1,150 @@
+# Licensing Overview
+---
+
+{NOTE: }
+
+* The license key is in JSON format.
+ It is sent to the email address that was provided when obtaining the license.
+
+* A few **License Types** are available, learn more about them below.
+ {INFO: }
+ Visit the [Pricing page](https://ravendb.net/buy) to see **which features are included with each license type**.
+ {INFO/}
+
+* Each license has a specific expiration date.
+ To renew your license see [renew license](../../start/licensing/renew-license).
+
+* In this page:
+ * [License types](../../start/licensing/licensing-overview#license-types)
+ * [Developer](../../start/licensing/licensing-overview#developer)
+ * [Community](../../start/licensing/licensing-overview#community)
+ * [Professional](../../start/licensing/licensing-overview#professional)
+ * [Enterprise](../../start/licensing/licensing-overview#enterprise)
+ * [ISV Licenses](../../start/licensing/licensing-overview#isv-licenses)
+ * [Manage license view](../../start/licensing/licensing-overview#manage-license-view)
+
+{NOTE/}
+
+---
+
+{PANEL: License types}
+
+{INFO: }
+Visit the [pricing page](https://ravendb.net/buy) to see which features are included with each license type.
+{INFO/}
+
+---
+
+### Developer
+
+* The developer license is for development use only and isn't applicable for commercial use.
+ You must upgrade this license before going into production.
+* It is fully featured but temporary - license lasts 6 months and can be renewed.
+* Certificates exceeding 4 months expiration period are Not allowed to be used with this license.
+ Automatic renewal of Let’s Encrypt certificates is disabled.
+* When you are ready to go into production:
+ * Be sure to choose a license that has all features with which your client was developed.
+ * [Upgrade to a production license](https://ravendb.net/buy) and then [replace](../../start/licensing/replace-license) the developer license.
+
+* The developer license can be obtained [here](https://ravendb.net/buy#developer).
+
+---
+
+### Community
+
+* A basic production-grade license.
+* Community licenses last one year and can be renewed every year.
+* Servers using a Community license are **required to run the latest major version**.
+ E.g., if RavenDB `7.0` is released and your server runs RavenDB `6.2` with a Community license,
+ you will be required to upgrade RavenDB to version `7.0`.
+ Running a major version older than the latest with a Community license will **block your server's access to Studio**.
+
+---
+
+### Professional
+
+* A standard production-grade license.
+* Extended automatically if the server has access to RavenDB's License Server.
+
+---
+
+### Enterprise
+
+* A high-performance, fully-featured production-grade license.
+* Extended automatically if the server has access to RavenDB's License Server.
+
+---
+
+### ISV Licenses
+
+* ISV licenses are commercial licenses that allow you to redistribute RavenDB with your software
+ for on-premise installation and use by your customers.
+* Available ISV license types are: Essential, Professional, and Enterprise.
+* [Contact RavenDB for more details](https://ravendb.net/contact).
+
+{PANEL/}
+
+{PANEL: Manage license view}
+
+
+
+#### 1. About
+* Go to the About page to see the version, license, and support info.
+
+#### 2. Version
+* **Current version**:
+ Specifies the current Server and Studio client versions used.
+ Knowing the version is important as documentation, features, and patches are version sensitive.
+* **Send Feedback**:
+ You can send RavenDB feedback about any issues you've encountered.
+* **Latest version info**:
+ Specifies whether you are using the latest Server version.
+ If you need to upgrade to a new version see [upgrading instructions](../../start/installation/upgrading-to-new-version).
+
+#### 3. License Information
+* **Type**:
+ Specifies which license type you're using.
+* **Expires**:
+ Specifies the date on which the license will expire.
+* **Available features**:
+ The features included with this license are listed.
+* **License Server**:
+ Notifies if there is an active connection to RavenDB's License Server.
+ If you aren't connected, it is usually either because a firewall is blocking the connection,
+ or your server is running offline.
+ * Make sure that RavenDB has access to `api.ravendb.net`.
+ * Click the refresh button to check the connection.
+
+ 
+
+#### 4. Available actions
+* [Replace License](../../start/licensing/replace-license) / [Force Update](../../start/licensing/force-update) / [Renew License](../../start/licensing/renew-license)
+
+#### 5. Support plan
+* Specifies the support options available under your current support plan.
+
+#### 6. Links
+* **Access**:
+ Click to select RavenDB Community Discussions in GitHub, or Google Groups archive.
+* **Upgrade**:
+ Click to go to the RavenDB support options page.
+
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Activate license](../../start/licensing/activate-license)
+- [Replace license](../../start/licensing/replace-license)
+- [Renew license](../../start/licensing/renew-license)
+- [Force update license](../../start/licensing/force-update)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
+
+## Related Links
+
+- [Get License](https://ravendb.net/buy)
+- [Support Options](https://ravendb.net/support)
+
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/renew-license.markdown b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/renew-license.markdown
new file mode 100644
index 0000000000..16b786046e
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/renew-license.markdown
@@ -0,0 +1,105 @@
+# Renew License
+
+---
+
+{NOTE: }
+
+* When your license **expires** Studio is blocked.
+ Client API operations and other RavenDB features will continue to work.
+ However, any usage of expired RavenDB licenses is outside the license agreement
+ and doesn't comply with the [EULA terms](https://ravendb.net/terms).
+
+* **Renew your license** as described below.
+
+* In this page:
+ * [Renew commercial licenses](../../start/licensing/renew-license#renew-commercial-licenses)
+ * [Renew Developer & Community licenses](../../start/licensing/renew-license#renew-developer-&-community-licenses)
+
+{NOTE/}
+
+---
+
+{PANEL: Renew commercial licenses}
+
+* This section relates to all commercial licenses: **Professional**, **Enterprise**, and all **ISV licenses**.
+
+{NOTE: }
+**Automatic renewal**:
+
+---
+If your server has an active connection to RavenDB's [License Server](../../start/licensing/licensing-overview#license-server),
+and if the [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) configuration is Not set to true,
+then these commercial licenses will be automatically renewed.
+{NOTE/}
+
+{NOTE: }
+**Manual (offline) renewal**:
+
+---
+If the connection to the License Server is unavailable, contact [customer service](https://ravendb.net/contact) to extend your license.
+A license renewal email will be sent to you (the license ID will stay the **same**).
+Copy the new license key from the mail and proceed with one of the following options.
+
+**Either**:
+
+* Replace the existing license key with the new one from Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
+
+**Or**:
+
+* Set [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) to true.
+
+* Activate the new license key using the [configuration keys](../../start/licensing/activate-license#activate-license-with-configuration-keys).
+
+* Restart your server (needed only if any configuration key was changed).
+ {NOTE/}
+
+{PANEL/}
+
+{PANEL: Renew Developer & Community licenses}
+
+* The **Developer** and **Community** licenses are renewed from Studio,
+ the 'Renew' button is available only for those license types.
+ {NOTE: }
+
+ - Servers using a Community license are **required to run the latest major version**.
+ E.g., if RavenDB `7.0` is released and your server runs RavenDB `6.2` with a Community license,
+ you will be required to upgrade RavenDB to version `7.0`.
+ - Running a major version older than the latest with a Community license will **block your server's access to Studio**.
+ - This requirement does not apply to licenses other than _Community_.
+ {NOTE/}
+
+* They can be renewed when there are less than 30 days remaining on your current license.
+
+
+
+1. **About**
+ Navigate to the _About_ page in Studio
+
+2. **Renew**
+ Click the _Renew License_ button
+
+ * 
+
+3. **Renew**
+ Click to renew the current license.
+ The renewed license will be sent to you by mail.
+
+4. **Submit**
+ Paste the renewed license key and click Submit.
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Licensing overview](../../start/licensing/licensing-overview)
+- [Activate license](../../start/licensing/activate-license)
+- [Replace license](../../start/licensing/replace-license)
+- [Force update license](../../start/licensing/force-update)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
+
+
+
+
diff --git a/Documentation/5.4/Raven.Documentation.Pages/start/licensing/replace-license.markdown b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/replace-license.markdown
new file mode 100644
index 0000000000..ee2161c3c4
--- /dev/null
+++ b/Documentation/5.4/Raven.Documentation.Pages/start/licensing/replace-license.markdown
@@ -0,0 +1,54 @@
+# Replace License
+
+---
+
+{NOTE: }
+
+* Upon [upgrading your license](https://ravendb.net/buy),
+ RavenDB will send the **new license key** to the email provided when obtaining the license.
+
+* You need to replace the existing license with the new one from the Studio, see below.
+
+* In this page:
+ * [Replace license from Studio](../../start/licensing/replace-license#replace-license-from-studio)
+ * [Maintain auto-renewal of Let's Encrypt certificates](../../start/licensing/replace-license#maintain-auto-renewal-of-let)
+
+{NOTE/}
+
+---
+
+{PANEL: Replace license from Studio}
+
+Replace the existing license with the new one from the Studio:
+
+
+
+1. **About**
+ Navigate to the _About_ page in Studio
+
+2. **Replace**
+ Click the _REPLACE LICENSE_ button
+
+
+
+{PANEL/}
+
+{PANEL: Maintain auto-renewal of Let's Encrypt certificates }
+
+* If you have set up with the [Setup Wizard](../../start/installation/setup-wizard) and used a Let's Encrypt certificate,
+ contact [customer support](https://ravendb.net/contact) when changing your license to maintain auto-renewals of certificates.
+* Otherwise, changing your license ID will cause a mismatch between the new license ID
+ and the ID that Let's Encrypt expects when renewing the certificate.
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Licensing overview](../../start/licensing/licensing-overview)
+- [Activate license](../../start/licensing/activate-license)
+- [Renew license](../../start/licensing/renew-license)
+- [Force update license](../../start/licensing/force-update)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
diff --git a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/activate-license.markdown b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/activate-license.markdown
index f38a85592c..f640a78988 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/activate-license.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/activate-license.markdown
@@ -7,7 +7,7 @@
* Each RavenDB cluster must be registered with its own license.
* The license key is sent to the email that was provided when obtaining the license.
- There are a few ways to __activate your license__, see below.
+ There are a few ways to **activate your license**, see below.
* In this page:
diff --git a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/force-update.markdown b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/force-update.markdown
index aa793d3a41..e49f390aaf 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/force-update.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/force-update.markdown
@@ -12,8 +12,8 @@
* You have an active connection to RavenDB's License Server (api.ravendb.net).
* [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) is set to false.
-* If changes were made to your current license and you want to __apply immediately__,
- then you can __force the update from Studio__.
+* If changes were made to your current license and you want to **apply immediately**,
+ then you can **force the update from Studio**.
This action also requires an active connection to the [License Server](../../start/licensing/licensing-overview#license-server).
* In this page:
diff --git a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/renew-license.markdown b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/renew-license.markdown
index 672fe8cee7..92cbaf8830 100644
--- a/Documentation/6.0/Raven.Documentation.Pages/start/licensing/renew-license.markdown
+++ b/Documentation/6.0/Raven.Documentation.Pages/start/licensing/renew-license.markdown
@@ -4,12 +4,12 @@
{NOTE: }
-* When your license __expires__ the Studio is blocked.
+* When your license **expires** Studio is blocked.
Client API operations and other RavenDB features will continue to work.
However, any usage of expired RavenDB licenses is outside the license agreement
and doesn't comply with the [EULA terms](https://ravendb.net/terms).
-* __Renew your license__ as described below.
+* **Renew your license** as described below.
* In this page:
* [Renew commercial licenses](../../start/licensing/renew-license#renew-commercial-licenses)
@@ -21,10 +21,10 @@
{PANEL: Renew commercial licenses}
-* This section relates to all commercial licenses: __Professional__, __Enterprise__, and all __ISV licenses__.
+* This section relates to all commercial licenses: **Professional**, **Enterprise**, and all **ISV licenses**.
{NOTE: }
-__Automatic renewal__:
+**Automatic renewal**:
---
If your server has an active connection to RavenDB's [License Server](../../start/licensing/licensing-overview#license-server),
@@ -33,18 +33,18 @@ then these commercial licenses will be automatically renewed.
{NOTE/}
{NOTE: }
-__Manual (offline) renewal__:
+**Manual (offline) renewal**:
---
If the connection to the License Server is unavailable, contact [customer service](https://ravendb.net/contact) to extend your license.
-A license renewal email will be sent to you (the license ID will stay the __same__).
+A license renewal email will be sent to you (the license ID will stay the **same**).
Copy the new license key from the mail and proceed with one of the following options.
-__Either__:
+**Either**:
-* Replace the existing license key with the new one from the Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
+* Replace the existing license key with the new one from Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
-__Or__:
+**Or**:
* Set [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) to true.
@@ -57,22 +57,28 @@ __Or__:
{PANEL: Renew Developer & Community licenses}
-* The __Developer__ and __Community__ licenses are renewed from the Studio,
+* The **Developer** and **Community** licenses are renewed from Studio,
the 'Renew' button is available only for those license types.
+ {NOTE: }
+
+ - Servers using a Community license are **required to run the latest major version**.
+ E.g., if RavenDB `7.0` is released and your server runs RavenDB `6.2` with a Community license,
+ you will be required to upgrade RavenDB to version `7.0`.
+ - Running a major version older than the latest with a Community license will **block your server's access to Studio**.
+ - This requirement does not apply to licenses other than _Community_.
+ {NOTE/}
* They can be renewed when there are less than 30 days remaining on your current license.

1. **About**
- Click to open the Studio _About_ view
+ Click to open Studio _About_ view
2. **Renew**
Click the _Renew License_ button
-
* 
-
**A**. **Renew**
Click to renew the current license.
diff --git a/Documentation/6.2/Raven.Documentation.Pages/sharding/overview.markdown b/Documentation/6.2/Raven.Documentation.Pages/sharding/overview.markdown
index 7aaebb8770..794bb0efdf 100644
--- a/Documentation/6.2/Raven.Documentation.Pages/sharding/overview.markdown
+++ b/Documentation/6.2/Raven.Documentation.Pages/sharding/overview.markdown
@@ -131,7 +131,7 @@ can access a sharded database without any alterations.
That said, shard-specific operations are also available:
a client can, for example, track the shard where a document is stored and query that shard.
-The Studio can be used to relocate ([reshard](../sharding/resharding)) documents from one shard to another.
+Studio can be used to relocate ([reshard](../sharding/resharding)) documents from one shard to another.

diff --git a/Documentation/6.2/Raven.Documentation.Pages/start/test-driver.dotnet.markdown b/Documentation/6.2/Raven.Documentation.Pages/start/test-driver.dotnet.markdown
index 6905c8c549..0b5e76a1bb 100644
--- a/Documentation/6.2/Raven.Documentation.Pages/start/test-driver.dotnet.markdown
+++ b/Documentation/6.2/Raven.Documentation.Pages/start/test-driver.dotnet.markdown
@@ -216,9 +216,11 @@ will be able to use up to 9 cores and run way faster.
may therefore miss out on much of their system's potential.
* If the configuration option is set to **`false`**, **no exception will be thrown**
even if a license cannot be validated.
- * `TestServerOptions.Licensing.ThrowOnInvalidOrMissingLicense` is set by default to `true`
- since RavenDB version `6.2`, so a `LicenseExpiredException` exception **would** be thrown
+ * Since RavenDB version `6.2`, `TestServerOptions.Licensing.ThrowOnInvalidOrMissingLicense`
+ is set by default to `true` so a `LicenseExpiredException` exception **would** be thrown
if the embedded server used by TestDriver fails to validate a license.
+ Users that prefer that no exception would be thrown if an unlicensed embedded server
+ is used, can explicitly set the configuration option to **`false`**.
* Additional `TestServerOptions.Licensing` configuration options are available as well,
you can read about them [here](../server/embedded#licensing-options).
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/1.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/1.png
new file mode 100644
index 0000000000..3c387c7238
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/1.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/2.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/2.png
new file mode 100644
index 0000000000..1567be3b12
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/2.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/3.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/3.png
new file mode 100644
index 0000000000..95926c1c2c
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/3.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/4.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/4.png
new file mode 100644
index 0000000000..95e2e4ebc4
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/4.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/5.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/5.png
new file mode 100644
index 0000000000..fdf935fca2
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/5.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/about-page.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/about-page.png
new file mode 100644
index 0000000000..8db22ccc41
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/about-page.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/force-update.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/force-update.png
new file mode 100644
index 0000000000..e43e9fa778
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/force-update.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license-server.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license-server.png
new file mode 100644
index 0000000000..5c902f19db
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license-server.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_details_tab.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_details_tab.png
new file mode 100644
index 0000000000..e7e0f9eecb
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_details_tab.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_info.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_info.png
new file mode 100644
index 0000000000..c3f535fa80
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_info.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_options.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_options.png
new file mode 100644
index 0000000000..2b5f314e85
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/license_options.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/licensed-server.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/licensed-server.png
new file mode 100644
index 0000000000..d21e62939f
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/licensed-server.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-button.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-button.png
new file mode 100644
index 0000000000..c5d8836c66
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-button.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-form.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-form.png
new file mode 100644
index 0000000000..dca8c610fa
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/register-license-form.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-and-submit.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-and-submit.png
new file mode 100644
index 0000000000..eab8d53439
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-and-submit.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-license.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-license.png
new file mode 100644
index 0000000000..d89ec04a66
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/renew-license.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_button.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_button.png
new file mode 100644
index 0000000000..7928418dd2
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_button.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_paste-and-submit.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_paste-and-submit.png
new file mode 100644
index 0000000000..b30687bd58
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_paste-and-submit.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_replace-license-tool.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_replace-license-tool.png
new file mode 100644
index 0000000000..141b66a9db
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/replace-license_replace-license-tool.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx
new file mode 100644
index 0000000000..f83d918678
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/about-page.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx
new file mode 100644
index 0000000000..13a068d5ba
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/force-update.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snag b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snag
new file mode 100644
index 0000000000..3f7be26f60
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license-server.snag differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_details_tab.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_details_tab.snagx
new file mode 100644
index 0000000000..4d022a4c8f
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_details_tab.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_info.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_info.snagx
new file mode 100644
index 0000000000..6de5c9f12c
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_info.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_options.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_options.snagx
new file mode 100644
index 0000000000..77049f02d3
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/license_options.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/licensed-server.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/licensed-server.snagx
new file mode 100644
index 0000000000..298c83e7ef
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/licensed-server.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-button.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-button.snagx
new file mode 100644
index 0000000000..87f28a1af4
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-button.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-form.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-form.snagx
new file mode 100644
index 0000000000..1e6fc8d61e
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/register-license-form.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-and-submit.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-and-submit.snagx
new file mode 100644
index 0000000000..2ba7fd69d2
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-and-submit.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-license.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-license.snagx
new file mode 100644
index 0000000000..6abb376268
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/renew-license.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_button.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_button.snagx
new file mode 100644
index 0000000000..9064f6500e
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_button.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_paste-and-submit.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_paste-and-submit.snagx
new file mode 100644
index 0000000000..b1220c9ee0
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_paste-and-submit.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_replace-license-tool.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_replace-license-tool.snagx
new file mode 100644
index 0000000000..a5cf8832e0
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/replace-license_replace-license-tool.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/software_version.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/software_version.snagx
new file mode 100644
index 0000000000..7fc626b1c1
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/software_version.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_and_ommunity.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_and_ommunity.snagx
new file mode 100644
index 0000000000..5f3ca7f3de
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_and_ommunity.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_plan_tab.snagx b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_plan_tab.snagx
new file mode 100644
index 0000000000..3c7db622d7
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/snag/support_plan_tab.snagx differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/software_version.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/software_version.png
new file mode 100644
index 0000000000..0c2243ecc8
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/software_version.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_and_ommunity.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_and_ommunity.png
new file mode 100644
index 0000000000..fa3a15c2b9
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_and_ommunity.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_plan_tab.png b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_plan_tab.png
new file mode 100644
index 0000000000..e40d52ccfd
Binary files /dev/null and b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/images/support_plan_tab.png differ
diff --git a/Documentation/7.0/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
new file mode 100644
index 0000000000..135a77d10b
--- /dev/null
+++ b/Documentation/7.0/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown
@@ -0,0 +1,163 @@
+# Licensing Overview
+---
+
+{NOTE: }
+
+* The license key is in JSON format.
+ It is sent to the email address that was provided when the license was obtained.
+
+* A few **License Types** are available, learn more about them below.
+ {INFO: }
+ Visit the [Pricing page](https://ravendb.net/buy) to see **which features are included with each license type**.
+ {INFO/}
+
+* Each license has a specific expiration date.
+ To renew your license see [renew license](../../start/licensing/renew-license).
+
+* In this page:
+ * [License types](../../start/licensing/licensing-overview#license-types)
+ * [Developer](../../start/licensing/licensing-overview#developer)
+ * [Community](../../start/licensing/licensing-overview#community)
+ * [Professional](../../start/licensing/licensing-overview#professional)
+ * [Enterprise](../../start/licensing/licensing-overview#enterprise)
+ * [ISV Licenses](../../start/licensing/licensing-overview#isv-licenses)
+ * [Manage license view](../../start/licensing/licensing-overview#manage-license-view)
+
+{NOTE/}
+
+---
+
+{PANEL: License types}
+
+{INFO: }
+Visit the [pricing page](https://ravendb.net/buy) to see which features are included with each license type.
+{INFO/}
+
+---
+
+### Developer
+
+* The developer license is for development use only and isn't applicable for commercial use.
+ You must upgrade this license before going into production.
+* It is fully featured but temporary - license lasts 6 months and can be renewed.
+* Certificates exceeding 4 months expiration period are Not allowed to be used with this license.
+ Automatic renewal of Let’s Encrypt certificates is disabled.
+* When you are ready to go into production:
+ * Be sure to choose a license that has all features with which your client was developed.
+ * [Upgrade to a production license](https://ravendb.net/buy) and then [replace](../../start/licensing/replace-license) the developer license.
+
+* The developer license can be obtained [here](https://ravendb.net/buy#developer).
+
+---
+
+### Community
+
+* A basic production-grade license.
+* Community licenses last one year and can be renewed every year.
+* Servers using a Community license are **required to run the latest major version**.
+ E.g., if RavenDB `7.0` is released and your server runs RavenDB `6.2` with a Community license,
+ you will be required to upgrade RavenDB to version `7.0`.
+ Running a major version older than the latest with a Community license will **block your server's access to Studio**.
+
+---
+
+### Professional
+
+* A standard production-grade license.
+* Extended automatically if the server has access to RavenDB's License Server.
+
+---
+
+### Enterprise
+
+* A high-performance, fully-featured production-grade license.
+* Extended automatically if the server has access to RavenDB's License Server.
+
+---
+
+### ISV Licenses
+
+* ISV licenses are commercial licenses that allow you to redistribute RavenDB with your software
+ for on-premise installation and use by your customers.
+* Available ISV license types are: Essential, Professional, and Enterprise.
+* [Contact RavenDB for more details](https://ravendb.net/contact).
+
+{PANEL/}
+
+{PANEL: Manage license view}
+
+
+
+1. **About**
+ Click to open the About page and view RavenDB version, license, support info, and more.
+
+2. **License**
+
+ 
+
+ * A. Informs you of your current license type
+ * B. Informs you of your license expiration date
+ * C. Informs you whether your server is currently connected to RavenDB's license server.
+ When connected, you can:
+ 
+ * **Renew License** to extend its expiration date
+ * **Replace** your license
+ * **Force update** to sync with the license server
+
+ {INFO: }
+ Connectivity issues are often caused by a firewall blocking the connection,
+ or the server running offline.
+
+ * Make sure that RavenDB has access to `api.ravendb.net`.
+ * Click the refresh button to check the connection.
+ {INFO/}
+
+3. **Software Version**
+
+ 
+
+ * **Server version**
+ Shows your current server version.
+ Click `Changelog` to see logged version changes.
+ * **Updates**
+ Informs you whether you are using the latest server version.
+ Click Check for updates to see if an update is available.
+
+4. **Support & Community**
+
+ 
+
+ * **Support type**
+ Informs you of the support type you are entitled to,
+ and allows you to join our community GitHub discussions.
+ * **Let's solve it together**
+ Allows you to join our developers Discord community.
+
+5. **License details tab**
+ Details the features that are enabled for your server with each license type.
+ Use the scrollbar to slide through the full features list.
+
+ 
+
+6. **Support plan tab**
+ Specifies your current support plan and allows you to upgrade it.
+
+ 
+
+{PANEL/}
+
+## Related Articles
+
+### Licensing
+- [Activate license](../../start/licensing/activate-license)
+- [Replace license](../../start/licensing/replace-license)
+- [Renew license](../../start/licensing/renew-license)
+- [Force update license](../../start/licensing/force-update)
+
+### Server
+- [License configuration options](../../server/configuration/license-configuration)
+
+## Related Links
+- [Get License](https://ravendb.net/buy)
+- [Support Options](https://ravendb.net/support)
+