Change comment:
Rewording, updated a link
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki.Ser giu1 +XWiki.ManuelSmeria - Content
-
... ... @@ -4,11 +4,11 @@ 4 4 5 5 XWiki is a Java-based wiki and runs on a Servlet Container such as Tomcat, Jetty, JBoss, WebLogic, WebSphere, etc. It also uses a relational database to store its content. It can run on almost any database (HSQL, MySQL, etc) but XWiki and the database need to be setup correctly. 6 6 7 -There are 2solutionswheninstalling XWiki:7 +There are 3 ways of installing XWiki: 8 8 9 9 * Use the [[Standalone distribution>>AdminGuide.InstallationStandalone]] which already packages a Servlet Container (Jetty) and a database (HSQL). This is the recommended option for first time XWiki users and for users who wish to quickly try out XWiki. 10 10 * Use the [[WAR distribution>>AdminGuide.InstallationWAR]] and configure both your container and your database to work with it. 11 -* Use the [[.deb package>>AdminGuide.InstallationViaAPT]] to install last version of XWiki and the dependencies. 11 +* Use the [[.deb package>>AdminGuide.InstallationViaAPT]] to install the last version of XWiki and the dependencies. 12 12 13 13 If you're instead upgrading an existing XWiki install check the [[Upgrade instructions page>>AdminGuide.Upgrade]]. 14 14 ... ... @@ -17,7 +17,7 @@ 17 17 Once you've finished the installation check the other topics in the [[Admin Guide>>AdminGuide.WebHome]] for configuring and [[securing>>Security]] your wiki. 18 18 19 19 {{info}} 20 -If you want to make manual installation or need to migrate an existing XWiki installation, check the [[Release Notes>>xwiki:ReleaseNotes.WebHome]]. 20 +If you want to make a manual installation or need to migrate an existing XWiki installation, check the [[Release Notes>>xwiki:ReleaseNotes.WebHome]]. 21 21 {{/info}} 22 22 23 23 = Prerequisites = ... ... @@ -24,12 +24,12 @@ 24 24 25 25 * Java 6 or greater installed. 26 26 * A Servlet Container supporting Servlet 2.4. 27 -* A minimum of 300MB of heap memory and 96MB of permGen. Recommended value are above 512MB for the heap and 128MB for the permGen (##-Xmx512m -XX:MaxPermSize=128m##)((( 27 +* A minimum of 300MB of heap memory and 96MB of permGen. Recommended values are above 512MB for the heap and 128MB for the permGen (##-Xmx512m -XX:MaxPermSize=128m##)((( 28 28 {{warning}} 29 29 Note that storing attachments with the default (in database) storage mechanism is very memory intensive. See the [[administrators guide to attachments>>platform:AdminGuide.Attachments]] for more information about memory cost and the alternative filesystem based attachment store. 30 30 {{/warning}} 31 31 ))) 32 -* Check the [[ ReleaseNotes>>xwiki:ReleaseNotes.WebHome]] for the version you're installing to see whatBrowsers andDatabases are supported for it. You can also check our [[generalSupportStrategy>>dev:Community.SupportStrategy]].32 +* Check the [[release notes>>xwiki:ReleaseNotes.WebHome]] for the version you're installing to see what browsers and databases are supported for it. You can also check our [[general support strategy>>dev:Community.SupportStrategy]]. 33 33 34 34 = Tutorials = 35 35 ... ... @@ -50,19 +50,19 @@ 50 50 == [[Using a standalone distribution >>AdminGuide.InstallationStandalone]] == 51 51 52 52 It provides a built-in XWiki, with a portable database and a lightweight Java container. 53 - Standalone distribution is not recommended in a production environment. If you need to use it in a production basis, you may look at the two other options53 +A standalone distribution is not recommended in a production environment. If you need to use it in a production basis, you may look at the two other options. 54 54 55 55 == [[Using .war package (usable for production)>>AdminGuide.InstallationWAR]] == 56 56 57 -It provides a java application package that ha veto be installed in a Java container (such as Tomcat). This can be used on almostevery operating systems.57 +It provides a java application package that has to be installed in a Java container (such as Tomcat). This can be used on almost any operating system. 58 58 59 59 == [[Using .deb package (usable for production)>>AdminGuide.InstallationViaAPT]] == 60 60 61 -It provides a .deb package that can be used on a Debian-based operating system. It can be installed with dpkg or apt ,installation is thus automated.61 +It provides a .deb package that can be used on a Debian-based operating system. It can be installed with dpkg or apt; installation is thus automated. 62 62 63 63 = Troubleshooting = 64 64 65 -You can verify some basic settings of your XWiki install (on Tomcat, MySQL) using the [[Admin Tools application>>extensions:Extension.AdminTools]]. Keep in mind that some of these tools only work in a Linux environment. 65 +You can verify some basic settings of your XWiki installation (on Tomcat, MySQL) using the [[Admin Tools application>>extensions:Extension.Admin Tools Application]]. Keep in mind that some of these tools only work in a Linux environment. 66 66 67 67 == Running multiple instances of XWiki in the same container == 68 68 ... ... @@ -85,9 +85,9 @@ 85 85 86 86 In such cases you should configure XWiki to know your proxy-server. 87 87 88 -XWiki uses default Java proxy configuration through Apache httpclient. See [[http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html]] for more details. 88 +XWiki uses default Java proxy configuration through Apache httpclient. See the [[Java Networking and Proxies documentation>>http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html]] for more details. 89 89 The main idea is to add a set of proxy-related properties to system scope. 90 90 91 -E.g. for Tomcat 6 it could be done in the following way .modify ##/<tomcat-home>/bin/catalina.sh## and added proxies to ##JAVA_OPTS## variable definition:91 +E.g. for Tomcat 6 it could be done in the following way: modify ##/<tomcat-home>/bin/catalina.sh## and added proxies to the ##JAVA_OPTS## variable definition: 92 92 93 93 ##JAVA_OPTS="$JAVA_OPTS -Dappserver.home=$CATALINA_HOME -Dappserver.base=$CATALINA_HOME **-Dhttp.proxyHost=proxy.mycompany.com -Dhttp.proxyPort=7777 -Dhttps.proxyHost=proxy.mycompany.com -Dhttps.proxyPort=7777** -Xmx1738m -Xms1738m -XX:MaxPermSize=256m $XWIKI_OPTS"##