Skip to content

Commit 2764ec3

Browse files
authored
Merge pull request #2008 from reebhub/licensing
Update licensing issues
2 parents 21724fa + 2341fbb commit 2764ec3

File tree

74 files changed

+659
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+659
-64
lines changed

Documentation/5.2/Raven.Documentation.Pages/start/licensing/force-update.markdown

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* You have an active connection to RavenDB's License Server (api.ravendb.net).
1313
* [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) is set to false.
1414

15-
* If changes were made to your current license and you want to __apply immediately__,
16-
then you can __force the update from Studio__.
15+
* If changes were made to your current license and you want to **apply immediately**,
16+
then you can **force the update from Studio**.
1717
This action also requires an active connection to the [License Server](../../start/licensing/licensing-overview#license-server).
1818

1919
* In this page:
@@ -27,10 +27,10 @@
2727

2828
![Force Update](images/force-update.png "Force-update")
2929

30-
1. __About__
30+
1. **About**
3131
Navigate to the _About_ page in Studio.
3232

33-
2. __Force Update__
33+
2. **Force Update**
3434

3535
* Click the _FORCE UPDATE_ button.
3636
This will update your current license immediately.

Documentation/5.2/Raven.Documentation.Pages/start/licensing/licensing-overview.markdown

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* The license key is in JSON format.
77
It is sent to the email address that was provided when obtaining the license.
88

9-
* There are a few __license types__ available, see below.
9+
* There are a few **license types** available, see below.
1010

1111
* Each license has a specific date on which it will expire.
1212
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
2626
{INFO/}
2727

2828
{NOTE: }
29-
__Developer__
29+
**Developer**
3030

3131
* The developer license is for development use only and isn't applicable for commercial use.
3232
You must upgrade this license before going into production.
@@ -41,28 +41,28 @@ __Developer__
4141
{NOTE/}
4242

4343
{NOTE: }
44-
__Community__
44+
**Community**
4545

4646
* A basic production-grade license.
4747
* Community licenses last for one year and can be renewed every year.
4848
{NOTE/}
4949

5050
{NOTE: }
51-
__Professional__
51+
**Professional**
5252

5353
* A standard production-grade license.
5454
* Extended automatically if the server has access to RavenDB's License Server.
5555
{NOTE/}
5656

5757
{NOTE: }
58-
__Enterprise__
58+
**Enterprise**
5959

6060
* A high-performance, fully-featured production-grade license.
6161
* Extended automatically if the server has access to RavenDB's License Server.
6262
{NOTE/}
6363

6464
{NOTE: }
65-
__ISV Licenses__
65+
**ISV Licenses**
6666

6767
* ISV licenses are commercial licenses that allow you to redistribute RavenDB with your software
6868
for on-premise installation and use by your customers.
@@ -82,23 +82,23 @@ __ISV Licenses__
8282
* Go to the About page to see the version, license, and support info.
8383

8484
#### 2.   Version
85-
* __Current version__:
85+
* **Current version**:
8686
Specifies the current Server and Studio client versions used.
8787
Knowing the version is important as documentation, features, and patches are version sensitive.
88-
* __Send Feedback__:
88+
* **Send Feedback**:
8989
You can send RavenDB feedback about any issues you've encountered.
90-
* __Latest version info__:
90+
* **Latest version info**:
9191
Specifies whether you are using the latest Server version.
9292
If you need to upgrade to a new version see [upgrading instructions](../../start/installation/upgrading-to-new-version).
9393

9494
#### 3.   License Information
95-
* __Type__:
95+
* **Type**:
9696
Specifies which license type you're using.
97-
* __Expires__:
97+
* **Expires**:
9898
Specifies the date on which the license will expire.
99-
* __Available features__:
99+
* **Available features**:
100100
The features included with this license are listed.
101-
* <a id="license-server" /> __License Server__:
101+
* <a id="license-server" /> **License Server**:
102102
Notifies if there is an active connection to RavenDB's License Server.
103103
If you aren't connected, it is usually either because a firewall is blocking the connection,
104104
or your server is running offline.
@@ -114,9 +114,9 @@ __ISV Licenses__
114114
* Specifies the support options available under your current support plan.
115115

116116
#### 6. &nbsp; Links
117-
* __Access__:
117+
* **Access**:
118118
Click to select RavenDB Community Discussions in GitHub, or Google Groups archive.
119-
* __Upgrade__:
119+
* **Upgrade**:
120120
Click to go to the RavenDB support options page.
121121

122122

Documentation/5.2/Raven.Documentation.Pages/start/licensing/renew-license.markdown

+14-14
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
{NOTE: }
66

7-
* When your license __expires__ the Studio is blocked.
7+
* When your license **expires** Studio is blocked.
88
Client API operations and other RavenDB features will continue to work.
99
However, any usage of expired RavenDB licenses is outside the license agreement
1010
and doesn't comply with the [EULA terms](https://ravendb.net/terms).
1111

12-
* __Renew your license__ as described below.
12+
* **Renew your license** as described below.
1313

1414
* In this page:
1515
* [Renew commercial licenses](../../start/licensing/renew-license#renew-commercial-licenses)
@@ -21,10 +21,10 @@
2121

2222
{PANEL: Renew commercial licenses}
2323

24-
* This section relates to all commercial licenses: __Professional__, __Enterprise__, and all __ISV licenses__.
24+
* This section relates to all commercial licenses: **Professional**, **Enterprise**, and all **ISV licenses**.
2525

2626
{NOTE: }
27-
__Automatic renewal__:
27+
**Automatic renewal**:
2828

2929
---
3030
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.
3333
{NOTE/}
3434

3535
{NOTE: }
36-
__Manual (offline) renewal__:
36+
**Manual (offline) renewal**:
3737

3838
---
3939
If the connection to the License Server is unavailable, contact [customer service](https://ravendb.net/contact) to extend your license.
40-
A license renewal email will be sent to you (the license ID will stay the __same__).
40+
A license renewal email will be sent to you (the license ID will stay the **same**).
4141
Copy the new license key from the mail and proceed with one of the following options.
4242

43-
__Either__:
43+
**Either**:
4444

45-
* Replace the existing license key with the new one from the Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
45+
* Replace the existing license key with the new one from Studio, as described [here](../../start/licensing/replace-license#replace-license-from-studio).
4646

47-
__Or__:
47+
**Or**:
4848

4949
* Set [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) to true.
5050

@@ -57,28 +57,28 @@ __Or__:
5757

5858
{PANEL: Renew Developer & Community licenses}
5959

60-
* The __Developer__ and __Community__ licenses are renewed from the Studio,
60+
* The **Developer** and **Community** licenses are renewed from Studio,
6161
the 'Renew' button is available only for those license types.
6262

6363
* They can be renewed when there are less than 30 days remaining on your current license.
6464

6565
![Renew License](images/renew-1.png "Renew License")
6666

67-
1. __About__
67+
1. **About**
6868
Navigate to the _About_ page in Studio
6969

70-
2. __Renew__
70+
2. **Renew**
7171
Click the _RENEW LICENSE_ button
7272

7373

7474
* ![Renew License](images/renew-2.png "Renew and Submit")
7575

7676

77-
3. __Renew__
77+
3. **Renew**
7878
Click to renew the current license.
7979
The renewed license will be sent to you by mail.
8080

81-
4. __Submit__
81+
4. **Submit**
8282
Paste the renewed license key and click Submit.
8383

8484
{PANEL/}

Documentation/5.2/Raven.Documentation.Pages/start/licensing/replace-license.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{NOTE: }
66

77
* Upon [upgrading your license](https://ravendb.net/buy),
8-
RavenDB will send the __new license key__ to the email provided when obtaining the license.
8+
RavenDB will send the **new license key** to the email provided when obtaining the license.
99

1010
* You need to replace the existing license with the new one from the Studio, see below.
1111

Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/overview.markdown

+9-11
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,15 @@
2828

2929
{PANEL: Enabling PostgreSQL support}
3030

31-
---
32-
3331
### License
3432

35-
* Your RavenDB license determines which features are available.
36-
* Visit Studio's **About** page to find which features are included in your license.
37-
38-
!["PostgreSQL and Power BI support"](images/about-license.png "PostgreSQL and Power BI support")
39-
40-
* If your current license doesn't include the PostgreSQL support, acquire [one that does](https://ravendb.net/buy).
33+
* Your RavenDB license determines which features are available for your server.
34+
* Visit Studio's [About](../../start/licensing/licensing-overview#manage-license-view)
35+
page to find which features are included in your license.
36+
* PostgreSQL is enabled for all licenses.
37+
* To [use Power BI with RavenDB as its PostgreSQL server](../../integrations/postgresql-protocol/power-bi),
38+
your license must explicitly enable Power BI.
39+
If your current license doesn't include Power BI Support, you can acquire one that does [here](https://ravendb.net/buy).
4140

4241
---
4342

@@ -48,13 +47,12 @@
4847
{CODE-BLOCK:json}
4948
"Integrations.PostgreSQL.Enabled": true
5049
{CODE-BLOCK/}
51-
* If your license includes the **PostgreSQL Protocol Support** but not
52-
**Power BI Support**, enable RavenDB's [Experimental Features](../../server/configuration/core-configuration#features.availability)
50+
* PostgreSQL is an experimental feature. To enable it, enable RavenDB's
51+
[Experimental Features](../../server/configuration/core-configuration#features.availability)
5352
by adding this line to your server's `settings.json` file:
5453
{CODE-BLOCK:json}
5554
"Features.Availability": "Experimental"
5655
{CODE-BLOCK/}
57-
If your license allows both features, you do **not** need to enable Experimental Features.
5856

5957
---
6058

Documentation/5.3/Raven.Documentation.Pages/integrations/postgresql-protocol/power-bi.markdown

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
* Easily select RavenDB collections and retrieve chosen data.
1111
* Query RavenDB using [RQL](../../client-api/session/querying/what-is-rql).
1212

13+
* To use RavenDB with Power BI, your [license](../../integrations/postgresql-protocol/overview#license)
14+
must explicitly enable **Power BI** Support.
15+
1316
* In this page:
1417
* [Using RavenDB From Power BI Desktop](../../integrations/postgresql-protocol/power-bi#using-ravendb-from-power-bi-desktop)
1518
* [Connect to RavenDB](../../integrations/postgresql-protocol/power-bi#connect-to-ravendb)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Activate License
2+
3+
---
4+
5+
{NOTE: }
6+
7+
* Each RavenDB cluster must be registered with its own license.
8+
9+
* The license key is sent to the email that was provided when obtaining the license.
10+
There are a few ways to **activate your license**, see below.
11+
12+
* In this page:
13+
14+
* [Activate license with configuration keys](../../start/licensing/activate-license#activate-license-with-configuration-keys)
15+
* [Activate license from Studio](../../start/licensing/activate-license#activate-license-from-studio)
16+
17+
{NOTE/}
18+
19+
---
20+
21+
{PANEL: Activate license with configuration keys}
22+
23+
* You can activate the license using either one of the following configuration keys:
24+
* [License](../../server/configuration/license-configuration#license)
25+
* [License.Path](../../server/configuration/license-configuration#license.path)
26+
27+
* These configuration keys can be set in _setting.json_ or as environment variables.
28+
Learn more in [configuration overview](../../server/configuration/configuration-options).
29+
30+
{PANEL/}
31+
32+
{PANEL: Activate license from Studio}
33+
34+
You can activate the license from Studio:
35+
36+
![Register License](images/register-1.png "Register license")
37+
38+
1. **About**
39+
Navigate to the _About_ page in Studio
40+
41+
2. **Activate**
42+
Click the _REGISTER LICENSE_ button
43+
44+
![Register License](images/register-2.png "Register license")
45+
46+
{PANEL/}
47+
48+
## Related Articles
49+
50+
### Licensing
51+
- [Licensing overview](../../start/licensing/licensing-overview)
52+
- [Replace license](../../start/licensing/replace-license)
53+
- [Renew license](../../start/licensing/renew-license)
54+
- [Force update license](../../start/licensing/force-update)
55+
56+
### Server
57+
- [License configuration options](../../server/configuration/license-configuration)
58+
59+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Force License Update
2+
3+
---
4+
5+
{NOTE: }
6+
7+
* Every 24 hours (counted from server startup), RavenDB will check the [License Server](../../start/licensing/licensing-overview#license-server)
8+
to see if there are any updates made to your current license that need to be applied.
9+
This is done for all license types.
10+
11+
* This automatic update will be applied provided that:
12+
* You have an active connection to RavenDB's License Server (api.ravendb.net).
13+
* [DisableAutoUpdate](../../server/configuration/license-configuration#license.disableautoupdate) is set to false.
14+
15+
* If changes were made to your current license and you want to **apply immediately**,
16+
then you can **force the update from Studio**.
17+
This action also requires an active connection to the [License Server](../../start/licensing/licensing-overview#license-server).
18+
19+
* In this page:
20+
* [Force license update from Studio](../../start/licensing/force-update#force-license-update-from-studio)
21+
22+
{NOTE/}
23+
24+
---
25+
26+
{PANEL: Force license update from Studio}
27+
28+
![Force Update](images/force-update.png "Force-update")
29+
30+
1. **About**
31+
Navigate to the _About_ page in Studio.
32+
33+
2. **Force Update**
34+
35+
* Click the _FORCE UPDATE_ button.
36+
This will update your current license immediately.
37+
38+
* If [DisableAutoUpdateFromApi](../../server/configuration/license-configuration#license.disableautoupdatefromapi) is set to _true_,
39+
the license will be updated from the [configuration keys](../../start/licensing/activate-license#activate-license-with-configuration-keys).
40+
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.
41+
42+
{PANEL/}
43+
44+
## Related Articles
45+
46+
### Licensing
47+
- [Licensing overview](../../start/licensing/licensing-overview)
48+
- [Activate license](../../start/licensing/activate-license)
49+
- [Replace license](../../start/licensing/replace-license)
50+
- [Renew license](../../start/licensing/renew-license)
51+
52+
### Server
53+
- [License configuration options](../../server/configuration/license-configuration)
54+
55+
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)