diff --git a/documentation/trunk/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki b/documentation/trunk/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
index 13137ade..236ab7c1 100644
--- a/documentation/trunk/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
+++ b/documentation/trunk/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
@@ -1,125 +1,116 @@
-[[Property:title|FreeBSD]]
-[[Property:weight|1]]
-[[Property:uuid|b26ddd99-521b-6a10-79e6-e2a5d30f907c]]
-==Requirements==
-
-{| class="doctable"
-|- 
-| '''Computer/Processor'''
-| PC with 300 MHz or higher Pentium II class processor or equivalent recommended.
-|- 
-| '''Operating System'''
-| FreeBSD 7.2 with either Gnome 2.6 or GTK+ 2.4.
-|- 
-| '''C compiler'''
-| gcc
-|- 
-| '''Memory'''
-| 512 MB of RAM (1GB recommended).
-|- 
-| '''Hard Disk'''
-| 400Mb uncompressed hard disk space (700Mb recommended).
-|- 
-| '''Drive'''
-| CD-ROM or DVD drive (not required when downloading EiffelStudio).
-|- 
-| '''Display'''
-| 1024 x 768 or higher resolution video adapter and monitor.
-|- 
-| '''Peripherals'''
-| Keyboard and mouse or compatible pointing device.
-|- 
-| '''ISE_PLATFORM'''
-| '''freebsd-x86''' for x86 based CPU and '''freebsd-x86-64''' for x64 based CPU.
-|}
-
-
-==Checking your environment==
-
-EiffelStudio requires GTK+ 2.4.0 or above to function properly. You can check that you have this installed correctly by typing the following command:
-<code>pkg-config --modversion gtk+-2.0</code>
-The command should succeed and the version number of GTK+ should appear. If it is not 2.4.0 or above then you cannot continue the installation of EiffelStudio. You first need to install GTK+ 2.4.0.
-
-==Installing EiffelStudio from the Web==
-
-After downloading the installation package, you should manually extract its contents to your hard drive. For example, you can extract it into /usr/local using the following commands (assuming that you have permission to /usr/local and that the installation package was saved in /tmp/EiffelXX.tar.bz2, where XX corresponds to the EiffelStudio version number):
-<code>
-cd /usr/local
-tar xvfj /tmp/EiffelXX.tar.bz2</code>
-
-This will install EiffelStudio files into /usr/local/EiffelXX. Once this is done, jump to the [[#Setting up EiffelStudio|Setting up EiffelStudio]] section in order to complete the installation of EiffelStudio.
-
-==Installing EiffelStudio from a CD-ROM==
-
-Insert the CD into your CD-ROM drive. You should manually extract its contents to your hard drive. For example you can extract it in /usr/local using the following commands (assuming that you have permission to /usr/local and that the CD is mounted on /mnt/cdrom):
-<code>cd /usr/local
-cp -r /mnt/cdrom/EiffelXX .</code>
-
-This will install the EiffelStudio files into /usr/local/EiffelXX. To complete the installation of EiffelStudio, jump to the next section, [[#Setting up EiffelStudio|Setting up EiffelStudio]].
-<span id="setting_up"></span> 
-==Setting up EiffelStudio==
-
-Once the files have been installed, you should define the following environment variables in order to run EiffelStudio: 
-* '''ISE_EIFFEL''' to /usr/local/EiffelXX
-* '''ISE_PLATFORM''' to freebsd-x86.
-and add $'''ISE_EIFFEL'''/studio/spec/$'''ISE_PLATFORM'''/bin to your '''PATH''' environment variable. 
-
-Using sh or bash as a shell, it suffices to type the following commands:
-<code>
-export ISE_EIFFEL=/usr/local/EiffelXX
-export ISE_PLATFORM=freebsd-x86
-export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin</code>
-
-
-Using csh or tcsh as a shell, it suffices to type the following commands:
-<code>
-setenv ISE_EIFFEL /usr/local/EiffelXX
-setenv ISE_PLATFORM freebsd-x86
-set path = ($path $ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin)</code>
-
-
-If you are using the Enterprise edition, please follow the instructions of the next section, [[#Registering the Enterprise Edition|Registering the Enterprise Edition]], otherwise jump to the [[#Using EiffelStudio|Using EiffelStudio]] section at the end of this document.
-<span id="registering"></span> 
-==Registering the Enterprise Edition==
-
-This step assumes you have followed the instructions in the [[#Setting up EiffelStudio|Setting up EiffelStudio]] section. Perform the following commands to start the registration process:
-<code>cd $ISE_EIFFEL
-./register</code>
-
-A dialog asking for your '''Username''' and '''CD Key''' should appear as it does below:
-
-<center> [[Image:56--unix-setup|Setup dialog]] </center>
-
-Enter the information located inside the box that contains your copy of the EiffelStudio Enterprise Edition. Once the information is correct, the '''Register''' button will be enabled. Click '''Register''' to actually register EiffelStudio.
-
-The first time you launch EiffelStudio, you will be asked for an activation key through the following dialog:
-
-<center> [[Image:56--unix-registration|Registration dialog]] </center>
-
-By clicking on the [http://activate.eiffel.com http://activate.eiffel.com]  URL, a new web browser will appear with the requested fields automatically filled in with the appropriate information. Simply click '''Activate''' and a new page with an activation code will appear. Copy and paste the activation code in the first field and the '''Activate''' button should be enabled to let you activate your copy.
-
-You can activate your copy up to three times. Once you have reached this threshold and need to reinstall your copy, contact Eiffel Software to request one more activation.
-
-If no web browser appears, it is most likely because firefox is not installed on your machine or is not in your path. Instead you should manually launch a new web browser, go to the page [http://activate.eiffel.com http://activate.eiffel.com] , and enter the information manually. Then follow the above instructions as if the browser had been properly launched.
-
-You may receive the following dialog when launching EiffelStudio:
-
-<center> [[Image:56--unix-registration-error|Registration incomplete]] </center>
-
-This probably means that the '''register''' program was not launched or did not succeed in storing data to the following file $'''ISE_EIFFEL'''/install/limand/.ec_license. To solve this, rerun the '''register''' program with a user account that has permissions to write at $'''ISE_EIFFEL'''/install/limand and enter your '''Username''' and '''CD Key'''.
-
-Once this is done, you can jump to the next section, [[#Using EiffelStudio|Using EiffelStudio]].
-<span id="using"></span> 
-==Using EiffelStudio==
-
-===Starting EiffelStudio===
-
-Now everything should be properly installed and you should be able to run the compiler. Launch '''estudio''' for the interactive graphical user interface of the compiler, or launch '''ec''' for the command line interface. If you are a new user to EiffelStudio, we recommend that you follow [[Introducing EiffelStudio|the EiffelStudio guided tour]].
-
-===EiffelStudio Appearance===
-
-EiffelStudio for Unix uses the GTK+ theme engine to allow for custom appearance such as changing the default font size and color of windows, etc. If you do not have a theme manager (such as that provided with Gnome) you can copy the .gtkrc-2.0 file from $'''ISE_EIFFEL'''/eifinit/studio/spec/gtk directory to your $'''HOME''' directory.
-
-
-
-
+[[Property:title|FreeBSD]]
+[[Property:weight|1]]
+[[Property:uuid|b26ddd99-521b-6a10-79e6-e2a5d30f907c]]
+==Requirements==
+
+{| class="doctable"
+|- 
+| '''Computer/Processor'''
+| x86 or x86-64
+|- 
+| '''Operating System'''
+| FreeBSD 11 with GTK+ 2.4 or greater
+|- 
+| '''C compiler'''
+| gcc
+|- 
+| '''Memory'''
+| 4GB of RAM
+|- 
+| '''Hard Disk'''
+| 1GB of free space
+|- 
+| '''ISE_PLATFORM'''
+| '''freebsd-x86''' for x86 based CPU and '''freebsd-x86-64''' for x64 based CPU.
+|}
+
+
+==Checking your environment==
+
+EiffelStudio requires GTK+ 2.4.0 or above to function properly. You can check that you have this installed correctly by typing the following command:
+<code>pkg-config --modversion gtk+-2.0</code>
+The command should succeed and the version number of GTK+ should appear. If it is not 2.4.0 or above then you cannot continue the installation of EiffelStudio. You first need to install GTK+ 2.4.0.
+
+==Installing EiffelStudio from the Web==
+
+After downloading the installation package, you should manually extract its contents to your hard drive. For example, you can extract it into /usr/local using the following commands (assuming that you have permission to /usr/local and that the installation package was saved in /tmp/EiffelXX.tar.bz2, where XX corresponds to the EiffelStudio version number):
+<code>
+cd /usr/local
+tar xvfj /tmp/EiffelXX.tar.bz2</code>
+
+This will install EiffelStudio files into /usr/local/EiffelXX. Once this is done, jump to the [[#Setting up EiffelStudio|Setting up EiffelStudio]] section in order to complete the installation of EiffelStudio.
+
+==Installing EiffelStudio from a CD-ROM==
+
+Insert the CD into your CD-ROM drive. You should manually extract its contents to your hard drive. For example you can extract it in /usr/local using the following commands (assuming that you have permission to /usr/local and that the CD is mounted on /mnt/cdrom):
+<code>cd /usr/local
+cp -r /mnt/cdrom/EiffelXX .</code>
+
+This will install the EiffelStudio files into /usr/local/EiffelXX. To complete the installation of EiffelStudio, jump to the next section, [[#Setting up EiffelStudio|Setting up EiffelStudio]].
+<span id="setting_up"></span> 
+==Setting up EiffelStudio==
+
+Once the files have been installed, you should define the following environment variables in order to run EiffelStudio: 
+* '''ISE_EIFFEL''' to /usr/local/EiffelXX
+* '''ISE_PLATFORM''' to freebsd-x86.
+and add $'''ISE_EIFFEL'''/studio/spec/$'''ISE_PLATFORM'''/bin to your '''PATH''' environment variable. 
+
+Using sh or bash as a shell, it suffices to type the following commands:
+<code>
+export ISE_EIFFEL=/usr/local/EiffelXX
+export ISE_PLATFORM=freebsd-x86
+export PATH=$PATH:$ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin</code>
+
+
+Using csh or tcsh as a shell, it suffices to type the following commands:
+<code>
+setenv ISE_EIFFEL /usr/local/EiffelXX
+setenv ISE_PLATFORM freebsd-x86
+set path = ($path $ISE_EIFFEL/studio/spec/$ISE_PLATFORM/bin)</code>
+
+
+If you are using the Enterprise edition, please follow the instructions of the next section, [[#Registering the Enterprise Edition|Registering the Enterprise Edition]], otherwise jump to the [[#Using EiffelStudio|Using EiffelStudio]] section at the end of this document.
+<span id="registering"></span> 
+==Registering the Enterprise Edition==
+
+This step assumes you have followed the instructions in the [[#Setting up EiffelStudio|Setting up EiffelStudio]] section. Perform the following commands to start the registration process:
+<code>cd $ISE_EIFFEL
+./register</code>
+
+A dialog asking for your '''Username''' and '''CD Key''' should appear as it does below:
+
+<center> [[Image:56--unix-setup|Setup dialog]] </center>
+
+Enter the information located inside the box that contains your copy of the EiffelStudio Enterprise Edition. Once the information is correct, the '''Register''' button will be enabled. Click '''Register''' to actually register EiffelStudio.
+
+The first time you launch EiffelStudio, you will be asked for an activation key through the following dialog:
+
+<center> [[Image:56--unix-registration|Registration dialog]] </center>
+
+By clicking on the [http://activate.eiffel.com http://activate.eiffel.com]  URL, a new web browser will appear with the requested fields automatically filled in with the appropriate information. Simply click '''Activate''' and a new page with an activation code will appear. Copy and paste the activation code in the first field and the '''Activate''' button should be enabled to let you activate your copy.
+
+You can activate your copy up to three times. Once you have reached this threshold and need to reinstall your copy, contact Eiffel Software to request one more activation.
+
+If no web browser appears, it is most likely because firefox is not installed on your machine or is not in your path. Instead you should manually launch a new web browser, go to the page [http://activate.eiffel.com http://activate.eiffel.com] , and enter the information manually. Then follow the above instructions as if the browser had been properly launched.
+
+You may receive the following dialog when launching EiffelStudio:
+
+<center> [[Image:56--unix-registration-error|Registration incomplete]] </center>
+
+This probably means that the '''register''' program was not launched or did not succeed in storing data to the following file $'''ISE_EIFFEL'''/install/limand/.ec_license. To solve this, rerun the '''register''' program with a user account that has permissions to write at $'''ISE_EIFFEL'''/install/limand and enter your '''Username''' and '''CD Key'''.
+
+Once this is done, you can jump to the next section, [[#Using EiffelStudio|Using EiffelStudio]].
+<span id="using"></span> 
+==Using EiffelStudio==
+
+===Starting EiffelStudio===
+
+Now everything should be properly installed and you should be able to run the compiler. Launch '''estudio''' for the interactive graphical user interface of the compiler, or launch '''ec''' for the command line interface. If you are a new user to EiffelStudio, we recommend that you follow [[Introducing EiffelStudio|the EiffelStudio guided tour]].
+
+===EiffelStudio Appearance===
+
+EiffelStudio for Unix uses the GTK+ theme engine to allow for custom appearance such as changing the default font size and color of windows, etc. If you do not have a theme manager (such as that provided with Gnome) you can copy the .gtkrc-2.0 file from $'''ISE_EIFFEL'''/eifinit/studio/spec/gtk directory to your $'''HOME''' directory.
+
+
+
+