Automatic merge from branch-5.6

* origin/branch-5.6:
  Fix documentation of properties *.javaOpts

diff --cc sonar-application/src/main/assembly/conf/sonar.properties
index 0724b46c2c9bacffa633a3c98a055cbaaf0e6fa4,5fe6666414738bee2cea37787169513968b4d010..e2d938a2a9f99d010b5f946254282b27c28f56ce
--- 1/sonar-application/src/main/assembly/conf/sonar.properties
--- 2/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@@ -86,9 -85,10 +85,10 @@@
  #    Recommendations:
  #
  #    The HotSpot Server VM is recommended. The property -server should be added if server mode
- #    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+ #    is not enabled by default on your environment:
+ #    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
  #
 -#sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
 +#sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError
  
  # Same as previous property, but allows to not repeat all other settings like -Xmx
  #sonar.web.javaAdditionalOpts=
@@@ -131,9 -131,10 +131,10 @@@
  #    Recommendations:
  #
  #    The HotSpot Server VM is recommended. The property -server should be added if server mode
- #    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+ #    is not enabled by default on your environment:
+ #    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
  #
 -#sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
 +#sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError
  
  # Same as previous property, but allows to not repeat all other settings like -Xmx
  #sonar.ce.javaAdditionalOpts=
@@@ -156,9 -157,10 +157,10 @@@
  #    Recommendations:
  #
  #    Use HotSpot Server VM. The property -server should be added if server mode
- #    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+ #    is not enabled by default on your environment:
+ #    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
  #
 -#sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true \
 +#sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djna.nosys=true \
  #  -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 \
  #  -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError