diff --git a/HACKING.rst b/HACKING.rst index f66b75f69..31f67a0f9 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -208,7 +208,7 @@ openSUSE Microsoft Windows ~~~~~~~~ -* Download and install latest Java Development Kit 7u80 (JDK7u80):: +* Download and install latest Java Development Kit 7uXX (JDK7uXX):: # http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html @@ -228,8 +228,6 @@ Microsoft Windows # Copy downloaded *.jar file to JAVA_HOME location: (e.g. C:\Program Files\Java\jdk1.7.0_80\jre\lib\ext) # Put downloaded *.jar file to Tomcat lib location: (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\lib) - # http://sourceforge.net/projects/libreplan/files/LibrePlan/ - * Create database:: CREATE DATABASE libreplan; @@ -270,7 +268,8 @@ Microsoft Windows * Configure Apache Tomcat Server - # Go to (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\conf\Catalina\localhost\) and create there libreplan.xml file with this lines of code: +* Go to (e.g. C:/Program Files/Apache Software Foundation/Tomcat 6.0/conf/Catalina/localhost/) + and create there libreplan.xml file with this lines of code:: @@ -294,9 +293,9 @@ Microsoft Windows # You need to set it to your JDK installed directory (e.g. C:\Program Files\Java\jdk1.7.0_80) -* Add path of unpacked distribution’s bin directory of Maven to 'Path' environment variable +* Add path of unpacked distributions bin directory of Maven to 'Path' environment variable - # (e.g. C:\Program Files\apache-maven-3.3.3\bin) + # (e.g. C:/Program Files/apache-maven-3.3.3/bin) * Compile project:: diff --git a/INSTALL.rst b/INSTALL.rst index fb51e64a7..189529096 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -326,7 +326,7 @@ Microsoft Windows Instructions: -* Download and install latest Java Runtime Environment 7u80 (JRE7u80):: +* Download and install latest Java Runtime Environment 7uXX (JRE7uXX):: # http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html @@ -375,10 +375,13 @@ Instructions: * Configure Apache Tomcat Server - # Put libreplan.war file to Apache Tomcat webapps folder (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\webapps\) - # Go to localhost folder (e.g. C:\Program Files\Apache Software Foundation\Tomcat 6.0\conf\Catalina\localhost\) and create there libreplan.xml file with this lines of code: +* Put libreplan.war file to Apache Tomcat webapps folder (e.g. C:/Program Files/Apache Software Foundation/Tomcat 6.0/webapps/) + +* Go to localhost folder (e.g. C:/Program Files/Apache Software Foundation/Tomcat 6.0/conf/Catalina/localhost/) + and create there libreplan.xml file with this lines of code:: + *Maven* and click *Next*