# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1349472244 -10800
# Node ID 0308f21a9e0775a0b8676a55d2b44d4c638fcd32
# Parent  428a226bf835145796744b82cfc05e6bbe7832a3# Parent  ef1e8123ea4a6322d53a5115df0e7089b797114b
merged

diff -r ef1e8123ea4a -r 0308f21a9e07 java.rst
--- a/java.rst	Fri Oct 05 23:18:39 2012 +0300
+++ b/java.rst	Sat Oct 06 00:24:04 2012 +0300
@@ -186,3 +186,29 @@
   http://mvnrepository.com/search.html?query=PKG
   http://www.jarfinder.com
 
+Java EE versions.
+=================
+
+======= ======== ======== ========
+Java EE Servlet  JSP      JSTL
+======= ======== ======== ========
+6       3.0      2.2      -
+5       2.5      2.1      1.2
+1.4     2.4      2.0      1.1
+1.2     2.3      1.2      1.0
+======= ======== ======== ========
+
+To set servlet version check ``WEB-INF/web.xml``::
+
+  <web-app xmlns="http://java.sun.com/xml/ns/javaee" version="3.0">
+
+See:
+
+  http://jcp.org/aboutJava/communityprocess/final/jsr315/index.html
+                Servlet 3.0 Specification
+  http://jcp.org/aboutJava/communityprocess/mrel/jsr154/index.html
+                Servlet 2.5 Specification
+  http://www.mularien.com/blog/2008/04/24/how-to-reference-and-use-jstl-in-your-web-application/
+                How to Reference and Use JSTL in your Web Application
+  http://en.wikipedia.org/wiki/Java_EE_version_history
+                Java EE version history
diff -r ef1e8123ea4a -r 0308f21a9e07 vm.rst
--- a/vm.rst	Fri Oct 05 23:18:39 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-.. -*- coding: utf-8; -*-
-.. include:: HEADER.rst
-
-========================
- VM (virtual machines).
-========================
-.. contents::
-
-Virtualization projects.
-========================
-
-VMware, VirtualBox, QEMU, Bochs, DosBox.
-
-VirtualBox.
-===========
-
-About VirtualBox.
------------------
-
-  http://www.virtualbox.org/wiki/Guest_OSes
-                Guest OSes support status for VirtualBox.
-
-Copy and resize VirtualBox disk.
---------------------------------
-
-I have clear copies of several OSes for VirtualBox. When I need new one I copy
-and resize them to get desired size.
-
-To copy I make a copy::
-
-  $ vboxmanage clonehd /path/to/Hurd.vdi /path/to/Hurd-new.vdi
-
-determine size::
-
-  $ vboxmanage showhdinfo /path/to/Hurd-new.vdi
-
-  UUID:                 63b87983-3130-4db3-cd8c-6d693dcfd92b
-  Accessible:           yes
-  Logical size:         2996 MBytes
-  Current size on disk: 1660 MBytes
-  Type:                 normal (base)
-  Storage format:       VDI
-  Format variant:       dynamic default
-  In use by VMs:        Hurd (UUID: f7591848-2c60-4c7c-3886-b66bdb35e425)
-  Location:             /path/to/Hurd-new.vdi
-
-and then apply new size (in MiB)::
-
-  $ vboxmanage modifyhd --resize 35000 /path/to/Hurd-new.vdi
-
-Next I mount ``parted-magic`` and boot to it and use ``gparted`` to extend
-existing fs to free space.
-
-VMWare.
-=======
-
-VMWare remote graphical client.
-===============================
-::
-
-  $ vmware-vmrc.exe -h 192.168.1.2 -u user -p passwd "dir/file.vmx"
-