Fixes #13526: Add information about Rudder subscription to the doc

Normation · Sep 19, 2018 · 4ae4c6e · 4ae4c6e
1 parent 1994b13
commit 4ae4c6e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/src/reference/modules/installation/pages/operating_systems.adoc b/src/reference/modules/installation/pages/operating_systems.adoc
@@ -7,8 +7,10 @@ Fully supported Operating Systems are systems that we frequently build packages
 
 === For Rudder Nodes
 
+==== Community support
+
 The following operating systems are supported for Rudder Nodes and packages are
-available for these platforms:
+available freely for these platforms:
 
 GNU/Linux:
 
@@ -20,33 +22,32 @@ GNU/Linux:
 
 * Ubuntu 14.04 LTS (Trusty), 16.04 LTS (Xenial), 18.04 LTS (Bionic) (64-bit)
 
-* Slackware 14 (64-bit)
+==== Subscription support
 
-Other Unix systems:
+The following operating systems are supported for Rudder Nodes and packages are
+available for these platforms as part of the https://www.normation.com/en/rudder/subscription/[Rudder subscription]:
 
-* IBM AIX 5.3, 6.1 and 7.1
+GNU/Linux:
 
-Windows:
+* Debian 5, 6, 7, 8 and 9
 
-* xref:TODO[Microsoft Windows] Server 2008 R2, 2012, 2012 R2, 2016
+* Red Hat Enterprise Linux (RHEL) / RHEL-like (CentOS, etc) 3, 5, 6 and 7
 
-[TIP]
+* SUSE Linux Enterprise Server (SLES) 10SP3, 11 and 12 (64bit)
 
-[[install-on-windows, Install on Microsoft Windows]]
+* Ubuntu 10.04 LTS (Lucid), 12.04 LTS (Precise), 14.04 LTS (Trusty), 16.04 LTS (Xenial), 18.04 LTS (Bionic) (64-bit)
 
-.Windows, Slackware and AIX Nodes
+* Slackware 14 (64-bit)
 
-====
+Other Unix systems:
 
-* For Microsoft Windows, Rudder agent relies on DSC (Desired State Configuration) included in Powershell 4.0 or later. Packages are available from Normation under subscription only.
-* For IBM AIX, packages are available from Normation under subscription only.
+* IBM AIX 5.3, 6.1 and 7.1
 
-Hence, as a starting point, we suggest that you evaluate Rudder on Linux machines. Once
-you are accustomed to Rudder, contact Normation to obtain a demo version for
-these platforms.
+Windows:
 
-====
+* xref:TODO[Microsoft Windows] Server 2008 R2, 2012, 2012 R2, 2016
 
+To get information about Rudder subscription, read https://www.normation.com/en/rudder/subscription/[the subscription page on rudder.io].
 
 [[server-supported-os, the list of supported Operating Systems for Root server]]
 === For Rudder root server or relay server

diff --git a/src/reference/modules/plugins/pages/index.adoc b/src/reference/modules/plugins/pages/index.adoc
@@ -1,12 +1,22 @@
 [[plugins-management]]
 = Manage plugins
 
-Rudder is an extensible software. The *Administration -> Plugin Management*
-section sum-up information about loaded plugins, their version and their
+Rudder is an extensible software. The *Plugins*
+menu sums-up information about loaded plugins, their version and their
 configuration.
 
 A plugin is an `.rpkg` file (for "Rudder package").
 
+== Get plugins
+
+There are two types of Rudder pre-packaged plugins:
+
+* Integration plugins, that allow linking Rudder to other tools (monitoring, inventory, notification, etc.). They are freely available.
+* Advanced features plugins (reporting, validation workflow, etc.) which are part of the Rudder subscription.
+
+To download free plugins or get information about plugins included in the subscription,
+read the https://rudder.io/plugins/[dedicated page on rudder.io].
+
 == Install a plugin
 
 To install a plugin, copy the `.rpkg` file on your server, and run: