From version 1.1 >
edited by Ecaterina Moraru (Valica)
on 2016/03/14
To version < 1.2 >
edited by Ecaterina Moraru (Valica)
on 2016/03/14
>
Change comment: Adding Vincent's comments

Summary

Details

Page properties
Content
... ... @@ -4,24 +4,24 @@
4 4  ## $demoDistibutions = TypeID (0) - Title (1) - Type (2) - Description (3) - Installation Link (4)
5 5  ## ################################################################
6 6  #set ($demoDistibutions = [
7 - ['enterpriseInstallerGeneric', 'Graphical Installer', 'JAR',
8 - "Should be used by first-time users on non-Windows systems. This installer requires administrator rights on the target OS and if you don't have those permissions use the ZIP distribution below.",
7 + ['enterpriseInstallerGeneric', 'Graphical Installer for All Platforms', 'JAR',
8 + "Should be used by first-time users on non-Windows systems. This installer requires administrator rights on the target OS and if you don't have those permissions use the ZIP packaging below.",
9 9   "platform:AdminGuide.InstallationStandalone"],
10 10  
11 - ['enterpriseInstallerWindows', 'Graphical Windows native installer', 'EXE',
12 - "This installer requires administrator rights on the target OS and if you don't have those permissions use the ZIP distribution below.",
11 + ['enterpriseInstallerWindows', 'Graphical Installer for Windows', 'EXE',
12 + "This installer requires administrator rights on the target OS and if you don't have those permissions use the ZIP packaging below.",
13 13   "platform:AdminGuide.InstallationStandalone"],
14 14  
15 - ['enterpriseJettyHsqldb', 'Standalone package', 'ZIP',
16 - "This includes a Jetty container and an HSQLDB database all set up, packaged as a ZIP file. Should be used by first-time users who do not need/want to use one of the installers above.",
15 + ['enterpriseJettyHsqldb', 'ZIP Package', 'ZIP',
16 + "This includes a Jetty Servlet Container and an HSQLDB database all set up, packaged as a ZIP file. Should be used by first-time users who do not need/want to use one of the installers above.",
17 17   "platform:AdminGuide.InstallationStandalone"]
18 18  ])
19 19  #set ($productionDistibutions = [
20 - ['enterpriseWeb', 'WAR file for Container', 'WAR',
21 - "A database also needs to be set up and configured. This is for more advanced users wanting to choose their container and their database.",
20 + ['enterpriseWeb', 'WAR file for Servlet Container', 'WAR',
21 + "A database and a Servlet Container need to be set up and configured. This is for more advanced users wanting to choose their container and their database.",
22 22   "platform:AdminGuide.InstallationWAR"],
23 23  
24 - ['enterpriseWiki', 'Default set of XWiki pages', 'XAR',
24 + ##['enterpriseWiki', 'Default set of XWiki pages', 'XAR',
25 25   "These pages need to be loaded in an empty XWiki instance.",
26 26   "platform:AdminGuide.InstallationWAR||anchor='HInstallingtheDefaultWikiXAR'"],
27 27  
... ... @@ -60,9 +60,9 @@
60 60  ## ################################################################
61 61  #set ($categories = [
62 62   ['Demo Installation', $demoDistibutions, 'green',
63 - "If you're a first time user we recommend that you use the installer to get up to speed quickly. The standalone package provided by the installer is not supposed to be used in production, since the embedded database does not support large wikis efficiently."],
63 + "These Demo packages are not supposed to be used in production, since the embedded database does not support large wikis efficiently and is not tuned for a production usage."],
64 64   ['Production Installation', $productionDistibutions, 'blue',
65 - "Once you're more familiar with XWiki you might want to set it up on your own database or in your own container, in which case you'll then be able to download the WAR file and set it up and use the XAR file to load a default set of pages."]
65 + "Once you're more familiar with XWiki you might want to set it up on your own database or in your own container, in which case you'll then be able to download the WAR file and set up your instance."]
66 66  ])
67 67  #set ($projectVersion = $request.get('projectVersion'))
68 68  #if ("$!projectVersion" != '')

Get Connected