Merge lp:~scarneiro/ubuntu/quantal/proguard/fix-for-888982 into lp:ubuntu/quantal/proguard

[Sebastian Carneiro]

This is a new upstream version of proguard. It is needed to fix an FTBFS
in mobile-atlas-creator.

Probably the best way is going through Debian, but it is needed to fix
some related FTBFS in Quantal relating Java7 migration.

Please help me to get this in shape, as I'm pretty new to this and I
need the review so I can figure out what needs to be corrected.

Thanks!

Sebastian.

[James Page (james-page)]

Hi Sebastian

Thanks for taking the time to prepare this merge proposal.

I have uploaded with a couple of minor tweaks:

1) You don't need to Depend on build-essential - this is actually a lintian error - I would recommend that you always run lintian both on your source package and the resulting binary package to check for any errors that it can pickup.

See http://lintian.debian.org/manual/index.html for more info.

2) debian/pathes/debian-changes-4.8: this is an auto-generated patch due to the switch in the previous version from source format 1.0 to source format 3.0 - you can read more about these formats here - http://wiki.debian.org/Projects/DebSrc3.0

I renamed the patch and tweaked the headers (as they refer to the upgrade bug which does not make much sense) so things don't get confused later - this should be fed back to Debian but the maintainer is not that active (i.e. leave it with me - I'll need to deal with this for the next Debian release anyway).

Thanks for you contribution!

review: Approve

[Sebastian Carneiro (scarneiro)]

Hi James,

Thank you very much for such a great review ! That's the kind of advice I need to advance in the quality of my contributions to Ubuntu.

I will take your advice given on this review to get better at this. If I can help in forwarding this to Debian, or anything else you may find I should be doing, just let me know.

Best regards,

Sebastian.

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-07-12 00:24:28 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-07-12 00:24:28 +0000
@@ -0,0 +1,1 @@
+series

=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2012-07-12 00:24:28 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'README'
--- README	2009-10-09 16:17:49 +0000
+++ README	2012-07-12 00:24:28 +0000
@@ -30,4 +30,4 @@
 
 http://proguard.sourceforge.net/
 
-Copyright (c) 2002-2009 Eric Lafortune ([e-mail])
+Copyright (c) 2002-2012 Eric Lafortune ([e-mail])

=== modified file 'bin/proguard.bat'
--- bin/proguard.bat	2009-05-20 08:21:13 +0000
+++ bin/proguard.bat	2012-07-12 00:24:28 +0000
@@ -2,9 +2,13 @@
 
 REM Start-up script for ProGuard -- free class file shrinker, optimizer,
 REM obfuscator, and preverifier for Java bytecode.
+REM
+REM Note: when passing file names containing spaces to this script,
+REM       you'll have to add escaped quotes around them, e.g.
+REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
 :home
 
-java -jar "%PROGUARD_HOME%"\lib\proguard.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -jar "%PROGUARD_HOME%"\lib\proguard.jar %*

=== modified file 'bin/proguard.sh'
--- bin/proguard.sh	2009-05-20 08:21:13 +0000
+++ bin/proguard.sh	2012-07-12 00:24:28 +0000
@@ -2,8 +2,11 @@
 #
 # Start-up script for ProGuard -- free class file shrinker, optimizer,
 # obfuscator, and preverifier for Java bytecode.
+#
+# Note: when passing file names containing spaces to this script,
+#       you'll have to add escaped quotes around them, e.g.
+#       "\"/My Directory/My File.txt\""
 
-PROGUARD_HOME=`dirname "$0"`
-PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
+PROGUARD_HOME=`dirname "$0"`/..
 
 java -jar $PROGUARD_HOME/lib/proguard.jar "$@"

=== modified file 'bin/proguardgui.bat'
--- bin/proguardgui.bat	2009-05-20 08:21:13 +0000
+++ bin/proguardgui.bat	2012-07-12 00:24:28 +0000
@@ -2,9 +2,13 @@
 
 REM Start-up script for the GUI of ProGuard -- free class file shrinker,
 REM optimizer, obfuscator, and preverifier for Java bytecode.
+REM
+REM Note: when passing file names containing spaces to this script,
+REM       you'll have to add escaped quotes around them, e.g.
+REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
 :home
 
-java -jar "%PROGUARD_HOME%"\lib\proguardgui.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -jar "%PROGUARD_HOME%"\lib\proguardgui.jar %*

=== modified file 'bin/proguardgui.sh'
--- bin/proguardgui.sh	2009-05-20 08:21:13 +0000
+++ bin/proguardgui.sh	2012-07-12 00:24:28 +0000
@@ -2,8 +2,14 @@
 #
 # Start-up script for the GUI of ProGuard -- free class file shrinker,
 # optimizer, obfuscator, and preverifier for Java bytecode.
-
-PROGUARD_HOME=`dirname "$0"`
-PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
-
-java -jar $PROGUARD_HOME/lib/proguardgui.jar "$@"
+#
+# Note: when passing file names containing spaces to this script,
+#       you'll have to add escaped quotes around them, e.g.
+#       "\"/My Directory/My File.txt\""
+
+PROGUARD_HOME=`dirname "$0"`/..
+
+# On Linux, Java 1.6.0_24 and higher hang when starting the GUI:
+#   http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7027598
+# We're using the -D option as a workaround.
+java -DsuppressSwingDropSupport=true -jar $PROGUARD_HOME/lib/proguardgui.jar "$@"

=== modified file 'bin/retrace.bat'
--- bin/retrace.bat	2009-05-20 08:21:13 +0000
+++ bin/retrace.bat	2012-07-12 00:24:28 +0000
@@ -2,9 +2,13 @@
 
 REM Start-up script for Retrace -- companion tool for ProGuard, free class file
 REM shrinker, optimizer, obfuscator, and preverifier for Java bytecode.
+REM
+REM Note: when passing file names containing spaces to this script,
+REM       you'll have to add escaped quotes around them, e.g.
+REM       "\"C:/My Directory/My File.txt\""
 
 IF EXIST "%PROGUARD_HOME%" GOTO home
 SET PROGUARD_HOME=..
 :home
 
-java -jar "%PROGUARD_HOME%"\lib\retrace.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
+java -jar "%PROGUARD_HOME%"\lib\retrace.jar %*

=== modified file 'bin/retrace.sh'
--- bin/retrace.sh	2009-05-20 08:21:13 +0000
+++ bin/retrace.sh	2012-07-12 00:24:28 +0000
@@ -2,8 +2,11 @@
 #
 # Start-up script for Retrace -- companion tool for ProGuard, free class file
 # shrinker, optimizer, obfuscator, and preverifier for Java bytecode.
+#
+# Note: when passing file names containing spaces to this script,
+#       you'll have to add escaped quotes around them, e.g.
+#       "\"/My Directory/My File.txt\""
 
-PROGUARD_HOME=`dirname "$0"`
-PROGUARD_HOME=`dirname "$PROGUARD_HOME"`
+PROGUARD_HOME=`dirname "$0"`/..
 
 java -jar $PROGUARD_HOME/lib/retrace.jar "$@"

=== added file 'build/README'
--- build/README	1970-01-01 00:00:00 +0000
+++ build/README	2012-07-12 00:24:28 +0000
@@ -0,0 +1,34 @@
+ProGuard, Java class file shrinker, optimizer, obfuscator, and preverifier
+==========================================================================
+
+This directory contains a number of alternative ways to build ProGuard:
+
+- build.sh  : a shell script for GNU/Linux
+- makefile  : a makefile for GNU/Linux
+- build.xml : an Ant build file for all platforms
+
+- As a final alternative, you can also easily compile the code from the
+  command line:
+
+    mkdir classes
+    javac -sourcepath src -d classes src/proguard/ProGuard.java
+    javac -sourcepath src -d classes src/proguard/gui/ProGuardGUI.java
+    javac -sourcepath src -d classes src/proguard/retrace/ReTrace.java
+
+  For the ProGuard Ant task:
+
+    javac -sourcepath src -d classes -classpath lib/ant.jar \
+        src/proguard/ant/ProGuardTask.java
+
+  For the Java Micro Edition Wireless Tool Kit (JME WTK) obfuscator plug-in:
+
+    javac -sourcepath src -d classes -classpath wtklib/kenv.zip \
+        src/proguard/wtk/ProGuardObfuscator.java
+
+Note that you'll have to install Ant and the JME WTK yourself.
+
+Enjoy!
+
+http://proguard.sourceforge.net/
+
+Copyright (c) 2002-2012 Eric Lafortune ([e-mail])

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-30 10:29:57 +0000
+++ debian/changelog	2012-07-12 00:24:28 +0000
@@ -1,3 +1,13 @@
+proguard (4.8-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. Necessary to fix FTBFS on 
+    mobile-atlas-creator package.  (LP: #888982)
+  * debian/control: Added build-essential to Build Depends.
+  * debian/pathes/debian-changes-4.8: create proguard and
+    proguardgui shell scripts.
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 11 Jul 2012 20:52:33 -0300
+
 proguard (4.4-2) unstable; urgency=low
 
   * update to source format 3.0 (quilt)

=== modified file 'debian/control'
--- debian/control	2009-10-09 16:17:49 +0000
+++ debian/control	2012-07-12 00:24:28 +0000
@@ -1,8 +1,9 @@
 Source: proguard
 Section: devel
 Priority: optional
-Maintainer: Sam Clegg <[e-mail]>
-Build-Depends: debhelper (>= 7.0.15), cdbs, default-jdk, ant
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sam Clegg <[e-mail]>
+Build-Depends: debhelper (>= 7.0.15), cdbs, default-jdk, ant, build-essential
 Standards-Version: 3.8.3
 
 Package: proguard

=== removed file 'debian/patches/debian-changes-4.4-2'
--- debian/patches/debian-changes-4.4-2	2009-11-30 10:29:57 +0000
+++ debian/patches/debian-changes-4.4-2	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-Description: Upstream changes introduced in version 4.4-2
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- proguard (4.4-2) unstable; urgency=low
- .
-   * update to source format 3.0 (quilt)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sam Clegg <[e-mail]>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ proguard-4.4/proguard
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec java -Xss300000 -jar /usr/share/java/proguard.jar "$@"
---- /dev/null
-+++ proguard-4.4/proguardgui
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI "$@"

=== added file 'debian/patches/debian-changes-4.8'
--- debian/patches/debian-changes-4.8	1970-01-01 00:00:00 +0000
+++ debian/patches/debian-changes-4.8	2012-07-12 00:24:28 +0000
@@ -0,0 +1,20 @@
+Description: Creates proguard and proguardgui shell scripts
+ This patch adds proguard and proguardgui shell scripts for starting up
+ proguard.
+ .
+Bug-Ubuntu: https://launchpad.net/bugs/888982
+Forwarded: not-needed
+Last-Update: 2012-11-07
+
+--- /dev/null
++++ proguard-4.8/proguard
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec java -Xss300000 -jar /usr/share/java/proguard.jar "$@"
+--- /dev/null
++++ proguard-4.8/proguardgui
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++exec java -Xss300000 -cp /usr/share/java/proguard.jar:/usr/share/java/proguardgui.jar proguard.gui.ProGuardGUI "$@"

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-30 10:29:57 +0000
+++ debian/patches/series	2012-07-12 00:24:28 +0000
@@ -1,1 +1,1 @@
-debian-changes-4.4-2
+debian-changes-4.8

=== modified file 'docs/FAQ.html'
--- docs/FAQ.html	2009-10-09 16:17:49 +0000
+++ docs/FAQ.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard FAQ</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -13,35 +24,37 @@
 <h3>Contents</h3>
 
 <ol>
-<li><a href="#shrinking">What is shrinking?</a>
-<li><a href="#obfuscation">What is obfuscation?</a>
-<li><a href="#preverification">What is preverification?</a>
+<li><a href="#shrinking">What is shrinking?</a></li>
+<li><a href="#obfuscation">What is obfuscation?</a></li>
+<li><a href="#preverification">What is preverification?</a></li>
 <li><a href="#optimization">What kind of optimizations does <b>ProGuard</b>
-    support?</a>
+    support?</a></li>
 <li><a href="#commercial">Can I use <b>ProGuard</b> to process my commercial
-    application?</a>
+    application?</a></li>
 <li><a href="#jdk1.4">Does <b>ProGuard</b> work with Java 2? Java 5? Java
-    6?</a>
-<li><a href="#jme">Does <b>ProGuard</b> work with Java Micro Edition?</a>
-<li><a href="#android">Does <b>ProGuard</b> work for Google Android code?</a>
-<li><a href="#blackberry">Does <b>ProGuard</b> work for Blackberry code?</a>
-<li><a href="#ant">Does <b>ProGuard</b> have support for Ant?</a>
-<li><a href="#gui">Does <b>ProGuard</b> come with a GUI?</a>
+    6?</a></li>
+<li><a href="#jme">Does <b>ProGuard</b> work with Java Micro Edition?</a></li>
+<li><a href="#android">Does <b>ProGuard</b> work for Google Android
+    code?</a></li>
+<li><a href="#blackberry">Does <b>ProGuard</b> work for Blackberry
+    code?</a></li>
+<li><a href="#ant">Does <b>ProGuard</b> have support for Ant?</a></li>
+<li><a href="#gui">Does <b>ProGuard</b> come with a GUI?</a></li>
 <li><a href="#forname">Does <b>ProGuard</b> handle <code>Class.forName</code>
-    calls?</a>
-<li><a href="#resource">Does <b>ProGuard</b> handle resource files?</a>
-<li><a href="#encrypt">Does <b>ProGuard</b> encrypt strings constants?</a>
-<li><a href="#flow">Does <b>ProGuard</b> perform control flow obfuscation?</a>
+    calls?</a></li>
+<li><a href="#resource">Does <b>ProGuard</b> handle resource files?</a></li>
+<li><a href="#encrypt">Does <b>ProGuard</b> encrypt string constants?</a></li>
+<li><a href="#flow">Does <b>ProGuard</b> perform control flow
+    obfuscation?</a></li>
 <li><a href="#incremental">Does <b>ProGuard</b> support incremental
-    obfuscation?</a>
+    obfuscation?</a></li>
 <li><a href="#keywords">Can <b>ProGuard</b> obfuscate using reserved
-    keywords?</a>
+    keywords?</a></li>
 <li><a href="#stacktrace">Can <b>ProGuard</b> reconstruct obfuscated stack
-    traces?</a>
+    traces?</a></li>
 </ol>
 
-<a name="shrinking">&nbsp;</a>
-<h3>What is shrinking?</h3>
+<h3><a name="shrinking">What is shrinking?</a></h3>
 
 Java source code (.java files) is typically compiled to bytecode (.class
 files). Bytecode is more compact than Java source code, but it may still
@@ -50,8 +63,7 @@
 unused classes, fields, and methods. The program remains functionally
 equivalent, including the information given in exception stack traces.
 
-<a name="obfuscation">&nbsp;</a>
-<h3>What is obfuscation?</h3>
+<h3><a name="obfuscation">What is obfuscation?</a></h3>
 
 By default, compiled bytecode still contains a lot of debugging information:
 source file names, line numbers, field names, method names, argument names,
@@ -63,8 +75,7 @@
 bonus. The program remains functionally equivalent, except for the class
 names, method names, and line numbers given in exception stack traces.
 
-<a name="preverification">&nbsp;</a>
-<h3>What is preverification?</h3>
+<h3><a name="preverification">What is preverification?</a></h3>
 
 When loading class files, the class loader performs some sophisticated
 verification of the byte code. This analysis makes sure the code can't
@@ -77,8 +88,7 @@
 perform the preverification step too, for instance allowing to retarget older
 class files at Java 6.
 
-<a name="optimization">&nbsp;</a>
-<h3>What kind of optimizations does <b>ProGuard</b> support?</h3>
+<h3><a name="optimization">What kind of optimizations does <b>ProGuard</b> support?</a></h3>
 
 Apart from removing unused classes, fields, and methods in the shrinking step,
 <b>ProGuard</b> can also perform optimizations at the bytecode level, inside
@@ -87,24 +97,24 @@
 and liveness analysis, <b>ProGuard</b> can:
 
 <ul>
-<li>Evaluate constant expressions.
-<li>Remove unnecessary field accesses and method calls.
-<li>Remove unnecessary branches.
-<li>Remove unnecessary comparisons and instanceof tests.
-<li>Remove unused code blocks.
-<li>Merge identical code blocks.
-<li>Reduce variable allocation.
-<li>Remove write-only fields and unused method parameters.
-<li>Inline constant fields, method parameters, and return values.
-<li>Inline methods that are short or only called once.
-<li>Simplify tail recursion calls.
-<li>Merge classes and interfaces.
-<li>Make methods private, static, and final when possible.
-<li>Make classes static and final when possible.
-<li>Replace interfaces that have single implementations.
+<li>Evaluate constant expressions.</li>
+<li>Remove unnecessary field accesses and method calls.</li>
+<li>Remove unnecessary branches.</li>
+<li>Remove unnecessary comparisons and instanceof tests.</li>
+<li>Remove unused code blocks.</li>
+<li>Merge identical code blocks.</li>
+<li>Reduce variable allocation.</li>
+<li>Remove write-only fields and unused method parameters.</li>
+<li>Inline constant fields, method parameters, and return values.</li>
+<li>Inline methods that are short or only called once.</li>
+<li>Simplify tail recursion calls.</li>
+<li>Merge classes and interfaces.</li>
+<li>Make methods private, static, and final when possible.</li>
+<li>Make classes static and final when possible.</li>
+<li>Replace interfaces that have single implementations.</li>
 <li>Perform over 200 peephole optimizations, like replacing ...*2 by
-    ...&lt;&lt;1.
-<li>Optionally remove logging code.
+    ...&lt;&lt;1.</li>
+<li>Optionally remove logging code.</li>
 </ul>
 The positive effects of these optimizations will depend on your code and on
 the virtual machine on which the code is executed. Simple virtual machines may
@@ -113,27 +123,28 @@
 <p>
 Some notable optimizations that aren't supported yet:
 <ul>
-<li>Moving constant expressions out of loops.
-<li>Optimizations that require escape analysis.
+<li>Moving constant expressions out of loops.</li>
+<li>Optimizations that require escape analysis
+    (<a href="http://www.saikoa.com/dexguard" target="_top">DexGuard</a>
+    does).</li>
 </ul>
 
-<a name="commercial">&nbsp;</a>
-<h3>Can I use <b>ProGuard</b> to process my commercial application?</h3>
+<h3><a name="commercial">Can I use <b>ProGuard</b> to process my commercial application?</a></h3>
 
 Yes, you can. <b>ProGuard</b> itself is distributed under the GPL, but this
 doesn't affect the programs that you process. Your code remains yours, and
 its license can remain the same.
 
-<a name="jdk1.4">&nbsp;</a>
-<h3>Does <b>ProGuard</b> work with Java 2? Java 5? Java 6?</h3>
+<h3><a name="jdk1.4">Does <b>ProGuard</b> work with Java 2? Java 5? Java 6? Java 7?</a></h3>
 
-Yes, <b>ProGuard</b> supports all JDKs from 1.1 up to and including 6.0. Java 2
+Yes, <b>ProGuard</b> supports all JDKs from 1.1 up to and including 7.0. Java 2
 introduced some small differences in the class file format. Java 5 added
-attributes for generics and for annotations. Java 6 introduced preverification
-attributes. <b>ProGuard</b> handles all versions correctly.
+attributes for generics and for annotations. Java 6 introduced optional
+preverification attributes. Java 7 made preverification obligatory and
+introduced support for dynamic languages. <b>ProGuard</b> handles all versions
+correctly.
 
-<a name="jme">&nbsp;</a>
-<h3>Does <b>ProGuard</b> work with Java Micro Edition?</h3>
+<h3><a name="jme">Does <b>ProGuard</b> work with Java Micro Edition?</a></h3>
 
 Yes. <b>ProGuard</b> itself runs in Java Standard Edition, but you can freely
 specify the run-time environment at which your programs are targeted,
@@ -144,16 +155,14 @@
 <b>ProGuard</b> also comes with an obfuscator plug-in for the JME Wireless
 Toolkit.
 
-<a name="android">&nbsp;</a>
-<h3>Does <b>ProGuard</b> work for Google Android code?</h3>
+<h3><a name="android">Does <b>ProGuard</b> work for Google Android code?</a></h3>
 
 Yes. Google's <code>dx</code> compiler converts ordinary jar files into files
 that run on Android devices. By preprocessing the original jar files,
 <b>ProGuard</b> can significantly reduce the file sizes and boost the run-time
 performance of the code.
 
-<a name="blackberry">&nbsp;</a>
-<h3>Does <b>ProGuard</b> work for Blackberry code?</h3>
+<h3><a name="blackberry">Does <b>ProGuard</b> work for Blackberry code?</a></h3>
 
 It should. RIM's proprietary <code>rapc</code> compiler converts ordinary JME
 jar files into cod files that run on Blackberry devices. The compiler performs
@@ -163,24 +172,21 @@
 bugs. It sometimes fails on obfuscated code that is valid and accepted by other
 JME tools and VMs. Your mileage may therefore vary.
 
-<a name="ant">&nbsp;</a>
-<h3>Does <b>ProGuard</b> have support for Ant?</h3>
+<h3><a name="ant">Does <b>ProGuard</b> have support for Ant?</a></h3>
 
 Yes. <b>ProGuard</b> provides an Ant task, so that it integrates seamlessly
 into your Ant build processes. You can still use configurations in
 <b>ProGuard</b>'s own readable format. Alternatively, if you prefer XML, you
 can specify the equivalent XML configuration.
 
-<a name="gui">&nbsp;</a>
-<h3>Does <b>ProGuard</b> come with a GUI?</h3>
+<h3><a name="gui">Does <b>ProGuard</b> come with a GUI?</a></h3>
 
 Yes. First of all, <b>ProGuard</b> is perfectly usable as a command-line tool
 that can easily be integrated into any automatic build process. For casual
 users, there's also a graphical user interface that simplifies creating,
 loading, editing, executing, and saving ProGuard configurations.
 
-<a name="forname">&nbsp;</a>
-<h3>Does <b>ProGuard</b> handle <code>Class.forName</code> calls?</h3>
+<h3><a name="forname">Does <b>ProGuard</b> handle <code>Class.forName</code> calls?</a></h3>
 
 Yes. <b>ProGuard</b> automatically handles constructs like
 <code>Class.forName("SomeClass")</code> and <code>SomeClass.class</code>. The
@@ -195,22 +201,23 @@
 implementations may need to be preserved. The user can adapt his configuration
 accordingly.
 
-<a name="resource">&nbsp;</a>
-<h3>Does <b>ProGuard</b> handle resource files?</h3>
+<h3><a name="resource">Does <b>ProGuard</b> handle resource files?</a></h3>
 
 Yes. <b>ProGuard</b> copies all non-class resource files, optionally adapting
 their names and their contents to the obfuscation that has been applied.
 
-<a name="encrypt">&nbsp;</a>
-<h3>Does <b>ProGuard</b> encrypt strings constants?</h3>
-
-No. Storing encrypted string constants in program code is fairly futile, since
-the encryption has to be perfectly reversible by definition. Moreover, the
-decryption costs additional memory and computation at run-time. If this feature
-is ever incorporated, I'll provide a tool to decrypt the strings as well.
-
-<a name="flow">&nbsp;</a>
-<h3>Does <b>ProGuard</b> perform flow obfuscation?</h3>
+<h3><a name="encrypt">Does <b>ProGuard</b> encrypt string constants?</a></h3>
+
+No. String encryption in program code has to be perfectly reversible by
+definition, so it only improves the obfuscation level. It increases the
+footprint of the code. However, by popular demand, ProGuard's sibling for
+Android <a href="http://www.saikoa.com/dexguard"
+target="_top"><b>DexGuard</b></a> does support string encryption, along with
+class encryption and hiding of access to sensitive APIs. <b>DexGuard</b> is
+distributed by <a href="http://www.saikoa.com/" target="_top">Saikoa</a> and
+is not open source.
+
+<h3><a name="flow">Does <b>ProGuard</b> perform flow obfuscation?</a></h3>
 
 Not explicitly. Control flow obfuscation injects additional branches into the
 bytecode, in an attempt to fool decompilers. <b>ProGuard</b> does not do this,
@@ -218,15 +225,13 @@
 optimization step often already restructures the code to the point where most
 decompilers get confused.
 
-<a name="incremental">&nbsp;</a>
-<h3>Does <b>ProGuard</b> support incremental obfuscation?</h3>
+<h3><a name="incremental">Does <b>ProGuard</b> support incremental obfuscation?</a></h3>
 
 Yes. This feature allows you to specify a previous obfuscation mapping file in
 a new obfuscation step, in order to produce add-ons or patches for obfuscated
 code.
 
-<a name="keywords">&nbsp;</a>
-<h3>Can <b>ProGuard</b> obfuscate using reserved keywords?</h3>
+<h3><a name="keywords">Can <b>ProGuard</b> obfuscate using reserved keywords?</a></h3>
 
 Yes. You can specify your own obfuscation dictionary, such as a list of
 reserved key words, identifiers with foreign characters, random source files,
@@ -234,8 +239,7 @@
 Decent decompilers can automatically replace reserved keywords, and the effect
 can be undone fairly easily, by obfuscating again with simpler names.
 
-<a name="stacktrace">&nbsp;</a>
-<h3>Can <b>ProGuard</b> reconstruct obfuscated stack traces?</h3>
+<h3><a name="stacktrace">Can <b>ProGuard</b> reconstruct obfuscated stack traces?</a></h3>
 
 Yes. <b>ProGuard</b> comes with a companion tool, <b>ReTrace</b>, that can
 'de-obfuscate' stack traces produced by obfuscated applications. The
@@ -245,10 +249,11 @@
 reverse mapping. Please refer to the <a href="manual/index.html">ProGuard User
 Manual</a> for more details.
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/GPL_exception.html'
--- docs/GPL_exception.html	2009-10-09 16:17:49 +0000
+++ docs/GPL_exception.html	2012-07-12 00:24:28 +0000
@@ -7,7 +7,7 @@
 <H1>Special Exception to the GNU General Public License</H1>
 
 <P>
-Copyright &copy; 2002-2009 Eric Lafortune
+Copyright &copy; 2002-2012 Eric Lafortune
 </P>
 
 <P>
@@ -33,13 +33,17 @@
 In addition, as a special exception, Eric Lafortune gives permission to link
 the code of this program with the following stand-alone applications:
 <ul>
-<li>Apache Ant,
-<li>Apache Maven,
-<li>the Eclipse ProGuardDT GUI,
-<li>the EclipseME JME IDE,
-<li>the Sun NetBeans Java IDE,
-<li>the Sun JME Wireless Toolkit, and
-<li>the Javaground Tools,
+<li>Apache Ant,</li>
+<li>Apache Maven,</li>
+<li>the Google Android SDK,</li>
+<li>the Eclipse ProGuardDT GUI,</li>
+<li>the EclipseME JME IDE,</li>
+<li>the Oracle NetBeans Java IDE,</li>
+<li>the Oracle JME Wireless Toolkit,</li>
+<li>the Simple Build Tool for Scala (and its scripts),</li>
+<li>the NeoMAD Tools by Neomades,</li>
+<li>the Javaground Tools, and</li>
+<li>the Sanaware Tools,</li>
 </ul>
 and distribute linked combinations including the two. You must obey the GNU
 General Public License in all respects for all of the code used other than

=== modified file 'docs/acknowledgements.html'
--- docs/acknowledgements.html	2009-10-09 16:17:49 +0000
+++ docs/acknowledgements.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Acknowledgements</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -12,7 +23,7 @@
 
 The first versions of <b>ProGuard</b> grew out of <b>RetroGuard</b>, which its
 author Mark Welsh kindly made available under the GNU Lesser General Public
-License. <b>RetroGuard</b> is a very nice piece of code, but it only performed
+License. RetroGuard is a very nice piece of code, but it only performed
 obfuscation. I started from the class file parsing code and wrote my own
 shrinker, optimizer, obfuscator, and preverifier. As of version 4.0, all of the
 original code has been rewritten, so the most obvious remaining similarity are
@@ -33,35 +44,34 @@
 Daniel Sj&ouml;blom, Jan Filipsky, Charles Smith, Gerrit Telkamp, Noel
 Grandin, Torbj&ouml;rn S&ouml;derstedt, Clemens Eisserer, Clark Bassett,
 Eduard Welch, Dawid Weiss, Andrew Wilson, Sean Owen, Niels Gron, Ishan Mehta,
-Steven Adams, Xavier Kral,
+Steven Adams, Xavier Kral, Stefan Martin, Toby Reyelts,
 and many others. Thanks! Your feedback has been invaluable.
 <p>
 
-I am developing ProGuard in my spare time, which is possible thanks to my
-day-time job at <a href="http://www.luciad.com/" target="other">Luciad</a>.
+<a href="http://www.saikoa.com/" target="_top">Saikoa</a> is providing the
+financial resources for this project. At Saikoa, we're also developing
+ProGuard's sibling for Android,
+<a href="http://www.saikoa.com/dexguard" target="_top">DexGuard</a>.
 <p>
 
 <a href="http://sourceforge.net/projects/proguard/"
-target="other">SourceForge</a> is generously providing the resources for
-hosting this project and many other projects.
-<p>
-
-JetBrains is kindly providing a license for its IntelliJ IDEA development
-environment.
-<p>
-
-The code and these web pages were written using Sun's JDKs, Linux, IntelliJ
-IDEA, GNU emacs, bash, sed, awk, and a whole host of other tools that continue
-to make programming interesting.
-<p>
-
-And finally, I'm a great fan of the <a
+target="other">SourceForge</a> is providing the resources for hosting this
+project and many other projects.
+<p>
+
+The code and these web pages were written using Oracle/Sun's JDKs, Linux,
+IntelliJ IDEA, GNU emacs, bash, sed, awk, and a whole host of other tools that
+continue to make programming interesting.
+<p>
+
+And finally, I'm a great fan of Sanaware's <a
 href="http://www.javadocking.com/" target="other">Java Docking Library</a>.
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 
 </body>

=== modified file 'docs/alternatives.html'
--- docs/alternatives.html	2009-10-09 16:17:49 +0000
+++ docs/alternatives.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Alternatives</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -34,612 +45,682 @@
 </tr>
 
 <tr>
-<td><a target="other" href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a></td>
+<td><a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a></td>
 <td><a target="_top" href="http://proguard.sourceforge.net/">ProGuard</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
 <td>Free (GPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.informatik.uni-oldenburg.de/leute/hoenicke.html">Jochen Hoenicke</a></td>
 <td><a target="other" href="http://jode.sourceforge.net/">Jode</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (GPL)</td>
 </tr>
 
 <tr>
-<td><a target="other" rel="nofollow" href="http://www.nq4.de/">NQ4</a></td>
-<td><a target="other" href="http://www.nq4.de/">Joga</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free (no source)</td>
-</tr>
-
-<tr>
 <td><a target="other" rel="nofollow" href="http://www.cs.cornell.edu/nystrom/">Nate Nystrom</a></td>
 <td><a target="other" href="http://www.cs.purdue.edu/homes/hosking/bloat/">Bloat</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://sourceforge.net/users/hchacha/">Hidetoshi Ohuchi</a></td>
 <td><a target="other" href="http://jarg.sourceforge.net/">Jarg</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (BSD)</td>
 </tr>
 
 <tr>
-<td><a target="other" rel="nofollow" href="http://www.geocities.com/CapeCanaveral/Hall/2334/resume.html">Alexander Shvets</a></td>
-<td><a target="other" href="http://www.geocities.com/CapeCanaveral/Hall/2334/Programs/cafebabe.html">CafeBabe</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free</td>
-</tr>
-
-<tr>
 <td><a target="other" rel="nofollow" href="http://www.yworks.com/">yWorks</a></td>
 <td><a target="other" href="http://www.yworks.com/en/products_yguard_about.htm">yGuard</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (no source)</td>
 </tr>
 
 <tr>
-<td><a target="other" rel="nofollow" href="http://www.cs.purdue.edu/homes/grothoff/">Christian Grothoff</a></td>
-<td><a target="other" href="http://www.ovmj.org/jamit/">Jamit</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td>Free (GPL)</td>
-</tr>
-
-<tr>
 <td><a target="other" rel="nofollow" href="http://mojo.codehaus.org/">Mojo</a></td>
 <td><a target="other" href="http://mojo.codehaus.org/minijar-maven-plugin/">Minijar</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (Apache)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.riggshill.com/">RiggsHill Software</a></td>
 <td><a target="other" href="http://genjar.sourceforge.net/">GenJar</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (Apache)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://ant.apache.org/">Apache</a></td>
-<td><a target="other" href="http://ant.apache.org/manual/OptionalTypes/classfileset.html">Ant Classfileset</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td>Free (Apache)</td>
+<td><a target="other" href="http://ant.apache.org/manual/Types/classfileset.html">Ant Classfileset</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td>Free (Apache)</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://www.celton.mobi/">Carsten Elton S&oslash;rensen</a></td>
+<td><a target="other" href="http://code.google.com/p/treeshaker/">Treeshaker</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td>Free (Apache)</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://www.ucdetector.org/">J&ouml;rg Spieler</a></td>
+<td><a target="other" href="http://www.ucdetector.org/">UCDetector</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td>Free (EPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.curious-creature.org/">Romain Guy</a></td>
 <td><a target="other" href="http://www.jroller.com/gfx/entry/get_what_you_need_from">Harvester</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (BSD)</td>
 </tr>
 
 <tr>
-<td><a target="other" rel="nofollow" href="https://dcd.dev.java.net/">Emeric Vernat</a></td>
-<td><a target="other" href="https://dcd.dev.java.net/">DCD</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td><a target="other" rel="nofollow" href="http://java.net/projects/dcd/">Emeric Vernat</a></td>
+<td><a target="other" href="http://java.net/projects/dcd/">DCD</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (LGPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://sadun-util.sourceforge.net/">Cristiano Sadun</a></td>
 <td><a target="other" href="http://sadun-util.sourceforge.net/pack.html">Pack</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td>Free (LGPL)</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://darcs.brianweb.net/">Brian Alliet</a></td>
-<td><a target="other" href="http://darcs.brianweb.net/gcclass/">Gcclass</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (LGPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.sable.mcgill.ca/">Sable</a></td>
 <td><a target="other" href="http://www.sable.mcgill.ca/soot/">Soot</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free (LGPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.garret.ru/~knizhnik/">Konstantin Knizhnik</a></td>
 <td><a target="other" href="http://www.garret.ru/~knizhnik/javago/ReadMe.htm">JavaGO</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td>Free</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://donquixote.cafebabe.jp/">Haruaki Tamada</a></td>
-<td><a target="other" href="http://donquixote.cafebabe.jp/">DonQuixote</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Free</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.sable.mcgill.ca/">Sable</a></td>
 <td><a target="other" href="http://www.sable.mcgill.ca/JBCO/">JBCO</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (LGPL)</td>
 </tr>
 
 <tr>
+<td><a target="other" rel="nofollow" href="http://classencrypt.sourceforge.net/">Jeffrey Wheaton</a></td>
+<td><a target="other" href="http://classencrypt.sourceforge.net/">ClassEncrypt</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Free (GPL)</td>
+</tr>
+
+<tr>
 <td><a target="other" rel="nofollow" href="http://sourceforge.net/users/glurk/">Thorsten Heit</a></td>
 <td><a target="other" href="http://sourceforge.net/projects/javaguard/">JavaGuard</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (LGPL)</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://mwobfu.sourceforge.net/">Patrick Mueller</a></td>
 <td><a target="other" href="http://mwobfu.sourceforge.net/">Mwobfu</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free (GPL)</td>
 </tr>
 
 <tr>
-<td><a target="other" rel="nofollow" href="http://www.elegant-software.com/">Elegant Software</a></td>
-<td><a target="other" href="http://www.elegant-software.com/software/jmangle/">JMangle</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free</td>
-</tr>
-
-<tr>
 <td><a target="other" rel="nofollow" href="http://www.bebbosoft.de/">BebboSoft</a></td>
-<td><a target="other" href="http://www.bebbosoft.de/index.html#java/mug/index.html">Bb_mug</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free (no source)</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.drjava.de/">Dr. Java</a></td>
-<td><a target="other" href="http://www.drjava.de/obfuscator/">Marvin Obfuscator</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free (no source)</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.ibm.com/">IBM</a></td>
-<td><a target="other" href="http://www-306.ibm.com/software/wireless/wsdd/">WSDD</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td><a target="other" href="http://www.bebbosoft.de/#java/mug/index.wiki">Bb_mug</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Free (no source)</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://github.com/v6ak">V&iacute;t &Scaron;est&aacute;k</a></td>
+<td><a target="other" href="http://github.com/v6ak/Preverifier/">Preverifier</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td>Free (EPL)</td>
+</tr>
+
+<tr>
+<td><a target="_top" href="http://www.saikoa.com/">Saikoa</a></td>
+<td><a target="_top" href="http://www.saikoa.com/dexguard">DexGuard</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.preemptive.com/">PreEmptive</a></td>
 <td><a target="other" href="http://www.preemptive.com/products/dasho/index.html">DashOPro</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.zelix.com/">Zelix</a></td>
 <td><a target="other" href="http://www.zelix.com/klassmaster/index.html">KlassMaster</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.s5systems.com/">S5 Systems</a></td>
-<td><a target="other" href="http://www.s5systems.com/jPresto.htm">jPresto</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.s-cradle.com/english/index.html">Sophia Cradle</a></td>
 <td><a target="other" href="http://www.s-cradle.com/english/products/sophiacompress_java/index.html">SophiaCompress</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.retrologic.com/">RetroLogic</a></td>
-<td><a target="other" href="http://www.retrologic.com/">RetroGuard</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.codingart.com/">CodingArt</a></td>
-<td><a target="other" href="http://www.codingart.com/codeshield.html">CodeShield</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.e-t.com/">Eastridge Technology</a></td>
 <td><a target="other" href="http://www.e-t.com/jshrink.html">Jshrink</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.helseth.com/">Helseth</a></td>
-<td><a target="other" href="http://www.helseth.com/HJO.htm">JObfuscator</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.leesw.com/">LeeSoftware</a></td>
 <td><a target="other" href="http://www.leesw.com/">Smokescreen Obfuscator</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.vegatech.com/">Vega Technologies</a></td>
-<td><a target="other" href="http://www.vegatech.com/jzipper/">JZipper</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.innaworks.com/">Innaworks</a></td>
-<td><a target="other" href="http://www.innaworks.com/">mBooster</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
+<td><a target="other" href="http://www.innaworks.com/mBooster">mBooster</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.uni-vologda.ac.ru/~c3c/">Sergey Sverdlov</a></td>
 <td><a target="other" href="http://www.uni-vologda.ac.ru/~c3c/jco/">J.Class Optimizer</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.smardec.com/">Smardec</a></td>
-<td><a target="other" href="//www.allatori.com/">Allatori</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td><a target="other" href="http://www.allatori.com/">Allatori</a></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://cs.arizona.edu/">U. of Arizona</a></td>
 <td><a target="other" href="http://sandmark.cs.arizona.edu/">SandMark</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://zenofx.com/">Zenofx</a></td>
+<td><a target="other" href="http://zenofx.com/classguard/">ClassGuard</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://www.bisguard.com/">BIS Guard &amp; Co.</a></td>
+<td><a target="other" href="http://www.bisguard.com/java.html">Java Antidecompiler</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.force5.com/">Force 5</a></td>
-<td><a target="other" href="http://www.force5.com/">JCloak</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td><a target="other" href="http://www.force5.com/JCloak/ProductJCloak.html">JCloak</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.semdesigns.com/">Semantic Designs</a></td>
 <td><a target="other" href="http://www.semdesigns.com/Products/Obfuscators/JavaObfuscator.html">Obfuscator</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.duckware.com/">Duckware</a></td>
 <td><a target="other" href="http://www.duckware.com/jobfuscate/">Jobfuscate</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.jproof.com/">JProof</a></td>
-<td><a target="other" href="http://www.jproof.com/">JProof</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.solutia.ro/">GITS</a></td>
-<td><a target="other" href="http://www.solutia.ro/pages/javadc/">Blurfuscator</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://www.chainkey.com/">ChainKey</a></td>
-<td><a target="other" href="http://www.chainkey.com/en/jcp/">Java Code Protector</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial</td>
-</tr>
-
-<tr>
-<td><a target="other" rel="nofollow" href="http://sourceforge.net/projects/flmobf/">Alain Moran</a></td>
-<td><a target="other" href="http://sourceforge.net/projects/flmobf/">flmObf</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Free (BSD)</td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial</td>
+</tr>
+
+<tr>
+<td><a target="other" rel="nofollow" href="http://www.arxan.com/">Arxan</a></td>
+<td><a target="other" href="http://www.arxan.com/software-protection-products/java-GuardIt/index.php">GuardIT</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial</td>
 </tr>
 
 <tr>
 <td><a target="other" rel="nofollow" href="http://www.chez.com/vasile/">Vasile Calmatui</a></td>
 <td><a target="other" href="http://www.chez.com/vasile/obfu/VasObfuLite.html">VasObfuLite</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Free</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.alphaworks.ibm.com/">IBM AlphaWorks</a></td>
 <td><a target="other" href="http://www.research.ibm.com/jax/">JAX</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>(discontinued)</td>
 </tr>
 
 <tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.nq4.de/">NQ4</a></td>
+<td><a target="other" rel="nofollow" href="http://www.nq4.de/">Joga</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(discontinued?)</td>
+</tr>
+
+<tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www-i2.informatik.rwth-aachen.de/~markusj/">Markus Jansen</a></td>
 <td><a target="other" rel="nofollow" href="http://www-i2.informatik.rwth-aachen.de/~markusj/jopt/">Jopt</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.geocities.com/CapeCanaveral/Hall/2334/resume.html">Alexander Shvets</a></td>
+<td><a target="other" rel="nofollow" href="http://www.geocities.com/CapeCanaveral/Hall/2334/Programs/cafebabe.html">CafeBabe</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://darcs.brianweb.net/">Brian Alliet</a></td>
+<td><a target="other" rel="nofollow" href="http://darcs.brianweb.net/gcclass/">Gcclass</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.cs.purdue.edu/homes/grothoff/">Christian Grothoff</a></td>
+<td><a target="other" rel="nofollow" href="http://www.ovmj.org/jamit/">Jamit</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://donquixote.cafebabe.jp/">Haruaki Tamada</a></td>
+<td><a target="other" rel="nofollow" href="http://donquixote.cafebabe.jp/">DonQuixote</a></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.utdallas.edu/~gxz014000/">Bajie</a></td>
+<td><a target="other" rel="nofollow" href="http://www.utdallas.edu/~gxz014000/jcmp/">JCMP</a></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.elegant-software.com/">Elegant Software</a></td>
+<td><a target="other" rel="nofollow" href="http://www.elegant-software.com/software/jmangle/">JMangle</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>(disappeared?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.primenet.com/~ej">Eron Jokipii</a></td>
 <td><a target="other" rel="nofollow" href="http://www.primenet.com/~ej">Jobe</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>(disappeared?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://jrc.krdl.org.sg/">JRC</a></td>
 <td><a target="other" rel="nofollow" href="http://jrc.krdl.org.sg/decaf/">DeCaf</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>(disappeared?)</td>
-</tr>
-
-<tr class="disappeared">
-<td><a target="other" rel="nofollow" href="http://www.utdallas.edu/~gxz014000/">Bajie</a></td>
-<td><a target="other" rel="nofollow" href="http://www.utdallas.edu/~gxz014000/jcmp/">JCMP</a></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>(disappeared?)</td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.drjava.de/">Dr. Java</a></td>
+<td><a target="other" rel="nofollow" href="http://www.drjava.de/obfuscator/">Marvin Obfuscator</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>(disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.ibm.com/">IBM</a></td>
+<td><a target="other" rel="nofollow" href="http://www-306.ibm.com/software/wireless/wsdd/">WSDD</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (discontinued?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.s5systems.com/">S5 Systems</a></td>
+<td><a target="other" rel="nofollow" href="http://www.s5systems.com/jPresto.htm">jPresto</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.plumbdesign.com/">Plumb Design</a></td>
 <td><a target="other" rel="nofollow" href="http://www.condensity.com/">Condensity</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.4thpass.com/">4th Pass</a></td>
 <td><a target="other" rel="nofollow" href="http://www.4thpass.com/">SourceGuard</a></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (discontinued?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.codingart.com/">CodingArt</a></td>
+<td><a target="other" rel="nofollow" href="http://www.codingart.com/codeshield.html">CodeShield</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.software4j.com/">Software4j</a></td>
 <td><a target="other" rel="nofollow" href="http://www.software4j.com/obfuscate4j/">Obfuscate4j</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.jammconsulting.com/">JAMM Consulting</a></td>
 <td><a target="other" rel="nofollow" href="http://www.jammconsulting.com/jamm/servlet/com.jammconsulting.servlet.JAMMServlet?pageId=ObfuscateProPage">ObfuscatePro</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.jdevelop.com/">JDevelop</a></td>
 <td><a target="other" rel="nofollow" href="http://www.jdevelop.com/best-java-obfuscator.html">JSCO</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.4fang.net/">4Fang</a></td>
 <td><a target="other" rel="nofollow" href="http://www.4fang.net/jmix/">JMix</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (discontinued?)</td>
 </tr>
 
 <tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.retrologic.com/">RetroLogic</a></td>
+<td><a target="other" rel="nofollow" href="http://www.retrologic.com/">RetroGuard</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.helseth.com/">Helseth</a></td>
+<td><a target="other" rel="nofollow" href="http://www.helseth.com/HJO.htm">JObfuscator</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.vegatech.com/">Vega Technologies</a></td>
+<td><a target="other" rel="nofollow" href="http://www.vegatech.com/jzipper/">JZipper</a></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.jproof.com/">JProof</a></td>
+<td><a target="other" rel="nofollow" href="http://www.jproof.com/">JProof</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.chainkey.com/">ChainKey</a></td>
+<td><a target="other" rel="nofollow" href="http://www.chainkey.com/en/jcp/">Java Code Protector</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.2lkit.com/">2LKit</a></td>
 <td><a target="other" rel="nofollow" href="http://www.2lkit.com/products/2LKitObf/index.htm">2LKit Obfuscator</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (disappeared?)</td>
 </tr>
 
 <tr class="disappeared">
 <td><a target="other" rel="nofollow" href="http://www.wingsoft.com/">WingSoft</a></td>
 <td><a target="other" rel="nofollow" href="http://www.wingsoft.com/wingguard.html">WingGuard</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
-<td>Commercial (disappeared?)</td>
-</tr>
-
-<tr class="disappeared">
-<td><a target="other" rel="nofollow" href="http://www.sbktech.org/">HashJava</a></td>
-<td><a target="other" rel="nofollow" href="http://www.sbktech.org/">HashJava</a></td>
-<td align="center"><br></td>
-<td align="center"><br></td>
-<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x"></td>
-<td align="center"><br></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.sbktech.org/">HashJava</a></td>
+<td><a target="other" rel="nofollow" href="http://www.sbktech.org/">HashJava</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
+<td>Commercial (disappeared?)</td>
+</tr>
+
+<tr class="disappeared">
+<td><a target="other" rel="nofollow" href="http://www.solutia.ro/">GITS</a></td>
+<td><a target="other" rel="nofollow" href="http://www.solutia.ro/pages/javadc/">Blurfuscator</a></td>
+<td align="center"><br /></td>
+<td align="center"><br /></td>
+<td align="center"><img src="checkmark.gif" width="11" height="11" alt="x" /></td>
+<td align="center"><br /></td>
 <td>Commercial (disappeared?)</td>
 </tr>
 
@@ -647,10 +728,11 @@
 <p>
 All trademarks are property of their respective holders.
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 
 </body>

=== modified file 'docs/downloads.html'
--- docs/downloads.html	2009-10-09 16:17:49 +0000
+++ docs/downloads.html	2012-07-12 00:24:28 +0000
@@ -1,11 +1,22 @@
 
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Downloads</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -44,6 +55,123 @@
 collected since the previous release.
 <p>
 
+<h3><div>May 2012</div> Version 4.8</h3>
+<ul>
+<li>Added more peephole optimizations for strings.
+<li>Added support for multiple external configuration files in Ant
+    configurations.
+<li>Added support for Ant properties in external configuration files.
+<li>Fixed parsing of empty file filters on input and output.
+<li>Fixed parsing of '*' wildcard for file filters and name filters.
+<li>Fixed obfuscation of private methods that are overridden in concrete
+    classes with intermediary abstract classes and interfaces (workaround
+    for Oracle bugs #6691741 and #6684387).
+<li>Fixed optimization of complex finally blocks, compiled with JDK 1.4 or
+    earlier.
+<li>Fixed optimizing signatures of methods that are marked as not having
+    side effects.
+<li>Fixed optimization of long local variables possibly causing verification
+    error for register pairs.
+<li>Fixed merging of classes defined inside methods.
+<li>Fixed stack consistency in optimization step.
+<li>No longer removing debug information about unused parameters, for
+    <code>-keepparameternames</code> or <code>-keepattributes</code>.
+<li>Fixed updating manifest files with carriage return characters.
+<li>Now removing unreachable code in preverification step.
+<li>Improved default regular expression for stack traces in ReTrace.
+<li>Updated documentation and examples.
+</ul>
+
+<h3><div>Dec 2011</div> Version 4.7</h3>
+<ul>
+<li>Added support for Java 7.
+<li>Parsing unquoted file names with special characters more leniently.
+<li>Added support for instance methods overriding class methods.
+<li>Added removal of unused parameterless constructors.
+<li>Added removal of empty class initializers.
+<li>Added peephole optimizations for constant strings.
+<li>Avoiding idle optimization passes.
+<li>Improved removal of unused constants after obfuscation.
+<li>Fixed removal of unused classes referenced by annotations.
+<li>Fixed simplifying parameters of constructors that should actually be
+    preserved.
+<li>Fixed simplifying parameters of large numbers of similar constructors.
+<li>Fixed exceptions in optimization of unusual obfuscated code.
+<li>Fixed NullPointerException when specifying <code>-keepclassmembers</code>
+    without specific class or class members.
+<li>Fixed potential problems with mixed-case class name dictionaries when not
+    allowing mixed-case class names.
+<li>Fixed obfuscation of classes with EnclosingMethod attributes that don't
+    specify methods.
+<li>Fixed preverification of returning try blocks with finally blocks, inside
+    try blocks, when compiled with JDK 1.4.
+<li>Fixed sorting of interfaces containing generics.
+<li>Fixed paths in shell scripts.
+<li>Fixed filling in of text fields showing class obfuscation dictionary and
+    package obfuscation dictionary from configuration in GUI.
+<li>Worked around Oracle Java 6/7 bug #7027598 that locked the GUI on Linux.
+<li>Updated documentation and examples.
+</ul>
+
+<h3><div>Feb 2011</div> Version 4.6</h3>
+<ul>
+<li>Added support for synthetic, bridge, and varargs modifiers in configuration.
+<li>Added detection of atomic updater construction with constant arguments.
+<li>Fixed merging of package visible classes.
+<li>Fixed optimization of fields that are only accessed by reflection.
+<li>Fixed optimization of read-only or write-only fields that are volatile.
+<li>Fixed handling of side-effects due to static initializers.
+<li>Fixed handling of bridge flags in obfuscation step.
+<li>Fixed handling of super flag when merging classes.
+<li>Fixed updating of variable tables when optimizing variables.
+<li>Fixed removal of unused parameters with 32 or more parameters.
+<li>Fixed incorrect removal of exception handler for instanceof instruction.
+<li>Fixed inlining of methods with unusual exception handlers.
+<li>Fixed optimization of unusual code causing stack underflow.
+<li>Fixed keeping of constructor parameter names.
+<li>Fixed unwanted wrapping of non-standard META-INF files.
+<li>Fixed filtering of warnings about references to array types.
+<li>Fixed overriding of warning option and note option in Ant task.
+<li>Improved detection of file name extensions for canonical paths.
+<li>Improved printing of seeds specified by <code>-keep</code> options.
+<li>Improved printing of notes about unkept classes.
+<li>Improved checking whether output is up to date.
+<li>Updated documentation and examples.
+</ul>
+
+<h3><div>Jun 2010</div> Version 4.5</h3>
+<ul>
+<li>Added option <code>-keepparameternames</code>.
+<li><code>-dontskipnonpubliclibraryclasses</code> is now set by default. Added
+    <code>-skipnonpubliclibraryclasses</code> as an option.
+<li>Made processing independent of order of input classes to get even more
+    deterministic output.
+<li>Improved constant field propagation.
+<li>Improved renaming of resource files in subdirectories of packages.
+<li>Avoiding making fields in interfaces private.
+<li>Optimizing exception handlers for monitorexit instruction.
+<li>Reduced maximum allowed code length after inlining from 8000 bytes to
+    7000 bytes.
+<li>Fixed missing warnings about missing library classes.
+<li>Fixed shrinking of annotations with arrays of length 0.
+<li>Fixed handling of -0.0 and NaN values when simplifying expressions.
+<li>Fixed copying of exception handlers when simplifying tail recursion calls.
+<li>Fixed optimization of introspected fields.
+<li>Fixed simplification of unnecessary variable initializations.
+<li>Fixed evaluation of subroutines in pre-JDK 1.5 code.
+<li>Fixed updating of access flags in inner classes information.
+<li>Fixed disabling of field privatization.
+<li>Fixed invocations of privatized methods.
+<li>Fixed updating of local variable debug information in optimization step.
+<li>Fixed print settings without file name in GUI.
+<li>Fixed field privatization setting in GUI.
+<li>Fixed saving incorrectly quoted arguments in GUI.
+<li>Fixed handling of regular expressions with only negators.
+<li>Fixed unwanted wrapping of non-standard META-INF files.
+<li>Fixed regular expression pattern for constructors in ReTrace.
+<li>Updated documentation and examples.
+</ul>
+
 <h3><div>Jul 2009</div> Version 4.4</h3>
 <ul>
 <li>Added new peephole optimizations.
@@ -511,10 +639,11 @@
     <b>RetroGuard</b>.
 </ul>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 
 </body>

=== modified file 'docs/feedback.html'
--- docs/feedback.html	2009-10-09 16:17:49 +0000
+++ docs/feedback.html	2012-07-12 00:24:28 +0000
@@ -1,4 +1,4 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
@@ -6,6 +6,17 @@
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Feedback</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -13,28 +24,32 @@
 
 By now, I've invested a fair amount of time in <b>ProGuard</b>. You can help
 by providing feedback! If you have problems, bugs, bug fixes, ideas,
-encouragements, etc., please let me know:
+encouragements, etc., please get in touch:
 <p>
-<ul>
-<li>The <a href="http://sourceforge.net/forum/forum.php?forum_id=182456"
+<ul class="spacious">
+<li>Through
+    <a href="http://www.saikoa.com/proguard/support" target="_top">Saikoa</a>,
+    we provide professional support for ProGuard. If you find ProGuard useful
+    and you would like to have some professional backing, this is the place to
+    go.</li>
+
+<li>The <a href="https://sourceforge.net/projects/proguard/forums/forum/182456"
     target="other">help forum</a> (at SourceForge) is the right place to ask
     questions about any problems you might have configuring and running
-    <b>ProGuard</b>.
-    <p>
+    ProGuard. At this time, I can generally only assist other open source
+    projects though. If you're working on commercial software, please consider
+    our professional support above.</li>
 
-<li>The <a href="http://sourceforge.net/forum/forum.php?forum_id=182455"
+<li>The <a href="https://sourceforge.net/projects/proguard/forums/forum/182455"
     target="other">open discussion forum</a> (at SourceForge) offers a place
-    to share your thoughts and discuss new ideas.
-    <p>
+    to share your thoughts and discuss new ideas.</li>
 
 <li>The <a
-
     href="http://sourceforge.net/tracker/?atid=474704&group_id=54750&func=browse"
     target="other">bug tracking page</a> (at SourceForge) allows you to submit
     and consult bug reports. Please make sure the reports are complete and
     concise. If I can't reproduce the problem, I most likely can't fix it
-    either.
-    <p>
+    either.</li>
 
 <li>The <a
 
@@ -42,16 +57,14 @@
     target="other">feature request page</a> (at SourceForge) allows you to
     submit and consult feature requests. I generally have my own road map in
     mind, but this is the place express your interest in new and existing
-    ideas.
-    <p>
+    ideas.</li>
 
-<li>The <a href="http://sourceforge.net/project/showfiles.php?group_id=54750"
+<li>The <a href="https://sourceforge.net/projects/proguard/files/"
     target="other">download section</a> at SourceForge and the <a
-    href="http://software.freshmeat.net/projects/proguard/"
-    target="other">project page</a> at FreshMeat offer the possibility to
-    subscribe to the announcements of new releases. They are the most
-    efficient way to stay abreast of the latest developments.
-    <p>
+    href="http://software.freecode.com/projects/proguard"
+    target="other">project page</a> at Freecode (Freshmeat) offer the
+    possibility to subscribe to the announcements of new releases. They are
+    the most efficient way to stay abreast of the latest developments.</li>
 
 <li>For anything that doesn't fall in the above categories, you can mail me
     directly at
@@ -84,7 +97,7 @@
 <em>or</em> at
 &lt;&nbsp;eric&nbsp;&#64;&nbsp;graphics&nbsp;.&nbsp;cornell&nbsp;.&nbsp;edu&nbsp;&gt; (please remove the spaces)
 </noscript>
-.
+.</li>
 </ul>
 <p>
 I can't promise a swift answer, or any answer at all, for that matter, but I
@@ -96,10 +109,11 @@
 do things my way, without the overhead and compromises associated with larger
 projects.
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 
 </body>

=== modified file 'docs/index.html'
--- docs/index.html	2009-10-09 16:17:49 +0000
+++ docs/index.html	2012-07-12 00:24:28 +0000
@@ -1,4 +1,4 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
@@ -11,18 +11,34 @@
 <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
 <title>ProGuard</title>
 </head>
+
+<script type="text/javascript" language="JavaScript">
+<!--
+var main="main.html";
+if (window.location.hash.length > 1)
+  main=window.location.hash.substr(1);
+var sections="sections.html";
+if (main.search(/manual\//) >= 0)
+  sections="manual/sections.html";
+
+document.write("<frameset rows=\"50,*\" framespacing=\"0\" frameborder=\"no\"><frame id=\"title\" name=\"title\" src=\"title.html\" scrolling=\"no\" marginwidth=\"0\" marginheight=\"0\" noresize /><frameset cols=\"120,*\" framespacing=\"0\" frameborder=\"no\"><frame id=\"sections\" name=\"sections\" src=\""+sections+"\" scrolling=\"no\" marginwidth=\"0\" marginheight=\"0\" noresize /><frame id=\"main\" name=\"main\" src=\""+main+"\" scrolling=\"auto\" marginwidth=\"10\" marginheight=\"10\" noresize /></frameset></frameset>");
+//-->
+</script>
+
+<noscript>
 <frameset
  rows="50,*"
  framespacing="0"
  frameborder="no">
 
 <frame
+ id="title"
  name="title"
  src="title.html"
  scrolling="no"
  marginwidth="0"
  marginheight="0"
- noresize>
+ noresize />
 
 <frameset
  cols="120,*"
@@ -30,42 +46,46 @@
  frameborder="no">
 
 <frame
+ id="sections"
  name="sections"
  src="sections.html"
  scrolling="no"
  marginwidth="0"
  marginheight="0"
- noresize>
+ noresize />
 
 <frame
+ id="main"
  name="main"
  src="main.html"
  scrolling="auto"
  marginwidth="10"
  marginheight="10"
- noresize>
+ noresize />
 
 </frameset>
 </frameset>
+</noscript>
 
 <noframes>
 <body>
 <p class="intro">
-<b>ProGuard</b> is a free Java class file shrinker, optimizer, and obfuscator.
-It can detect and remove unused classes, fields, methods, and attributes. It
-can then optimize bytecode and remove unused instructions. Finally, it can
-rename the remaining classes, fields, and methods using short meaningless
-names. The resulting jars are smaller and harder to reverse-engineer.
+<b>ProGuard</b> is a free Java class file shrinker, optimizer, obfuscator, and
+preverifier. It detects and removes unused classes, fields, methods, and
+attributes. It optimizes bytecode and removes unused instructions. It renames
+the remaining classes, fields, and methods using short meaningless names.
+Finally, it preverifies the processed code for Java 6 or for Java Micro
+Edition.
 </p>
 <p>
 Your browser doesn't support frames, but that's cool.
 <p>
 You can go straight to the <a href="main.html">main page</a>.
 
-<hr>
+<hr />
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </noframes>

=== modified file 'docs/license.html'
--- docs/license.html	2009-10-09 16:17:49 +0000
+++ docs/license.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard License</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -29,19 +40,21 @@
 exception</a> to the latter clause (in wording suggested by
 the <a href="http://www.gnu.org/copyleft/gpl-faq.html#GPLIncompatibleLibs"
 target="other">FSF</a>), for combinations with the following stand-alone
-applications: Apache Ant, Apache Maven, the Eclipse ProGuardDT GUI, the
-EclipseME JME IDE, the Sun NetBeans Java IDE, the Sun JME Wireless Toolkit,
-and the Javaground Tools.
+applications: Apache Ant, Apache Maven, the Google Android SDK, the Eclipse
+ProGuardDT GUI, the EclipseME JME IDE, the Oracle NetBeans Java IDE, the Oracle
+JME Wireless Toolkit, the Simple Build Tool for Scala, the NeoMAD Tools by
+Neomades, the Javaground Tools, and the Sanaware Tools.
 
 <p>
 The <b>ProGuard user documentation</b> represents an important part of this
 work. It may only be redistributed without changes, along with the unmodified
 version of the code.
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== removed file 'docs/luciadlogo.png'
Binary files docs/luciadlogo.png	2005-06-17 14:25:24 +0000 and docs/luciadlogo.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'docs/main.html'
--- docs/main.html	2009-10-09 16:17:49 +0000
+++ docs/main.html	2012-07-12 00:24:28 +0000
@@ -1,4 +1,4 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
@@ -8,6 +8,16 @@
 <meta name="keywords" content="java obfuscator, optimizer, shrinker, preverfier">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Main</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("index.html#"+window.location.pathname+window.location.hash);
+else {
+  if (window.top.location.hash!="")
+    window.top.location.hash="";
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -25,25 +35,21 @@
 <ul>
 
 <li>Creating more compact code, for smaller code archives, faster transfer
-    across networks, faster loading, and smaller memory footprints.
-
-<li>Making programs and libraries harder to reverse-engineer.
-
-<li>Listing dead code, so it can be removed from the source code.
+    across networks, faster loading, and smaller memory footprints.</li>
+
+<li>Making programs and libraries harder to reverse-engineer.</li>
+
+<li>Listing dead code, so it can be removed from the source code.</li>
 
 <li>Retargeting and preverifying existing class files for Java 6, to take full
-    advantage of Java 6's faster class loading.
+    advantage of Java 6's faster class loading.</li>
 
 </ul>
 <p>
 <b>ProGuard</b>'s main advantage compared to other Java obfuscators is
 probably its compact template-based configuration. A few intuitive command
-line options or a simple configuration file are usually sufficient. For
-instance, the following configuration option preserves all applets in a jar:
-<pre>
-    -keep public class * extends java.applet.Applet
-</pre>
-The user manual explains all available options and shows more examples of this
+line options or a simple configuration file are usually sufficient.
+The user manual explains all available options and shows examples of this
 powerful configuration style.
 <p>
 <b>ProGuard</b> is fast. It only takes seconds to process programs and
@@ -55,38 +61,42 @@
 Toolkit.
 <p>
 <p class="intro">
-Version 4.0 introduced preverification and more bytecode optimizations. Please
-report any problems, so they can be fixed soon.
+<b>ProGuard</b> now has a sibling optimizer and obfuscator for Android,
+<a href="http://www.saikoa.com/dexguard" target="_top"><b>DexGuard</b></a>. It
+is compatible with ProGuard, but it goes further. It directly targets Dalvik
+bytecode and it provides additional features like string encryption, class
+encryption, and hiding access to sensitive APIs.
 </p>
 The following sections provide more detailed information:
 <ul>
-<li><a href="main.html">Main</a>: this overview page.
+<li><a href="main.html">Main</a>: this overview page.</li>
 <li><a href="results.html">Results</a>: some results obtained with
-    <b>ProGuard</b>, including timings and memory usage.
-<li><a href="FAQ.html">FAQ</a>: answers to some Frequently Asked Questions.
+    <b>ProGuard</b>, including timings and memory usage.</li>
+<li><a href="FAQ.html">FAQ</a>: answers to some Frequently Asked Questions.</li>
 <li><a href="manual/index.html">Manual</a>: the complete <b>ProGuard</b> user
-    manual, with examples and troubleshooting tips.
+    manual, with examples and troubleshooting tips.</li>
 <li><a href="quality.html">Quality</a>: a discussion of the (excellent) quality
-    of <b>ProGuard</b>'s code.
-<li><a href="screenshots.html">Screenshots</a>: some impressions of what            <b>ProGuard</b> looks like.
+    of <b>ProGuard</b>'s code.</li>
+<li><a href="screenshots.html">Screenshots</a>: some impressions of what            <b>ProGuard</b> looks like.</li>
 <li><a href="testimonials.html">Testimonials</a>: what users think of
-    <b>ProGuard</b>.
+    <b>ProGuard</b>.</li>
 <li><a href="license.html">License</a>: <b>ProGuard</b> is free, under a GPL
-    license.
+    license.</li>
 <li><a href="downloads.html">Downloads</a>: download the <b>ProGuard</b>
-    package yourself.
+    package yourself.</li>
 <li><a href="feedback.html">Feedback</a>: tell me about your experiences, or
-    learn from others on our forums.
+    learn from others on our forums.</li>
 <li><a href="acknowledgements.html">Acknowledgements</a>: people who have been
-    helpful.
+    helpful.</li>
 <li><a href="alternatives.html">Alternatives</a>: other Java obfuscators,
-    optimizers, and shrinkers.
+    optimizers, and shrinkers.</li>
 </ul>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/ant.html'
--- docs/manual/ant.html	2009-10-09 16:17:49 +0000
+++ docs/manual/ant.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>Ant Task</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -89,11 +100,11 @@
 <p>
 
 Secondly, the use of <code>&lt;</code> and <code>&gt;</code> characters would
-upset the structure of the XML build file. Environment variables are now
-enclosed by an opening <code>${</code> and a closing <code>}</code>. This
-syntax also allows you to use Ant properties within the ProGuard
-configuration. Other occurrences of <code>&lt;</code> and <code>&gt;</code>
-have to be encoded as <code>&amp;lt;</code> and <code>&amp;gt;</code>.
+upset the structure of the XML build file. Environment variables can be
+specified with the usual Ant style <code>${...}</code>, instead of the ProGuard
+style <code>&lt;...&gt;</code>.  Other occurrences of <code>&lt;</code> and
+<code>&gt;</code> have to be encoded as <code>&amp;lt;</code> and
+<code>&amp;gt;</code> respectively.
 <p>
 
 <h3>3. XML configuration tags</h3>
@@ -107,8 +118,7 @@
 files in the <code>examples/ant</code> directory of the ProGuard distribution.
 <p>
 
-<a name="proguard">&nbsp;</a>
-<h2>Task Attributes and Nested Elements</h2>
+<h2><a name="proguard">Task Attributes and Nested Elements</a></h2>
 
 The <code><b>&lt;proguard&gt;</b></code> task and the
 <code><b>&lt;proguardconfiguration&gt;</b></code> task can have the following
@@ -120,13 +130,14 @@
 <dt><a name="configuration_attribute"><code><b>configuration</b></code></a>
     = "<i>filename</i>"</dt>
 <dd>Read and merge options from the given ProGuard-style configuration
-    file. Note: for reading XML-style configurations, use the <a
+    file. Note: for reading multiple configuration files or XML-style
+    configurations, use the <a
     href="#configuration_element"><code>configuration</code></a>
     <i>element</i>.</dd>
 
-<dt><a href="usage.html#dontskipnonpubliclibraryclasses"><code><b>skipnonpubliclibraryclasses</b></code></a>
+<dt><a href="usage.html#skipnonpubliclibraryclasses"><code><b>skipnonpubliclibraryclasses</b></code></a>
     = "<i>boolean</i>"
-    (default = true)</dt>
+    (default = false)</dt>
 <dd>Ignore non-public library classes.</dd>
 
 <dt><a href="usage.html#dontskipnonpubliclibraryclassmembers"><code><b>skipnonpubliclibraryclassmembers</b></code></a>
@@ -242,6 +253,11 @@
 <dd>Repackage all class files that are renamed into the single given
     package.</dd>
 
+<dt><a href="usage.html#keepparameternames"><code><b>keepparameternames</b></code></a>
+    = "<i>boolean</i>"
+   (default = false)</dt>
+<dd>Keep the parameter names and types of methods that are kept.</dd>
+
 <dt><a href="usage.html#renamesourcefileattribute"><code><b>renamesourcefileattribute</b></code></a>
     = "<i>string</i>"
     (default = none)</dt>
@@ -257,7 +273,7 @@
 <dt><a href="usage.html#microedition"><code><b>microedition</b></code></a>
     = "<i>boolean</i>"
     (default = false)</dt>
-<dd>Targets the processed class files at Java Micro Edition.</dd>
+<dd>Target the processed class files at Java Micro Edition.</dd>
 
 <dt><a href="usage.html#verbose"><code><b>verbose</b></code></a>
     = "<i>boolean</i>"
@@ -305,7 +321,7 @@
 <dt><a href="usage.html#outjars"><code><b>&lt;outjar</b></code></a>
     <a href="#classpath"><i>class_path</i></a>
     <code><b>/&gt;</b></code></dt>
-<dd>Specifies the name of the output jars (or wars, ears, zips, or
+<dd>Specifies the names of the output jars (or wars, ears, zips, or
     directories).</dd>
 
 <dt><a href="usage.html#libraryjars"><code><b>&lt;libraryjar</b></code></a>
@@ -436,23 +452,27 @@
     filter. <i>Only use this option if you know what you're doing!</i></dd>
 
 <dt><a name="configuration_element"><code><b>&lt;configuration refid = </b></code></a>"<i>ref_id</i>"
+    <code><b>/&gt;</b></code><br/>
+    <code><b>&lt;configuration file = </b></code>"<i>name</i>"
     <code><b>/&gt;</b></code></dt>
-<dd>Includes the configuration specified in the
+<dd>The first form includes the XML-style configuration specified in a
     <code>&lt;proguardconfiguration&gt;</code> task (or
-    <code>&lt;proguard&gt;</code> task) with the attribute <code>id</code> =
-    "<i>ref_id</i>". Note that only the nested elements of this configuration
-    are considered, not the attributes. Also note: for reading ProGuard-style
-    configuration files, use the <a
-    href="#configuration_attribute"><code>configuration</code></a>
-    <i>attribute</i>.</dd>
+    <code>&lt;proguard&gt;</code> task) with attribute <code>id</code> =
+    "<i>ref_id</i>". Only the nested elements of this configuration are
+    considered, not the attributes.
+    <p>
+    The second form includes the ProGuard-style configuration from the specified
+    file. The element is actually a <code>fileset</code> element and supports
+    all of its attributes and nested elements, including multiple files.
+    </dd>
 
 </dl>
 
-<a name="classpath">&nbsp;</a>
-<h2>Class Path Attributes and Nested Elements</h2>
+<h2><a name="classpath">Class Path Attributes and Nested Elements</a></h2>
 
-The jar tags are path tags, so they can have any of the path attributes (or
-nested elements). The most common attributes are:
+The jar elements are <code>path</code> elements, so they can have any of the
+standard <code>path</code> attributes and nested elements. The most common
+attributes are:
 
 <dl>
 
@@ -472,7 +492,7 @@
 
 </dl>
 
-In addition, the jar tags can have ProGuard-style filter attributes:
+In addition, the jar elements can have ProGuard-style filter attributes:
 
 <dl>
 
@@ -499,8 +519,7 @@
 
 </dl>
 
-<a name="keepmodifier">&nbsp;</a>
-<h2>Keep Modifier Attributes</h2>
+<h2><a name="keepmodifier">Keep Modifier Attributes</a></h2>
 
 The keep tags can have the following <i>modifier</i> attributes:
 
@@ -526,8 +545,7 @@
 
 </dl>
 
-<a name="classspecification">&nbsp;</a>
-<h2>Class Specification Attributes and Nested Elements</h2>
+<h2><a name="classspecification">Class Specification Attributes and Nested Elements</a></h2>
 
 The keep tags can have the following <i>class_specification</i> attributes and
 <i>class_member_specifications</i> nested elements:
@@ -538,6 +556,10 @@
 <dd>The optional access modifiers of the class. Any space-separated list of
     "public", "final", and "abstract", with optional negators "!".</dd>
 
+<dt><code><b>annotation</b></code> = "<i>annotation_name</i>"</dt>
+<dd>The optional fully qualified name of an annotation of the class, with
+    optional wildcards.</dd>
+
 <dt><code><b>type</b></code> = "<i>type</i>"</dt>
 <dd>The optional type of the class: one of "class", "interface", or
     "!interface".</dd>
@@ -546,6 +568,10 @@
 <dd>The optional fully qualified name of the class, with optional
     wildcards.</dd>
 
+<dt><code><b>extendsannotation</b></code> = "<i>annotation_name</i>"</dt>
+<dd>The optional fully qualified name of an annotation of the the class that
+    the specified classes must extend, with optional wildcards.</dd>
+
 <dt><code><b>extends</b></code> = "<i>class_name</i>"</dt>
 <dd>The optional fully qualified name of the class the specified classes
     must extend, with optional wildcards.</dd>
@@ -571,8 +597,7 @@
 
 </dl>
 
-<a name="classmemberspecification">&nbsp;</a>
-<h2>Class Member Specification Attributes</h2>
+<h2><a name="classmemberspecification">Class Member Specification Attributes</a></h2>
 
 The class member tags can have the following <i>class_member_specification</i>
 attributes:
@@ -584,6 +609,10 @@
     "public", "protected", "private", "static", etc., with optional negators
     "!".</dd>
 
+<dt><code><b>annotation</b></code> = "<i>annotation_name</i>"</dt>
+<dd>The optional fully qualified name of an annotation of the class member,
+    with optional wildcards.</dd>
+
 <dt><code><b>type</b></code> = "<i>type</i>"</dt>
 <dd>The optional fully qualified type of the class member, with optional
     wildcards. Not applicable for constructors, but required for methods for
@@ -601,10 +630,11 @@
 
 </dl>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/examples.html'
--- docs/manual/examples.html	2009-10-09 16:17:49 +0000
+++ docs/manual/examples.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Examples</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -12,76 +23,83 @@
 
 Some typical useful configurations:
 <ol>
-<li><a href="#application">A typical application</a>
-<li><a href="#applet">A typical applet</a>
-<li><a href="#midlet">A typical midlet</a>
-<li><a href="#jcapplet">A typical Java Card applet</a>
-<li><a href="#xlet">A typical xlet</a>
-<li><a href="#androidapplication">A typical Android application</a>
-<li><a href="#library">A typical library</a>
-<li><a href="#applications">All possible applications in the input jars</a>
-<li><a href="#applets">All possible applets in the input jars</a>
-<li><a href="#midlets">All possible midlets in the input jars</a>
-<li><a href="#jcapplets">All possible Java Card applets in the input jars</a>
-<li><a href="#xlets">All possible xlets in the input jars</a>
-<li><a href="#androidapplications">All possible Android applications in the input jars</a>
-<li><a href="#servlets">All possible servlets in the input jars</a>
-<li><a href="#native">Processing native methods</a>
-<li><a href="#callback">Processing callback methods</a>
-<li><a href="#enumerations">Processing enumeration classes</a>
-<li><a href="#serializable">Processing serializable classes</a>
-<li><a href="#beans">Processing bean classes</a>
-<li><a href="#annotations">Processing annotations</a>
-<li><a href="#database">Processing database drivers</a>
-<li><a href="#componentui">Processing ComponentUI classes</a>
-<li><a href="#rmi">Processing RMI code</a>
-<li><a href="#resourcefiles">Processing resource files</a>
-<li><a href="#stacktrace">Producing useful obfuscated stack traces</a>
-<li><a href="#repackaging">Obfuscating package names</a>
-<li><a href="#restructuring">Restructuring the output archives</a>
-<li><a href="#filtering">Filtering the input and the output</a>
-<li><a href="#multiple">Processing multiple applications at once</a>
-<li><a href="#incremental">Incremental obfuscation</a>
-<li><a href="#microedition">Preverifying class files for Java Micro Edition</a>
-<li><a href="#upgrade">Upgrading class files to Java 6</a>
-<li><a href="#deadcode">Finding dead code</a>
-<li><a href="#structure">Printing out the internal structure of class files</a>
-<li><a href="#annotated">Using annotations to configure ProGuard</a>
+<li><a href="#application">A typical application</a></li>
+<li><a href="#applet">A typical applet</a></li>
+<li><a href="#midlet">A typical midlet</a></li>
+<li><a href="#jcapplet">A typical Java Card applet</a></li>
+<li><a href="#xlet">A typical xlet</a></li>
+<li><a href="#androidactivity">A simple Android activity</a></li>
+<li><a href="#androidapplication">A complete Android application</a></li>
+<li><a href="#library">A typical library</a></li>
+<li><a href="#applications">All possible applications in the input jars</a></li>
+<li><a href="#applets">All possible applets in the input jars</a></li>
+<li><a href="#midlets">All possible midlets in the input jars</a></li>
+<li><a href="#jcapplets">All possible Java Card applets in the input jars</a></li>
+<li><a href="#xlets">All possible xlets in the input jars</a></li>
+<li><a href="#servlets">All possible servlets in the input jars</a></li>
+<li><a href="#scala">Scala applications with the Scala runtime</a></li>
+<li><a href="#native">Processing native methods</a></li>
+<li><a href="#callback">Processing callback methods</a></li>
+<li><a href="#enumerations">Processing enumeration classes</a></li>
+<li><a href="#serializable">Processing serializable classes</a></li>
+<li><a href="#beans">Processing bean classes</a></li>
+<li><a href="#annotations">Processing annotations</a></li>
+<li><a href="#database">Processing database drivers</a></li>
+<li><a href="#componentui">Processing ComponentUI classes</a></li>
+<li><a href="#rmi">Processing RMI code</a></li>
+<li><a href="#injection">Processing resource injection</a></li>
+<li><a href="#resourcefiles">Processing resource files</a></li>
+<li><a href="#manifestfiles">Processing manifest files</a></li>
+<li><a href="#stacktrace">Producing useful obfuscated stack traces</a></li>
+<li><a href="#repackaging">Obfuscating package names</a></li>
+<li><a href="#restructuring">Restructuring the output archives</a></li>
+<li><a href="#filtering">Filtering the input and the output</a></li>
+<li><a href="#multiple">Processing multiple applications at once</a></li>
+<li><a href="#incremental">Incremental obfuscation</a></li>
+<li><a href="#microedition">Preverifying class files for Java Micro Edition</a></li>
+<li><a href="#upgrade">Upgrading class files to Java 6</a></li>
+<li><a href="#deadcode">Finding dead code</a></li>
+<li><a href="#structure">Printing out the internal structure of class files</a></li>
+<li><a href="#annotated">Using annotations to configure ProGuard</a></li>
 </ol>
 
 You can find some sample configuration files in the <code>examples</code>
 directory of the ProGuard distribution.
 
-<a name="application">&nbsp;</a>
-<h3>A typical application</h3>
-To shrink, optimize, and obfuscate the ProGuard application itself, one would
-typically create a configuration file <code>proguard.pro</code> and then type:
+<h3><a name="application">A typical application</a></h3>
+
+To shrink, optimize, and obfuscate a simple Java application, you typically
+create a configuration file like <code>myconfig.pro</code>, which can be used
+with
 <pre>
-java -jar proguard.jar @proguard.pro
+bin/proguard @myconfig.pro
 </pre>
 <p>
-The configuration file would contain the following options:
+The configuration file specifies the input, the output, and the entry points
+of the application:
 <pre>
--injars       proguard.jar
--outjars      proguard_out.jar
+-injars       myapplication.jar
+-outjars      myapplication_out.jar
 -libraryjars  &lt;java.home&gt;/lib/rt.jar
--printmapping proguard.map
+-printmapping myapplication.map
 
--keep public class proguard.ProGuard {
+-keep public class mypackage.MyMain {
     public static void main(java.lang.String[]);
 }
 </pre>
 <p>
-Note the use of the <code>&lt;java.home&gt;</code> system property; it is
-replaced automatically.
-<p>
-Also note that all type names are fully specified:
-<code>proguard.ProGuard</code> and <code>java.lang.String[]</code>.
-<p>
+Note the use of the <code>&lt;java.home&gt;</code> system property. ProGuard
+automatically replaces it when parsing the file.
+<p>
+The <a href="usage.html#keep"><code>-keep</code></a> option specifies the
+entry point of the application that has to be preserved.
 The access modifiers <code>public</code> and <code>static</code> are not
 really required in this case, since we know a priori that the specified class
 and method have the proper access flags. It just looks more familiar this way.
 <p>
+Note that all type names are fully specified:
+<code>mypackage.MyMain</code> and <code>java.lang.String[]</code>.
+<p>
 We're writing out an obfuscation mapping file with <a
 href="usage.html#printmapping"><code>-printmapping</code></a>, for
 de-obfuscating any stack traces later on, or for incremental obfuscation of
@@ -103,11 +121,10 @@
 <a href="#enumerations">enumerations</a>, <a href="#serializable">serializable
 classes</a>, <a href="#beans">bean classes</a>, <a
 href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
-files</a>. For processing 'simple' applications like ProGuard, that is not
-required.
-
-<a name="applet">&nbsp;</a>
-<h3>A typical applet</h3>
+files</a>.
+
+<h3><a name="applet">A typical applet</a></h3>
+
 These options shrink, optimize, and obfuscate the applet
 <code>mypackage.MyApplet</code>:
 <pre>
@@ -129,15 +146,15 @@
 href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
 files</a>.
 
-<a name="midlet">&nbsp;</a>
-<h3>A typical midlet</h3>
+<h3><a name="midlet">A typical midlet</a></h3>
+
 These options shrink, optimize, obfuscate, and preverify the midlet
 <code>mypackage.MyMIDlet</code>:
 <pre>
 -injars      in.jar
 -outjars     out.jar
--libraryjars /usr/local/java/wtk2.1/lib/midpapi20.jar
--libraryjars /usr/local/java/wtk2.1/lib/cldcapi11.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/midpapi20.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/cldcapi11.jar
 -overloadaggressively
 -repackageclasses ''
 -allowaccessmodification
@@ -172,8 +189,8 @@
 Note that you will still have to adapt the midlet jar size in the
 corresponding jad file; ProGuard doesn't do that for you.
 
-<a name="jcapplet">&nbsp;</a>
-<h3>A typical Java Card applet</h3>
+<h3><a name="jcapplet">A typical Java Card applet</a></h3>
+
 These options shrink, optimize, and obfuscate the Java Card applet
 <code>mypackage.MyApplet</code>:
 <pre>
@@ -192,8 +209,8 @@
 it now targets the Java Card run-time environment. This environment doesn't
 have java.lang.Class, so we're telling ProGuard not to worry about it.
 
-<a name="xlet">&nbsp;</a>
-<h3>A typical xlet</h3>
+<h3><a name="xlet">A typical xlet</a></h3>
+
 These options shrink, optimize, and obfuscate the xlet
 <code>mypackage.MyXlet</code>:
 <pre>
@@ -212,15 +229,16 @@
 The configuration is very similar to the configuration for midlets, except that
 it now targets the CDC run-time environment with the Java TV API.
 
-<a name="androidapplication">&nbsp;</a>
-<h3>A typical Android application</h3>
-These options shrink, optimize, and obfuscate the simple Android application
-based on a single activity <code>mypackage.MyActivity</code>:
+<h3><a name="androidactivity">A simple Android activity</a></h3>
+
+These options shrink, optimize, and obfuscate the single Android
+activity <code>mypackage.MyActivity</code>:
 <pre>
--injars      in.jar
--outjars     out.jar
--libraryjars /usr/local/java/android-1.5_r1/platforms/android-1.5/android.jar
--overloadaggressively
+-injars      bin/classes
+-outjars     bin/classes-processed.jar
+-libraryjars /usr/local/java/android-sdk/platforms/android-9/android.jar
+
+-dontpreverify
 -repackageclasses ''
 -allowaccessmodification
 -optimizations !code/simplification/arithmetic
@@ -228,27 +246,157 @@
 -keep public class mypackage.MyActivity
 </pre>
 <p>
-The configuration is very similar to the configuration for midlets, except that
-it now targets the Android run-time environment.
+We're targeting the Android run-time and keeping the activity as an entry
+point.
+<p>
+Preverification is irrelevant for the dex compiler and the Dalvik VM, so we
+can switch it off with the
+<a href="usage.html#dontpreverify"><code>-dontpreverify</code></a> option.
 <p>
 The <a href="usage.html#optimizations"><code>-optimizations</code></a> option
 disables some arithmetic simplifications that Dalvik 1.0 and 1.5 can't handle.
-<p>
-If applicable, you should add options for processing <a href="#native">native
-methods</a>, <a href="#callback">callback methods</a>, and <a
-href="#resourcefiles">resource files</a>.
-
-<a name="library">&nbsp;</a>
-<h3>A typical library</h3>
+Note that the Dalvik VM also can't
+handle <a href="usage.html#overloadaggressively">aggressive overloading</a>
+(of static fields).
+<p>
+If applicable, you should add options for processing <a href="#native">native
+methods</a>, <a href="#callback">callback methods</a>,
+<a href="#enumerations">enumerations</a>,
+<a href="#annotations">annotations</a>, and
+<a href="#resourcefiles">resource files</a>.
+
+<h3><a name="androidapplication">A complete Android application</a></h3>
+
+These options shrink, optimize, and obfuscate all public activities, services,
+broadcast receivers, and content providers from the compiled classes and
+external libraries:
+<pre>
+-injars      bin/classes
+-injars      libs
+-outjars     bin/classes-processed.jar
+-libraryjars /usr/local/java/android-sdk/platforms/android-9/android.jar
+
+-dontpreverify
+-repackageclasses ''
+-allowaccessmodification
+-optimizations !code/simplification/arithmetic
+-keepattributes *Annotation*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+
+-keep public class * extends android.view.View {
+    public &lt;init&gt;(android.content.Context);
+    public &lt;init&gt;(android.content.Context, android.util.AttributeSet);
+    public &lt;init&gt;(android.content.Context, android.util.AttributeSet, int);
+    public void set*(...);
+}
+
+-keepclasseswithmembers class * {
+    public &lt;init&gt;(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public &lt;init&gt;(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.content.Context {
+   public void *(android.view.View);
+   public void *(android.view.MenuItem);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+    static android.os.Parcelable$Creator CREATOR;
+}
+
+-keepclassmembers class **.R$* {
+    public static &lt;fields&gt;;
+}
+</pre>
+<p>
+Most importantly, we're keeping all fundamental classes that may be referenced
+by the <code>AndroidManifest.xml</code> file of the application. If your
+manifest file contains other classes and methods, you may have to specify
+those as well.
+<p>
+We're keeping annotations, since they might be used by custom
+<code>RemoteViews</code>.
+<p>
+We're keeping any custom <code>View</code> extensions and other classes with
+typical constructors, since they might be referenced from XML layout files.
+<p>
+We're also keeping possible <code>onClick</code> handlers in
+custom <code>Context</code> extensions, since they might be referenced from
+XML layout files.
+<p>
+We're also keeping the required static fields in <code>Parcelable</code>
+implementations, since they are accessed by introspection.
+<p>
+Finally, we're keeping the static fields of referenced inner classes of
+auto-generated <code>R</code> classes, just in case your code is accessing
+those fields by introspection. Note that the compiler already inlines
+primitive fields, so ProGuard can generally remove all these classes entirely
+anyway (because the classes are not referenced and therefore not required).
+<p>
+If you're using additional Google APIs, you'll have to specify
+those as well, for instance:
+<pre>
+-libraryjars /usr/local/android-sdk/add-ons/google_apis-7_r01/libs/maps.jar
+</pre>
+<p>
+If you're using Google's optional License Verification Library, you can
+obfuscate its code along with your own code. You do have to preserve
+its <code>ILicensingService</code> interface for the library to work:
+<pre>
+-keep public interface com.android.vending.licensing.ILicensingService
+</pre>
+<p>
+If you're using the Android Compatibility library, you should add the
+following line, to let ProGuard know it's ok that the library references some
+classes that are not available in all versions of the API:
+<pre>
+-dontwarn android.support.**
+</pre>
+<p>
+If applicable, you should add options for processing <a href="#native">native
+methods</a>, <a href="#callback">callback methods</a>,
+<a href="#enumerations">enumerations</a>,
+and <a href="#resourcefiles">resource files</a>. You may also want to add
+options for producing <a href="#stacktrace">useful stack traces</a>. You can
+find a complete sample configuration in <code>examples/android.pro</code> in
+the ProGuard distribution.
+<p>
+The Ant and Eclipse build processes of the Android SDK already integrate
+ProGuard by default, with all the proper settings. You only need to enable
+ProGuard (for release builds) by uncommenting the line
+"<code>proguard.config=.....</code>" in the file
+<code>project.properties</code> (created or updated by Android SDK revision 17
+or higher). In case of problems, you may want to check if the configuration
+files that are listed on this line (<code>proguard-project.txt</code>,...)
+contain the necessary settings for your application. Note that the build
+processes are already setting the necessary program jars, library jars, and
+output jars for you.
+<p>
+For more information, you can consult the official <a target="other"
+href="http://developer.android.com/guide/developing/tools/proguard.html">Developer
+Guide</a> in the Android SDK.
+
+<h3><a name="library">A typical library</a></h3>
+
 These options shrink, optimize, and obfuscate an entire library, keeping all
 public and protected classes and class members, native method names, and
-serialization code:
+serialization code. The processed version of the library can then still be
+used as such, for developing code based on its public API.
 <pre>
 -injars       in.jar
 -outjars      out.jar
 -libraryjars  &lt;java.home&gt;/lib/rt.jar
 -printmapping out.map
 
+-keepparameternames
 -renamesourcefileattribute SourceFile
 -keepattributes Exceptions,InnerClasses,Signature,Deprecated,
                 SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
@@ -273,6 +421,7 @@
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
     java.lang.Object writeReplace();
@@ -289,12 +438,12 @@
 href="usage.html#keepclassmembernames"><code>-keepclassmembernames</code></a>
 option for the <code>class$</code> methods is not strictly necessary. These
 methods are inserted by the <code>javac</code> compiler and the
-<code>jikes</code> compiler respectively, to implement the <code>.class</code>
-construct. ProGuard will automatically detect them and deal with them, even
-when their names have been obfuscated. However, older versions of ProGuard and
-other obfuscators may rely on the original method names. It may therefore be
-helpful to preserve them, in case these other obfuscators are ever used for
-further obfuscation of the library.
+<code>jikes</code> compiler respectively, in JDK 1.2 and older, to implement
+the <code>.class</code> construct. ProGuard will automatically detect them and
+deal with them, even when their names have been obfuscated. However, other
+obfuscators may rely on the original method names. It may therefore be helpful
+to preserve them, in case these other obfuscators are ever used for further
+obfuscation of the library.
 <p>
 The "Exceptions" attribute has to be preserved, so the compiler knows which
 exceptions methods may throw.
@@ -307,6 +456,11 @@
 The "Signature" attribute is required to be able to access generic types when
 compiling in JDK 5.0 and higher.
 <p>
+The <a href="usage.html#keepparameternames"><code>-keepparameternames</code></a>
+option keeps the parameter names in the "LocalVariableTable" and
+"LocalVariableTypeTable" attributes of public library methods. Some IDEs can
+present these names to the developers who use the library.
+<p>
 Finally, we're keeping the "Deprecated" attribute and the attributes for
 producing <a href="#stacktrace">useful stack traces</a>.
 <p>
@@ -316,8 +470,8 @@
 href="#annotations">annotations</a>, which are all discussed in their
 respective examples.
 
-<a name="applications">&nbsp;</a>
-<h3>All possible applications in the input jars</h3>
+<h3><a name="applications">All possible applications in the input jars</a></h3>
+
 These options shrink, optimize, and obfuscate all public applications in
 <code>in.jar</code>:
 <pre>
@@ -347,8 +501,8 @@
 href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
 files</a>.
 
-<a name="applets">&nbsp;</a>
-<h3>All possible applets in the input jars</h3>
+<h3><a name="applets">All possible applets in the input jars</a></h3>
+
 These options shrink, optimize, and obfuscate all public applets in
 <code>in.jar</code>:
 <pre>
@@ -372,15 +526,15 @@
 href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
 files</a>.
 
-<a name="midlets">&nbsp;</a>
-<h3>All possible midlets in the input jars</h3>
+<h3><a name="midlets">All possible midlets in the input jars</a></h3>
+
 These options shrink, optimize, obfuscate, and preverify all public midlets in
 <code>in.jar</code>:
 <pre>
 -injars      in.jar
 -outjars     out.jar
--libraryjars /usr/local/java/wtk2.1/lib/midpapi20.jar
--libraryjars /usr/local/java/wtk2.1/lib/cldcapi11.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/midpapi20.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/cldcapi11.jar
 -overloadaggressively
 -repackageclasses ''
 -allowaccessmodification
@@ -412,8 +566,8 @@
 Note that you will still have to adapt the midlet jar size in the
 corresponding jad file; ProGuard doesn't do that for you.
 
-<a name="jcapplets">&nbsp;</a>
-<h3>All possible Java Card applets in the input jars</h3>
+<h3><a name="jcapplets">All possible Java Card applets in the input jars</a></h3>
+
 These options shrink, optimize, and obfuscate all public Java Card applets in
 <code>in.jar</code>:
 <pre>
@@ -435,8 +589,8 @@
 The <a href="usage.html#printseeds"><code>-printseeds</code></a> option prints
 out which applets exactly will be preserved.
 
-<a name="xlets">&nbsp;</a>
-<h3>All possible xlets in the input jars</h3>
+<h3><a name="xlets">All possible xlets in the input jars</a></h3>
+
 These options shrink, optimize, and obfuscate all public xlets in
 <code>in.jar</code>:
 <pre>
@@ -458,38 +612,8 @@
 The <a href="usage.html#printseeds"><code>-printseeds</code></a> option prints
 out which xlets exactly will be preserved.
 
-<a name="androidapplications">&nbsp;</a>
-<h3>All possible Android applications in the input jars</h3>
-These options shrink, optimize, and obfuscate all public activities, services,
-broadcast receivers, and content providers in <code>in.jar</code>:
-<pre>
--injars      in.jar
--outjars     out.jar
--libraryjars /usr/local/java/android-1.5_r1/platforms/android-1.5/android.jar
--overloadaggressively
--repackageclasses ''
--allowaccessmodification
--optimizations !code/simplification/arithmetic
--printseeds
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
-</pre>
-<p>
-We're keeping all classes that extend the base classes that may be referenced
-by the <code>AndroidManifest.xml</code> file of the application.
-<p>
-The <a href="usage.html#printseeds"><code>-printseeds</code></a> option prints
-out which implementations exactly will be preserved.
-<p>
-If applicable, you should add options for processing <a href="#native">native
-methods</a>, <a href="#callback">callback methods</a>, and <a
-href="#resourcefiles">resource files</a>.
-
-<a name="servlets">&nbsp;</a>
-<h3>All possible servlets in the input jars</h3>
+<h3><a name="servlets">All possible servlets in the input jars</a></h3>
+
 These options shrink, optimize, and obfuscate all public servlets in
 <code>in.jar</code>:
 <pre>
@@ -521,8 +645,77 @@
 href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
 files</a>.
 
-<a name="native">&nbsp;</a>
-<h3>Processing native methods</h3>
+<h3><a name="scala">Scala applications with the Scala runtime</a></h3>
+
+These options shrink, optimize, and obfuscate all public Scala applications in
+<code>in.jar</code>:
+<pre>
+-injars      in.jar
+-injars      /usr/local/java/scala-2.9.1/lib/scala-library.jar
+-outjars     out.jar
+-libraryjars &lt;java.home&gt;/lib/rt.jar
+
+-dontwarn scala.**
+
+-keepclasseswithmembers public class * {
+    public static void main(java.lang.String[]);
+}
+
+-keep class * implements org.xml.sax.EntityResolver
+
+-keepclassmembers class * {
+    ** MODULE$;
+}
+
+-keepclassmembernames class scala.concurrent.forkjoin.ForkJoinPool {
+    long eventCount;
+    int  workerCounts;
+    int  runControl;
+    scala.concurrent.forkjoin.ForkJoinPool$WaitQueueNode syncStack;
+    scala.concurrent.forkjoin.ForkJoinPool$WaitQueueNode spareStack;
+}
+
+-keepclassmembernames class scala.concurrent.forkjoin.ForkJoinWorkerThread {
+    int base;
+    int sp;
+    int runState;
+}
+
+-keepclassmembernames class scala.concurrent.forkjoin.ForkJoinTask {
+    int status;
+}
+
+-keepclassmembernames class scala.concurrent.forkjoin.LinkedTransferQueue {
+    scala.concurrent.forkjoin.LinkedTransferQueue$PaddedAtomicReference head;
+    scala.concurrent.forkjoin.LinkedTransferQueue$PaddedAtomicReference tail;
+    scala.concurrent.forkjoin.LinkedTransferQueue$PaddedAtomicReference cleanMe;
+}
+</pre>
+<p>
+The configuration is essentially the same as
+for <a href="#applications">processing applications</a>, because Scala is
+compiled to ordinary Java bytecode. However, the example processes the Scala
+runtime library as well. The processed jar can be an order of magnitude
+smaller and a few times faster than the original code (for the Scala code
+examples, for instance).
+<p>
+The <a href="usage.html#dontwarn"><code>-dontwarn</code></a> option tells
+ProGuard not to complain about some artefacts in the Scala runtime, the way it
+is compiled by the <code>scalac</code> compiler (at least in Scala 2.9.1 and
+older). Note that this option should always be used with care.
+<p>
+The additional <a href="usage.html#keepoverview"><code>-keep</code></a>
+options make sure that some classes and some fields that are accessed by means
+of introspection are not removed or renamed.
+<p>
+If applicable, you should add options for processing <a href="#native">native
+methods</a>, <a href="#callback">callback methods</a>, <a
+href="#enumerations">enumerations</a>, <a href="#serializable">serializable
+classes</a>, <a href="#beans">bean classes</a>, <a
+href="#annotations">annotations</a>, and <a href="#resourcefiles">resource
+files</a>.
+<h3><a name="native">Processing native methods</a></h3>
+
 If your application, applet, servlet, library, etc., contains native methods,
 you'll want to preserve their names and their classes' names, so they can
 still be linked to the native library. The following additional option will
@@ -543,8 +736,8 @@
 entry points, which you'll have to specify explicitly.  <a
 href="callback">Callback methods</a> are discussed below as a typical example.
 
-<a name="callback">&nbsp;</a>
-<h3>Processing callback methods</h3>
+<h3><a name="callback">Processing callback methods</a></h3>
+
 If your application, applet, servlet, library, etc., contains callback
 methods, which are called from external code (native code, scripts,...),
 you'll want to preserve them, and probably their classes too. They are just
@@ -559,8 +752,8 @@
 <p>
 This will preserve the given class and method from being removed or renamed.
 
-<a name="enumerations">&nbsp;</a>
-<h3>Processing enumeration classes</h3>
+<h3><a name="enumerations">Processing enumeration classes</a></h3>
+
 If your application, applet, servlet, library, etc., contains enumeration
 classes, you'll have to preserve some special methods. Enumerations were
 introduced in Java 5. The java compiler translates enumerations into classes
@@ -576,8 +769,8 @@
 }
 </pre>
 
-<a name="serializable">&nbsp;</a>
-<h3>Processing serializable classes</h3>
+<h3><a name="serializable">Processing serializable classes</a></h3>
+
 More complex applications, applets, servlets, libraries, etc., may contain
 classes that are serialized. Depending on the way in which they are used, they
 may require special attention:
@@ -589,6 +782,7 @@
 
 <pre>
 -keepclassmembers class * implements java.io.Serializable {
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
     java.lang.Object writeReplace();
@@ -602,8 +796,7 @@
     option makes sure that any serialization methods are kept. By using this
     option instead of the basic <code>-keep</code> option, we're not
     forcing preservation of <i>all</i> serializable classes, just preservation
-    of the listed members of classes that are actually used.
-    <p>
+    of the listed members of classes that are actually used.</li>
 
 <li>Sometimes, the serialized data are stored, and read back later into newer
     versions of the serializable classes. One then has to take care the classes
@@ -617,7 +810,7 @@
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
-    static final java.io.ObjectStreamField[] serialPersistentFields;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
     !static !transient &lt;fields&gt;;
     private void writeObject(java.io.ObjectOutputStream);
     private void readObject(java.io.ObjectInputStream);
@@ -632,7 +825,7 @@
     The <code>&lt;fields&gt;</code> line preserves all non-static,
     non-transient fields, with their original names. The introspection of the
     serialization process and the de-serialization process will then find
-    consistent names.
+    consistent names.</li>
 
 <li>Occasionally, the serialized data have to remain compatible, but the
     classes involved lack <code>serialVersionUID</code> fields. I imagine the
@@ -651,7 +844,7 @@
 
 -keepclassmembers class * implements java.io.Serializable {
     static final long serialVersionUID;
-    static final java.io.ObjectStreamField[] serialPersistentFields;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
     !static !transient &lt;fields&gt;;
     !private &lt;fields&gt;;
     !private &lt;methods&gt;;
@@ -668,7 +861,7 @@
     interfaces of the serializable classes (using something like "<code>-keep
     interface MyInterface</code>"), since these names are also used when
     computing the UID. A fast but sub-optimal alternative would be simply
-    keeping all interfaces with "<code>-keep interface *</code>".
+    keeping all interfaces with "<code>-keep interface *</code>".</li>
 
 </ul>
 <p>
@@ -679,8 +872,8 @@
 ever be serialized. Knowing your application and tuning the configuration
 often produces more compact results.
 
-<a name="beans">&nbsp;</a>
-<h3>Processing bean classes</h3>
+<h3><a name="beans">Processing bean classes</a></h3>
+
 If your application, applet, servlet, library, etc., makes extensive use of
 introspection on bean classes to find bean editor classes, or getter and
 setter methods, then configuration may become painful. There's not much else
@@ -715,8 +908,8 @@
 array or non-array). The methods with the '<code>int</code>' arguments matches
 properties that are lists.
 
-<a name="annotations">&nbsp;</a>
-<h3>Processing annotations</h3>
+<h3><a name="annotations">Processing annotations</a></h3>
+
 If your application, applet, servlet, library, etc., uses annotations, you may
 want to preserve them in the processed output. Annotations are represented by
 attributes that have no direct effect on the execution of the code. However,
@@ -744,8 +937,8 @@
 -keepattributes EnclosingMethod
 </pre>
 
-<a name="database">&nbsp;</a>
-<h3>Processing database drivers</h3>
+<h3><a name="database">Processing database drivers</a></h3>
+
 Database drivers are implementations of the <code>Driver</code> interface.
 Since they are often created dynamically, you may want to preserve any
 implementations that you are processing as entry points:
@@ -758,8 +951,8 @@
 instantiating a driver in your code (without necessarily implementing any
 drivers yourself).
 
-<a name="componentui">&nbsp;</a>
-<h3>Processing ComponentUI classes</h3>
+<h3><a name="componentui">Processing ComponentUI classes</a></h3>
+
 Swing UI look and feels are implemented as extensions of the
 <code>ComponentUI</code> class. For some reason, these have to contain a
 static method <code>createUI</code>, which the Swing API invokes using
@@ -773,8 +966,8 @@
 <p>
 This option also keeps the classes themselves.
 
-<a name="rmi">&nbsp;</a>
-<h3>Processing RMI code</h3>
+<h3><a name="rmi">Processing RMI code</a></h3>
+
 Reportedly, the easiest way to handle RMI code is to process the code with
 ProGuard first and then invoke the <code>rmic</code> tool. If that is not
 possible, you may want to try something like this:
@@ -798,8 +991,29 @@
 handling code performs introspection to check whether the method signatures
 are compatible.
 
-<a name="resourcefiles">&nbsp;</a>
-<h3>Processing resource files</h3>
+<h3><a name="injection">Processing resource injection</a></h3>
+
+If your application is using JEE-style resource injection, the application
+container will automatically assign instances of resource classes to fields and
+methods that are annotated with <code>@Resource</code>. The container applies
+introspection, even accessing private class members directly. It typically
+constructs a resource name based on the type name and the class member name.
+We then have to avoid that such class members are removed or renamed:
+<pre>
+-keepclassmembers class * {
+    @javax.annotation.Resource *;
+}
+</pre>
+<p>
+The Spring framework has another similar annotation <code>@Autowired</code>:
+<pre>
+-keepclassmembers class * {
+    @org.springframework.beans.factory.annotation.Autowired *;
+}
+</pre>
+
+<h3><a name="resourcefiles">Processing resource files</a></h3>
+
 If your application, applet, servlet, library, etc., contains resource files,
 it may be necessary to adapt their names and/or their contents when the
 application is obfuscated. The following two options can achieve this
@@ -818,8 +1032,31 @@
 replaces these names by the obfuscated names (if any). You'll probably want to
 adapt the filters to suit your application.
 
-<a name="stacktrace">&nbsp;</a>
-<h3>Producing useful obfuscated stack traces</h3>
+<h3><a name="manifestfiles">Processing manifest files</a></h3>
+
+As illustrated in the previous section, manifest files can be treated like
+ordinary resource files. ProGuard can adapt obfuscated class names in the
+files, but it won't make any other changes. If you want anything else, you
+should apply an external tool. For instance, if a manifest file contains
+signing information, you should sign the jar again after it has been
+processed.
+<p>
+If you're merging several input jars into a single output jar, you'll have to 
+pick one, typically by specifying <a href="usage.html#filters">filters</a>:
+<pre>
+-injars  in1.jar
+-injars  in2.jar(!META-INF/MANIFEST.MF)
+-injars  in3.jar(!META-INF/MANIFEST.MF)
+-outjars out.jar
+</pre>
+<p>
+The filters will let ProGuard copy the manifest file from the first jar and
+ignore any manifest files in the second and third input jars. Note that
+ProGuard will leave the order of the files in the jars unchanged; manifest
+files are not necessarily put first.
+
+<h3><a name="stacktrace">Producing useful obfuscated stack traces</a></h3>
+
 These options let obfuscated applications or libraries produce stack traces
 that can still be deciphered later on:
 <pre>
@@ -844,8 +1081,8 @@
 <code>out.map</code>. The information can then be used by the <a
 href="retrace/index.html">ReTrace</a> tool to restore the original stack trace.
 
-<a name="repackaging">&nbsp;</a>
-<h3>Obfuscating package names</h3>
+<h3><a name="repackaging">Obfuscating package names</a></h3>
+
 Package names can be obfuscated in various ways, with increasing levels of
 obfuscation and compactness. For example, consider the following classes:
 <pre>
@@ -951,8 +1188,8 @@
 all code. Notably, you may have to take into account that your application may
 contain <a href="#resourcefiles">resource files</a> that have to be adapted.
 
-<a name="restructuring">&nbsp;</a>
-<h3>Restructuring the output archives</h3>
+<h3><a name="restructuring">Restructuring the output archives</a></h3>
+
 In simple applications, all output classes and resources files are merged into
 a single jar. For example:
 <pre>
@@ -1022,12 +1259,12 @@
 always tries to package output archives in a sensible way, reconstructing the
 input entries as much as required.
 
-<a name="filtering">&nbsp;</a>
-<h3>Filtering the input and the output</h3>
+<h3><a name="filtering">Filtering the input and the output</a></h3>
 
-If you want even greater control, you can add filters to the input and the
-output, filtering out zips, ears, wars, jars, and/or ordinary files. For
-example, if you want to disregard certain files from an input jar:
+If you want even greater control, you can add
+<a href="usage.html#filters">filters</a> to the input and the output,
+filtering out zips, ears, wars, jars, and/or ordinary files. For example, if
+you want to disregard certain files from an input jar:
 <pre>
 -injars  in.jar(!images/**)
 -outjars out.jar
@@ -1080,10 +1317,10 @@
 <code>resources_out.jar</code>.
 <p>
 Again, the filtering can be arbitrarily complex, especially when combined with
-the grouping of input and output.
-
-<a name="multiple">&nbsp;</a>
-<h3>Processing multiple applications at once</h3>
+grouping input and output.
+
+<h3><a name="multiple">Processing multiple applications at once</a></h3>
+
 You can process several dependent or independent applications (or applets,
 midlets,...) in one go, in order to save time and effort. ProGuard's input and
 output handling offers various ways to keep the output nicely structured.
@@ -1100,10 +1337,10 @@
 </pre>
 <p>
 After processing, the directory <code>processed_applications</code> will
-contain the processed application jars, with their original names.
-
-<a name="incremental">&nbsp;</a>
-<h3>Incremental obfuscation</h3>
+contain processed versions of application jars, with their original names.
+
+<h3><a name="incremental">Incremental obfuscation</a></h3>
+
 After having <a href="#application">processed an application</a>, e.g.
 ProGuard itself, you can still incrementally add other pieces of code that
 depend on it, e.g. the ProGuard GUI:
@@ -1149,18 +1386,18 @@
 }
 </pre>
 
-<a name="microedition">&nbsp;</a>
-<h3>Preverifying class files for Java Micro Edition</h3>
+<h3><a name="microedition">Preverifying class files for Java Micro Edition</a></h3>
+
 Even if you're not interested in shrinking, optimizing, and obfuscating your
 midlets, as shown in the <a href="#midlets">midlets example</a>, you can still
 use ProGuard to preverify the class files for Java Micro Edition. ProGuard
-produces slightly more compact results compared to the traditional external
+produces slightly more compact results than the traditional external
 preverifier.
 <pre>
 -injars      in.jar
 -outjars     out.jar
--libraryjars /usr/local/java/wtk2.1/lib/midpapi20.jar
--libraryjars /usr/local/java/wtk2.1/lib/cldcapi11.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/midpapi20.jar
+-libraryjars /usr/local/java/wtk2.5.2/lib/cldcapi11.jar
 
 -dontshrink
 -dontoptimize
@@ -1175,8 +1412,8 @@
 that we don't need any <code>-keep</code> options to specify entry points; all
 class files are simply preverified.
 
-<a name="upgrade">&nbsp;</a>
-<h3>Upgrading class files to Java 6</h3>
+<h3><a name="upgrade">Upgrading class files to Java 6</a></h3>
+
 The following options upgrade class files to Java 6, by updating their
 internal version numbers and preverifying them. The class files can then be
 loaded more efficiently by the Java 6 Virtual Machine.
@@ -1198,8 +1435,8 @@
 any <code>-keep</code> options to specify entry points; all class files are
 simply updated and preverified.
 
-<a name="deadcode">&nbsp;</a>
-<h3>Finding dead code</h3>
+<h3><a name="deadcode">Finding dead code</a></h3>
+
 These options list unused classes, fields, and methods in the application
 <code>mypackage.MyApplication</code>:
 <pre>
@@ -1232,8 +1469,8 @@
 }
 </pre>
 
-<a name="structure">&nbsp;</a>
-<h3>Printing out the internal structure of class files</h3>
+<h3><a name="structure">Printing out the internal structure of class files</a></h3>
+
 These options print out the internal structure of all class files in the input
 jar:
 <pre>
@@ -1250,8 +1487,7 @@
 Note how we don't need to specify the Java run-time jar, because we're not
 processing the input jar at all.
 
-<a name="annotated">&nbsp;</a>
-<h3>Using annotations to configure ProGuard</h3>
+<h3><a name="annotated">Using annotations to configure ProGuard</a></h3>
 
 The traditional ProGuard configuration allows to keep a clean separation
 between the code and the configuration for shrinking, optimization, and
@@ -1291,12 +1527,12 @@
 <p>
 The directory <code>examples/annotations</code> contains more examples that
 illustrate some of the possibilities.
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/gui.html'
--- docs/manual/gui.html	2009-10-09 16:17:49 +0000
+++ docs/manual/gui.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard GUI</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -15,10 +26,12 @@
 <p class="code">
 <code><b>java -jar proguardgui.jar</b> [-nosplash] </code>[<i>configuration_file</i>]
 </p>
-The GUI will pop up in a window. With the <code>-nosplash</code> option, you
-can switch off the short opening animation. If you have specified a ProGuard
-configuration file, it will be loaded. The GUI works like a wizard. You can
-edit the configuration and execute ProGuard through a few tabs:
+Alternatively, the <code>bin</code> directory contains some short Linux and
+Windows scripts containing this command. The GUI will pop up in a window. With
+the <code>-nosplash</code> option, you can switch off the short opening
+animation. If you have specified a ProGuard configuration file, it will be
+loaded. The GUI works like a wizard. You can edit the configuration and
+execute ProGuard through a few tabs:
 <p>
 
 <table cellspacing="5" cellpadding="5">
@@ -57,8 +70,7 @@
 href="introduction.html">Introduction</a> of this manual.
 <p>
 
-<a name="proguard">&nbsp;</a>
-<h2>The ProGuard Tab</h2>
+<h2><a name="proguard">The ProGuard Tab</a></h2>
 
 The <i>ProGuard</i> tab presents a welcome message and one important button at
 the bottom:
@@ -75,8 +87,7 @@
 creating a new configuration from scratch.
 <p>
 
-<a name="inputoutput">&nbsp;</a>
-<h2>The Input/Output Tab</h2>
+<h2><a name="inputoutput">The Input/Output Tab</a></h2>
 
 The <i>Input/Output</i> tab contains two lists, respectively to specify the
 program jars (or wars, ears, zips, or directories), and the library jars (or
@@ -88,12 +99,12 @@
     entries specify the destinations to which the processed results will be
     written. They are preceded by arrows, to distinguish them from input
     entries. The results of each consecutive list of input entries will be
-    written to the subsequent consecutive list of output entries.
+    written to the subsequent consecutive list of output entries.</li>
 
 <li>The library jars are not copied to the output jars; they contain class
     files that are used by class files in the program jars and that are
     necessary for correct processing. This list typically at least contains the
-    targeted Java runtime jar.
+    targeted Java runtime jar.</li>
 </ul>
 <p>
 
@@ -145,16 +156,15 @@
 
 Corresponding configuration options:
 <ul type="none">
-<li>-<a href="usage.html#injars">injars</a>
-<li>-<a href="usage.html#outjars">outjars</a>
-<li>-<a href="usage.html#libraryjars">libraryjars</a>
-<li><a href="usage.html#classpath"><i>class_path</i></a>
-<li><a href="usage.html#filters"><i>filters</i></a>
+<li>-<a href="usage.html#injars">injars</a></li>
+<li>-<a href="usage.html#outjars">outjars</a></li>
+<li>-<a href="usage.html#libraryjars">libraryjars</a></li>
+<li><a href="usage.html#classpath"><i>class_path</i></a></li>
+<li><a href="usage.html#filters"><i>filters</i></a></li>
 </ul>
 <p>
 
-<a name="shrinking">&nbsp;</a>
-<h2>The Shrinking Tab</h2>
+<h2><a name="shrinking">The Shrinking Tab</a></h2>
 
 The <i>Shrinking</i> tab presents a number of options that affect the
 shrinking step. The basic options are followed by a few lists of classes and
@@ -224,41 +234,41 @@
 <ul>
 <li>The <b>Comments</b> text field allows to add optional comments to this
     entry. The comments will identify the entry in the list and they will
-    appear as comments in the configuration file.
+    appear as comments in the configuration file.</li>
 
 <li>The <b>Keep</b> selection allows to specify whether you want to protect
     the specified classes and their specified class members, or just the
     specified class members from the specified classes, or the specified
     classes and the specified class members, if the class members are present.
     Note that class members will only be protected if they are explicitly
-    specified, even if only by means of a wildcard.
+    specified, even if only by means of a wildcard.</li>
 
 <li>The <b>Allow</b> selection allows to specify whether you want to allow the
     the specified classes and their specified class members to be shrunk,
-    optimized and/or obfuscated.
+    optimized and/or obfuscated.</li>
 
 <li>The <b>Access</b> selections allows to specify constraints on the class or
-    classes, based on their access modifiers.
+    classes, based on their access modifiers.</li>
 
 <li>The <b>Annotation</b> text field takes the fully-qualified name of an
     annotation that is required for matching classes. The annotation name can
     contain wildcards. This is an advanced option for defining <i>keep</i>
-    annotations.
+    annotations.</li>
 
 <li>The <b>Class</b> text field takes the fully-qualified name of the class or
-    classes. The class name can contain wildcards.
+    classes. The class name can contain wildcards.</li>
 
 <li>The <b>Annotation</b> text field takes the fully-qualified name of an
     annotation that is required for the class or interface that the above
     class must extend. The annotation name can contain wildcards. This is an
-    advanced option for defining <i>keep</i> annotations.
+    advanced option for defining <i>keep</i> annotations.</li>
 
 <li>The <b>Extends/implements class</b> text field takes the fully-qualified
-    name of the class or interface that the above classes must extend.
+    name of the class or interface that the above classes must extend.</li>
 
 <li>The <b>Class members</b> list allows to specify a list of fields and
     methods to keep. It can be edited by means of a list of buttons on the
-    right-hand side.
+    right-hand side.</li>
 </ul>
 <p>
 
@@ -270,18 +280,18 @@
 
 <ul>
 <li>The <b>Access</b> selections allows to specify constraints on the field or
-    fields, based on their access modifiers.
+    fields, based on their access modifiers.</li>
 
 <li>The <b>Annotation</b> text field takes the fully-qualified name of an
     annotation that is required for matching fields. The annotation name can
     contain wildcards. This is an advanced option for defining <i>keep</i>
-    annotations.
+    annotations.</li>
 
 <li>The <b>Return type</b> text field takes the fully-qualified type of the
-    field or fields. The type can contain wildcards.
+    field or fields. The type can contain wildcards.</li>
 
 <li>The <b>Name</b> text field takes the name of the field or fields. The field
-    name can contain wildcards.
+    name can contain wildcards.</li>
 </ul>
 <p>
 
@@ -293,36 +303,35 @@
 
 <ul>
 <li>The <b>Access</b> selections allows to specify constraints on the method or
-    methods, based on their access modifiers.
+    methods, based on their access modifiers.</li>
 
 <li>The <b>Annotation</b> text field takes the fully-qualified name of an
     annotation that is required for matching methods. The annotation name can
     contain wildcards. This is an advanced option for defining <i>keep</i>
-    annotations.
+    annotations.</li>
 
-<li>The <b>Return type</b> text field takes the fully-qualified type of the         method or methods. The type can contain wildcards.
+<li>The <b>Return type</b> text field takes the fully-qualified type of the         method or methods. The type can contain wildcards.</li>
 
 <li>The <b>Name</b> text field takes the name of the method or methods. The
-    method name can contain wildcards.
+    method name can contain wildcards.</li>
 
 <li>The <b>Arguments</b> text field takes the comma-separated list of
     fully-qualified method arguments. Each of these arguments can contain
-    wildcards.
+    wildcards.</li>
 </ul>
 <p>
 
 Corresponding configuration options:
 <ul type="none">
-<li>-<a href="usage.html#dontshrink">dontshrink</a>
-<li>-<a href="usage.html#printusage">printusage</a>
-<li>-<a href="usage.html#keep">keep</a>
-<li>-<a href="usage.html#keepclassmembers">keepclassmembers</a>
-<li>-<a href="usage.html#keepclasseswithmembers">keepclasseswithmembers</a>
+<li>-<a href="usage.html#dontshrink">dontshrink</a></li>
+<li>-<a href="usage.html#printusage">printusage</a></li>
+<li>-<a href="usage.html#keep">keep</a></li>
+<li>-<a href="usage.html#keepclassmembers">keepclassmembers</a></li>
+<li>-<a href="usage.html#keepclasseswithmembers">keepclasseswithmembers</a></li>
 </ul>
 <p>
 
-<a name="obfuscation">&nbsp;</a>
-<h2>The Obfuscation Tab</h2>
+<h2><a name="obfuscation">The Obfuscation Tab</a></h2>
 
 The <i>Obfuscation</i> tab presents a number of options that affect the
 obfuscation step. The basic options are followed by a few lists of classes and
@@ -336,32 +345,32 @@
 
 Corresponding configuration options:
 <ul type="none">
-<li>-<a href="usage.html#dontobfuscate">dontobfuscate</a>
-<li>-<a href="usage.html#printmapping">printmapping</a>
-<li>-<a href="usage.html#applymapping">applymapping</a>
-<li>-<a href="usage.html#obfuscationdictionary">obfuscationdictionary</a>
-<li>-<a href="usage.html#classobfuscationdictionary">classobfuscationdictionary</a>
-<li>-<a href="usage.html#packageobfuscationdictionary">packageobfuscationdictionary</a>
-<li>-<a href="usage.html#overloadaggressively">overloadaggressively</a>
-<li>-<a href="usage.html#useuniqueclassmembernames">useuniqueclassmembernames</a>
-<li>-<a href="usage.html#dontusemixedcaseclassnames">dontusemixedcaseclassnames</a>
-<li>-<a href="usage.html#keeppackagenames">keeppackagenames</a>
-<li>-<a href="usage.html#flattenpackagehierarchy">flattenpackagehierarchy</a>
-<li>-<a href="usage.html#repackageclasses">repackageclasses</a>
-<li>-<a href="usage.html#keepattributes">keepattributes</a>
-<li>-<a href="usage.html#renamesourcefileattribute">renamesourcefileattribute</a>
-<li>-<a href="usage.html#adaptclassstrings">adaptclassstrings</a>
-<li>-<a href="usage.html#adaptresourcefilenames">adaptresourcefilenames</a>
-<li>-<a href="usage.html#adaptresourcefilecontents">adaptresourcefilecontents</a>
-<li>-<a href="usage.html#keepnames">keepnames</a>
-<li>-<a href="usage.html#keepclassmembernames">keepclassmembernames</a>
-<li>-<a href="usage.html#keepclasseswithmembernames">keepclasseswithmembernames</a>
-<li><a href="usage.html#classspecification"><i>class_specification</i></a>
+<li>-<a href="usage.html#dontobfuscate">dontobfuscate</a></li>
+<li>-<a href="usage.html#printmapping">printmapping</a></li>
+<li>-<a href="usage.html#applymapping">applymapping</a></li>
+<li>-<a href="usage.html#obfuscationdictionary">obfuscationdictionary</a></li>
+<li>-<a href="usage.html#classobfuscationdictionary">classobfuscationdictionary</a></li>
+<li>-<a href="usage.html#packageobfuscationdictionary">packageobfuscationdictionary</a></li>
+<li>-<a href="usage.html#overloadaggressively">overloadaggressively</a></li>
+<li>-<a href="usage.html#useuniqueclassmembernames">useuniqueclassmembernames</a></li>
+<li>-<a href="usage.html#dontusemixedcaseclassnames">dontusemixedcaseclassnames</a></li>
+<li>-<a href="usage.html#keeppackagenames">keeppackagenames</a></li>
+<li>-<a href="usage.html#flattenpackagehierarchy">flattenpackagehierarchy</a></li>
+<li>-<a href="usage.html#repackageclasses">repackageclasses</a></li>
+<li>-<a href="usage.html#keepattributes">keepattributes</a></li>
+<li>-<a href="usage.html#keepparameternames">keepparameternames</a></li>
+<li>-<a href="usage.html#renamesourcefileattribute">renamesourcefileattribute</a></li>
+<li>-<a href="usage.html#adaptclassstrings">adaptclassstrings</a></li>
+<li>-<a href="usage.html#adaptresourcefilenames">adaptresourcefilenames</a></li>
+<li>-<a href="usage.html#adaptresourcefilecontents">adaptresourcefilecontents</a></li>
+<li>-<a href="usage.html#keepnames">keepnames</a></li>
+<li>-<a href="usage.html#keepclassmembernames">keepclassmembernames</a></li>
+<li>-<a href="usage.html#keepclasseswithmembernames">keepclasseswithmembernames</a></li>
+<li><a href="usage.html#classspecification"><i>class_specification</i></a></li>
 </ul>
 <p>
 
-<a name="optimization">&nbsp;</a>
-<h2>The Optimization Tab</h2>
+<h2><a name="optimization">The Optimization Tab</a></h2>
 
 The <i>Optimization</i> tab presents a number of options that affect the
 optimization step. The basic options are followed by a few lists of class
@@ -375,18 +384,17 @@
 
 Corresponding configuration options:
 <ul type="none">
-<li>-<a href="usage.html#dontoptimize">dontoptimize</a>
-<li>-<a href="usage.html#optimizations">optimizations</a>
-<li>-<a href="usage.html#optimizationpasses">optimizationpasses</a>
-<li>-<a href="usage.html#allowaccessmodification">allowaccessmodification</a>
-<li>-<a href="usage.html#mergeinterfacesaggressively">mergeinterfacesaggressively</a>
-<li>-<a href="usage.html#assumenosideeffects">assumenosideeffects</a>
-<li><a href="usage.html#classspecification"><i>class_specification</i></a>
+<li>-<a href="usage.html#dontoptimize">dontoptimize</a></li>
+<li>-<a href="usage.html#optimizations">optimizations</a></li>
+<li>-<a href="usage.html#optimizationpasses">optimizationpasses</a></li>
+<li>-<a href="usage.html#allowaccessmodification">allowaccessmodification</a></li>
+<li>-<a href="usage.html#mergeinterfacesaggressively">mergeinterfacesaggressively</a></li>
+<li>-<a href="usage.html#assumenosideeffects">assumenosideeffects</a></li>
+<li><a href="usage.html#classspecification"><i>class_specification</i></a></li>
 </ul>
 <p>
 
-<a name="information">&nbsp;</a>
-<h2>The Information Tab</h2>
+<h2><a name="information">The Information Tab</a></h2>
 
 The <i>Information</i> tab presents a number of options for preverification
 and targeting, and for the information that ProGuard returns when processing
@@ -396,26 +404,26 @@
 
 Corresponding configuration options:
 <ul type="none">
-<li>-<a href="usage.html#dontpreverify">dontpreverify</a>
-<li>-<a href="usage.html#microedition">microedition</a>
-<li>-<a href="usage.html#target">target</a>
-<li>-<a href="usage.html#verbose">verbose</a>
-<li>-<a href="usage.html#dontnote">dontnote</a>
-<li>-<a href="usage.html#dontwarn">dontwarn</a>
-<li>-<a href="usage.html#ignorewarnings">ignorewarnings</a>
-<li>-<a href="usage.html#dontskipnonpubliclibraryclasses">dontskipnonpubliclibraryclasses</a>
-<li>-<a href="usage.html#dontskipnonpubliclibraryclassmembers">dontskipnonpubliclibraryclassmembers</a>
-<li>-<a href="usage.html#keepdirectories">keepdirectories</a>
-<li>-<a href="usage.html#forceprocessing">forceprocessing</a>
-<li>-<a href="usage.html#printseeds">printseeds</a>
-<li>-<a href="usage.html#printconfiguration">printconfiguration</a>
-<li>-<a href="usage.html#dump">dump</a>
-<li>-<a href="usage.html#whyareyoukeeping">whyareyoukeeping</a>
+<li>-<a href="usage.html#dontpreverify">dontpreverify</a></li>
+<li>-<a href="usage.html#microedition">microedition</a></li>
+<li>-<a href="usage.html#target">target</a></li>
+<li>-<a href="usage.html#verbose">verbose</a></li>
+<li>-<a href="usage.html#dontnote">dontnote</a></li>
+<li>-<a href="usage.html#dontwarn">dontwarn</a></li>
+<li>-<a href="usage.html#ignorewarnings">ignorewarnings</a></li>
+<li>-<a href="usage.html#skipnonpubliclibraryclasses">skipnonpubliclibraryclasses</a></li>
+<li>-<a href="usage.html#dontskipnonpubliclibraryclasses">dontskipnonpubliclibraryclasses</a></li>
+<li>-<a href="usage.html#dontskipnonpubliclibraryclassmembers">dontskipnonpubliclibraryclassmembers</a></li>
+<li>-<a href="usage.html#keepdirectories">keepdirectories</a></li>
+<li>-<a href="usage.html#forceprocessing">forceprocessing</a></li>
+<li>-<a href="usage.html#printseeds">printseeds</a></li>
+<li>-<a href="usage.html#printconfiguration">printconfiguration</a></li>
+<li>-<a href="usage.html#dump">dump</a></li>
+<li>-<a href="usage.html#whyareyoukeeping">whyareyoukeeping</a></li>
 </ul>
 <p>
 
-<a name="process">&nbsp;</a>
-<h2>The Process Tab</h2>
+<h2><a name="process">The Process Tab</a></h2>
 
 The <i>Process</i> tab has an output console for displaying the configuration
 and the messages while processing. There are three important buttons at the
@@ -433,8 +441,7 @@
 </table>
 <p>
 
-<a name="retrace">&nbsp;</a>
-<h2>The ReTrace Tab</h2>
+<h2><a name="retrace">The ReTrace Tab</a></h2>
 
 The <i>ReTrace</i> tab has a panel with a few settings, an input text area for
 the obfuscated stack trace, and an output console to view the de-obfuscated
@@ -442,16 +449,16 @@
 
 <ul>
 <li>The <b>Verbose</b> check box in the settings panel allows to toggle between
-    normal mode and verbose mode.
+    normal mode and verbose mode.</li>
 
 <li>The <b>Mapping file</b> text field takes the name of the required mapping
     file that ProGuard wrote while processing the original code. The file name
     can be entered manually or by means of the <b>Browse...</b> button that
-    opens a file chooser.
+    opens a file chooser.</li>
 
 <li>The <b>Obfuscated stack trace</b> text area allows to enter the stack
     trace, typically by copying and pasting it from elsewhere. Alternatively,
-    it can be loaded from a file by means of the load button below.
+    it can be loaded from a file by means of the load button below.</li>
 </ul>
 
 There are two buttons at the bottom:
@@ -463,12 +470,12 @@
 <tr><td class="button">ReTrace!</td>
     <td>executes ReTrace with the current settings.</td></tr>
 </table>
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/index.html'
--- docs/manual/index.html	2009-10-09 16:17:49 +0000
+++ docs/manual/index.html	2012-07-12 00:24:28 +0000
@@ -1,39 +1,51 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Manual</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
 <h2>ProGuard</h2>
 
 <ol>
-<li><a href="introduction.html">Introduction</a>
-<li><a href="usage.html">Usage</a>
-<li><a href="limitations.html">Limitations</a>
-<li><a href="examples.html">Examples</a>
-<li><a href="troubleshooting.html">Troubleshooting</a>
-<li><a href="refcard.html">Reference Card</a>
-<li><a href="gui.html">Graphical User Interface</a>
-<li><a href="ant.html">Ant Task</a>
-<li><a href="wtk.html">JME Wireless Toolkit Integration</a>
+<li><a href="introduction.html">Introduction</a></li>
+<li><a href="usage.html">Usage</a></li>
+<li><a href="limitations.html">Limitations</a></li>
+<li><a href="examples.html">Examples</a></li>
+<li><a href="troubleshooting.html">Troubleshooting</a></li>
+<li><a href="refcard.html">Reference Card</a></li>
+<li><a href="gui.html">Graphical User Interface</a></li>
+<li><a href="ant.html">Ant Task</a></li>
+<li><a href="wtk.html">JME Wireless Toolkit Integration</a></li>
 </ol>
 
 <h2>ReTrace</h2>
 
 <ol>
-<li><a href="retrace/introduction.html">Introduction</a>
-<li><a href="retrace/usage.html">Usage</a>
-<li><a href="retrace/examples.html">Examples</a>
+<li><a href="retrace/introduction.html">Introduction</a></li>
+<li><a href="retrace/usage.html">Usage</a></li>
+<li><a href="retrace/examples.html">Examples</a></li>
 </ol>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/introduction.html'
--- docs/manual/introduction.html	2009-10-09 16:17:49 +0000
+++ docs/manual/introduction.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Introduction</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -17,8 +28,7 @@
 fields, and methods using short meaningless names. These first steps make the
 code base smaller, more efficient, and harder to reverse-engineer. The final
 preverification step adds preverification information to the classes, which is
-required for Java Micro Edition or which improves the start-up time for Java
-6.
+required for Java Micro Edition and for Java 6 and higher.
 <p>
 Each of these steps is optional. For instance, ProGuard can also be used to
 just list dead code in an application, or to preverify class files for
@@ -62,13 +72,13 @@
 </table>
 <p>
 
-ProGuard typically reads the <b>input jars</b> (or wars, ears, zips, or
-directories). It then shrinks, optimizes, obfuscates, and preverifies them.
-Optionally, multiple optimization passes can be performed, each typically
-followed by another shrinking step. ProGuard writes the processed results to
-one or more <b>output jars</b> (or wars, ears, zips, or directories). The
-input may contain resource files, whose names and contents can optionally be
-updated to reflect the obfuscated class names.
+ProGuard first reads the <b>input jars</b> (or wars, ears, zips, or
+directories). It then subsequently shrinks, optimizes, obfuscates, and
+preverifies them. You can optionally let ProGuard perform multiple
+optimization passes. ProGuard writes the processed results to one or
+more <b>output jars</b> (or wars, ears, zips, or directories). The input may
+contain resource files, whose names and contents can optionally be updated to
+reflect the obfuscated class names.
 <p>
 ProGuard requires the <b>library jars</b> (or wars, ears, zips, or
 directories) of the input jars to be specified. These are essentially the
@@ -76,63 +86,69 @@
 reconstruct the class dependencies that are necessary for proper processing.
 The library jars themselves always remain unchanged. You should still put them
 in the class path of your final application.
-<p>
+
+<h3>Entry points</h3>
+
 In order to determine which code has to be preserved and which code can be
 discarded or obfuscated, you have to specify one or more <i>entry points</i> to
 your code. These entry points are typically classes with main methods, applets,
-midlets, etc.
+midlets, activities, etc.
 <ul>
 <li>In the <b>shrinking step</b>, ProGuard starts from these seeds and
     recursively determines which classes and class members are used. All other
-    classes and class members are discarded.
+    classes and class members are discarded.</li>
 
 <li>In the <b>optimization step</b>, ProGuard further optimizes the code.
     Among other optimizations, classes and methods that are not entry points
     can be made private, static, or final, unused parameters can be removed,
-    and some methods may be inlined.
+    and some methods may be inlined.</li>
 
 <li>In the <b>obfuscation step</b>, ProGuard renames classes and class members
     that are not entry points. In this entire process, keeping the entry
-    points ensures that they can still be accessed by their original names.
+    points ensures that they can still be accessed by their original names.</li>
 
 <li>The <b>preverification step</b> is the only step that doesn't have to know
-    the entry points.
+    the entry points.</li>
 </ul>
 <p>
 The <a href="usage.html">Usage section</a> of this manual describes the
 necessary <a href="usage.html#keepoptions"><code>-keep</code> options</a> and
 the <a href="examples.html">Examples section</a> provides plenty of examples.
 
-<h3>Introspection</h3>
+<h3>Reflection</h3>
 
-Introspection presents particular problems for any automatic processing of
-code. In ProGuard, classes or class members in your code that are created or
-invoked dynamically (that is, by name) have to be specified as entry points
-too. For example, <code>Class.forName()</code> constructs may refer to any
-class at run-time. It is generally impossible to foresee which classes have to
-be preserved (with their original names), since the class names might be read
-from a configuration file, for instance. You therefore have to specify them in
-your ProGuard configuration, with the same simple <code>-keep</code> options.
+Reflection and introspection present particular problems for any automatic
+processing of code. In ProGuard, classes or class members in your code that
+are created or invoked dynamically (that is, by name) have to be specified as
+entry points too. For example, <code>Class.forName()</code> constructs may
+refer to any class at run-time. It is generally impossible to compute which
+classes have to be preserved (with their original names), since the class
+names might be read from a configuration file, for instance. You therefore
+have to specify them in your ProGuard configuration, with the same
+simple <code>-keep</code> options.
 <p>
 However, ProGuard will already detect and handle the following cases for you:
 
 <ul>
-<li><code>Class.forName("SomeClass")</code>
-<li><code>SomeClass.class</code>
-<li><code>SomeClass.class.getField("someField")</code>
-<li><code>SomeClass.class.getDeclaredField("someField")</code>
-<li><code>SomeClass.class.getMethod("someMethod", new Class[] {})</code>
-<li><code>SomeClass.class.getMethod("someMethod", new Class[] { A.class })</code>
-<li><code>SomeClass.class.getMethod("someMethod", new Class[] { A.class, B.class })</code>
-<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] {})</code>
-<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] { A.class })</code>
-<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] { A.class, B.class })</code>
+<li><code>Class.forName("SomeClass")</code></li>
+<li><code>SomeClass.class</code></li>
+<li><code>SomeClass.class.getField("someField")</code></li>
+<li><code>SomeClass.class.getDeclaredField("someField")</code></li>
+<li><code>SomeClass.class.getMethod("someMethod", new Class[] {})</code></li>
+<li><code>SomeClass.class.getMethod("someMethod", new Class[] { A.class })</code></li>
+<li><code>SomeClass.class.getMethod("someMethod", new Class[] { A.class, B.class })</code></li>
+<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] {})</code></li>
+<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] { A.class })</code></li>
+<li><code>SomeClass.class.getDeclaredMethod("someMethod", new Class[] { A.class, B.class })</code></li>
+<li><code>AtomicIntegerFieldUpdater.newUpdater(SomeClass.class, "someField")</code></li>
+<li><code>AtomicLongFieldUpdater.newUpdater(SomeClass.class, "someField")</code></li>
+<li><code>AtomicReferenceFieldUpdater.newUpdater(SomeClass.class, SomeType.class, "someField")</code></li>
 </ul>
 
 The names of the classes and class members may of course be different, but the
 constructs should be literally the same for ProGuard to recognize them. The
 referenced classes and class members are preserved in the shrinking phase, and
-the string arguments are properly replaced in the obfuscation phase.
+the string arguments are properly updated in the obfuscation phase.
 <p>
 Furthermore, ProGuard will offer some suggestions if keeping some classes or
 class members appears necessary. For example, ProGuard will note constructs
@@ -142,15 +158,15 @@
 configuration accordingly.
 <p>
 For proper results, you should at least be somewhat familiar with the code
-that you are processing. Obfuscating code that performs a lot of introspection
+that you are processing. Obfuscating code that performs a lot of reflection
 may require trial and error, especially without the necessary information
 about the internals of the code.
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/limitations.html'
--- docs/manual/limitations.html	2009-10-09 16:17:49 +0000
+++ docs/manual/limitations.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Limitations</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -13,16 +24,7 @@
 When using ProGuard, you should be aware of a few technical issues, all of
 which are easily avoided or resolved:
 <p>
-<ul>
-
-<li>For efficiency, ProGuard always ignores any <b>private or package visible
-    library classes</b> while reading library jars. If any of them are
-    extended by public library classes, and then extended again by input
-    classes, ProGuard will complain it can't find them. In that case, you'll
-    have to use the <code>-dontskipnonpubliclibraryclasses</code> option, and
-    maybe even the <code>-dontskipnonpubliclibraryclassmembers</code> option.
-    The graphical user interface has checkboxes for these settings.
-    <p>
+<ul class="spacious">
 
 <li>For best results, ProGuard's optimization algorithms assume that the
     processed code never <b>intentionally throws NullPointerExceptions</b> or
@@ -33,32 +35,35 @@
     <code>myObject</code> might be null, causing a NullPointerException. In
     some way this is a good thing: optimized code may throw fewer exceptions.
     Should this entire assumption be false, you'll have to switch off
-    optimization using the <code>-dontoptimize</code> option.
-    <p>
+    optimization using the <code>-dontoptimize</code> option.</li>
+
+<li>ProGuard's optimization algorithms currently also assume that the
+    processed code never creates <b>busy-waiting loops</b> without at least
+    testing on a volatile field. Again, it may remove such loops. Should this
+    assumption be false, you'll have to switch off optimization using
+    the <code>-dontoptimize</code> option.</li>
 
 <li>If an input jar and a library jar contain classes in the <b>same
     package</b>, the obfuscated output jar may contain class names that
     overlap with class names in the library jar. This is most likely if the
     library jar has been obfuscated before, as it will then probably contain
     classes named 'a', 'b', etc. Packages should therefore never be split
-    across input jars and library jars.
-    <p>
+    across input jars and library jars.</li>
 
-<li>When obfuscating, ProGuard will write out class files named
-    "<code>a.class</code>", "<code>b.class</code>", etc. If there is a large
-    numbers of classes in the same package, it may also write out
-    <b>"<code>aux.class</code>"</b>. Windows doesn't allow creating files with
-    this reserved name (among a few other names), so it's generally better to
-    write the output to a jar, in order to avoid such problems.
-    <p>
+<li>When obfuscating, ProGuard writes out class files named
+    "<code>a.class</code>", "<code>b.class</code>", etc. If a package contains
+    a large number of classes, ProGuard may also write out
+    <b>"<code>aux.class</code>"</b>. Inconveniently, Windows refuses to create
+    files with this reserved name (among a few other names). It's generally
+    better to write the output to a jar, in order to avoid such problems.</li>
 
 </ul>
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/optimizations.html'
--- docs/manual/optimizations.html	2009-10-09 16:17:49 +0000
+++ docs/manual/optimizations.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>Optimizations</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -124,6 +135,9 @@
     <code><b>code/simplification/branch</b></code></dt>
 <dd>Performs peephole optimizations for branch instructions.</dd>
 
+<dt><code><b>code/simplification/string</b></code></dt>
+<dd>Performs peephole optimizations for constant strings.</dd>
+
 <dt><div>(<i>best used with</i> <code>code/removal/advanced</code>)</div>
     <code><b>code/simplification/advanced</b></code></dt>
 <dd>Simplifies code based on control flow analysis and data flow
@@ -142,17 +156,17 @@
 <dd>Removes unused variables from the local variable frame.</dd>
 
 <dt><code><b>code/removal/exception</b></code></dt>
-<dd>Removes exceptions with empty catch blocks.</dd>
+<dd>Removes exceptions with empty try blocks.</dd>
 
 <dt><code><b>code/allocation/variable</b></code></dt>
 <dd>Optimizes variable allocation on the local variable frame.</dd>
 </dl>
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/refcard.html'
--- docs/manual/refcard.html	2009-10-09 16:17:49 +0000
+++ docs/manual/refcard.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="style.css">
 <title>ProGuard Reference Card</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -52,7 +63,7 @@
 <tr>
 <td valign="top"><a href="usage.html#outjars"><code><b>-outjars</b></code></a>
                  <a href="usage.html#classpath"><i>class_path</i></a></td>
-<td>Specifies the name of the output jars (or wars, ears, zips, or
+<td>Specifies the names of the output jars (or wars, ears, zips, or
     directories).</td>
 </tr>
 
@@ -63,8 +74,13 @@
 </tr>
 
 <tr>
+<td valign="top"><a href="usage.html#skipnonpubliclibraryclasses"><code><b>-skipnonpubliclibraryclasses</b></code></a></td>
+<td>Ignore non-public library classes.</td>
+</tr>
+
+<tr>
 <td valign="top"><a href="usage.html#dontskipnonpubliclibraryclasses"><code><b>-dontskipnonpubliclibraryclasses</b></code></a></td>
-<td>Don't ignore non-public library classes.</td>
+<td>Don't ignore non-public library classes (the default).</td>
 </tr>
 
 <tr>
@@ -281,6 +297,11 @@
 </tr>
 
 <tr>
+<td valign="top"><a href="usage.html#keepparameternames"><code><b>-keepparameternames</b></code></a></td>
+<td>Keep the parameter names and types of methods that are kept.</td>
+</tr>
+
+<tr>
 <td valign="top"><a href="usage.html#renamesourcefileattribute"><code><b>-renamesourcefileattribute</b></code></a>
                  [<i>string</i>]</td>
 <td>Put the given constant string in the <code>SourceFile</code>
@@ -345,28 +366,28 @@
 <tr>
 <td valign="top"><a href="usage.html#printconfiguration"><code><b>-printconfiguration</b></code></a>
                  [<a href="usage.html#filename"><i>filename</i></a>]</td>
+<td>Write out the entire configuration in traditional ProGuard style, to the
+    standard output or to the given file.</td>
+</tr>
+
+<tr>
+<td valign="top"><a href="usage.html#dump"><code><b>-dump</b></code></a>
+                 [<a href="usage.html#filename"><i>filename</i></a>]</td>
 <td>Write out the internal structure of the processed class files, to the
     standard output or to the given file.</td>
 </tr>
 
-<tr>
-<td valign="top"><a href="usage.html#dump"><code><b>-dump</b></code></a>
-                 [<a href="usage.html#filename"><i>filename</i></a>]</td>
-<td>Write out the entire configuration in traditional ProGuard style, to the
-    standard output or to the given file.</td>
-</tr>
-
 </table>
 <p>
 Notes:
 <ul>
 
 <li><i>class_path</i> is a list of jars, wars, ears, zips, and directories,
-    with optional filters, separated by path separators.
+    with optional filters, separated by path separators.</li>
 <li><i>filename</i> can contain Java system properties delimited by
-    '<b>&lt;</b>' and '<b>&gt;</b>'.
+    '<b>&lt;</b>' and '<b>&gt;</b>'.</li>
 <li>If <i>filename</i> contains special characters, the entire name
-    should be quoted with single or double quotes.
+    should be quoted with single or double quotes.</li>
 </ul>
 <p>
 
@@ -443,23 +464,23 @@
 Notes:
 <ul>
 <li>Class names must always be fully qualified, i.e. including their package
-    names.
+    names.</li>
 <li>Types in <i>classname</i>, <i>annotationtype</i>, <i>returntype</i>, and
     <i>argumenttype</i> can contain wildcards: '<code><b>?</b></code>' for a
     single character, '<code><b>*</b></code>' for any number of characters
     (but not the package separator), '<code><b>**</b></code>' for any number
     of (any) characters, '<code><b>%</b></code>' for any primitive type,
-    '<code><b>***</b></code>' for any type, and '<code><b>...</b></code>' for       any number of arguments..
+    '<code><b>***</b></code>' for any type, and '<code><b>...</b></code>' for       any number of arguments.</li>
 <li><i>fieldname</i> and <i>methodname</i> can contain wildcards as well:
     '<code><b>?</b></code>' for a single character and '<code><b>*</b></code>'
-    for any number of characters.
+    for any number of characters.</li>
 </ul>
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/retrace/examples.html'
--- docs/manual/retrace/examples.html	2009-10-09 16:17:49 +0000
+++ docs/manual/retrace/examples.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="../style.css">
 <title>ReTrace Examples</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -12,13 +23,13 @@
 
 Some typical example uses:
 <ol>
-<li><a href="#with">Restoring a stack trace with line numbers</a>
-<li><a href="#withverbose">Restoring a stack trace with line numbers (verbose)</a>
-<li><a href="#without">Restoring a stack trace without line numbers</a>
+<li><a href="#with">Restoring a stack trace with line numbers</a></li>
+<li><a href="#withverbose">Restoring a stack trace with line numbers
+    (verbose)</a></li>
+<li><a href="#without">Restoring a stack trace without line numbers</a></li>
 </ol>
 
-<a name="with">&nbsp;</a>
-<h3>Restoring a stack trace with line numbers</h3>
+<h3><a name="with">Restoring a stack trace with line numbers</a></h3>
 
 Assume for instance ProGuard itself has been obfuscated using the following
 extra options:
@@ -133,8 +144,7 @@
         at proguard.ProGuard.main(ProGuard:429)
 </pre>
 
-<a name="withverbose">&nbsp;</a>
-<h3>Restoring a stack trace with line numbers (verbose)</h3>
+<h3><a name="withverbose">Restoring a stack trace with line numbers (verbose)</a></h3>
 
 In the previous example, we could also use the verbose flag:
 <pre>
@@ -189,8 +199,7 @@
 </pre>
 
 
-<a name="without">&nbsp;</a>
-<h3>Restoring a stack trace without line numbers</h3>
+<h3><a name="without">Restoring a stack trace without line numbers</a></h3>
 
 Assume for instance ProGuard itself has been obfuscated using the following
 extra options, this time without preserving the line number tables:
@@ -324,12 +333,12 @@
                              execute
         at proguard.ProGuard.main(Unknown Source)
 </pre>
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/retrace/index.html'
--- docs/manual/retrace/index.html	2009-10-09 16:17:49 +0000
+++ docs/manual/retrace/index.html	2012-07-12 00:24:28 +0000
@@ -1,25 +1,37 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="../style.css">
 <title>ReTrace Manual</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
 <h2>ReTrace</h2>
 
 <ol>
-<li><a href="introduction.html">Introduction</a>
-<li><a href="usage.html">Usage</a>
-<li><a href="examples.html">Examples</a>
+<li><a href="introduction.html">Introduction</a></li>
+<li><a href="usage.html">Usage</a></li>
+<li><a href="examples.html">Examples</a></li>
 </ol>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/retrace/introduction.html'
--- docs/manual/retrace/introduction.html	2009-10-09 16:17:49 +0000
+++ docs/manual/retrace/introduction.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="../style.css">
 <title>ReTrace Introduction</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -56,12 +67,12 @@
 look like without obfuscation. The restoration is based on the mapping file
 that ProGuard can write out during obfuscation. The mapping file links the
 original class names and class member names to their obfuscated names.
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/retrace/usage.html'
--- docs/manual/retrace/usage.html	2009-10-09 16:17:49 +0000
+++ docs/manual/retrace/usage.html	2012-07-12 00:24:28 +0000
@@ -1,10 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
 <meta http-equiv="content-style-type" content="text/css">
 <link rel="stylesheet" type="text/css" href="../style.css">
 <title>ReTrace Usage</title>
+<script type="text/javascript" language="JavaScript">
+<!--
+if (window.self==window.top)
+  window.top.location.replace("../../index.html#"+window.location.pathname+window.location.hash);
+else {
+  var hash="#"+window.location.pathname.replace(window.top.location.pathname.replace("index.html", ""), "");
+  if (window.top.location.hash!=hash)
+    window.top.location.hash=hash;
+}
+//-->
+</script>
 </head>
 <body>
 
@@ -17,7 +28,8 @@
 <code><b>java -jar retrace.jar </b></code>[<i>options...</i>]
          <i>mapping_file</i> [<i>stacktrace_file</i>]
 </p>
-These are the arguments:
+Alternatively, the <code>bin</code> directory contains some short Linux and
+Windows scripts containing this command. These are the arguments:
 
 <dl>
 <dt><i>mapping_file</i></dt>
@@ -48,7 +60,7 @@
     de-obfuscate more general types of input than just stack traces. The
     default is suitable for stack traces produced by most JVMs:
     <pre>
-    (?:\s*%c:.*)|(?:\s*at\s+%c.%m\s*\(.*?(?::%l)?\)\s*)
+    (?:.*?\bat\s+%c.%m\s*\(.*?(?::%l)?\)\s*)|(?:(?:.*?[:"]\s+)?%c(?::.*)?)
     </pre>
     The regular expression is a Java regular expression (cfr. the documentation
     of <code>java.util.regex.Pattern</code>), with a few additional wildcards:
@@ -87,14 +99,13 @@
 
 <ul>
 <li>If all line numbers have been preserved while obfuscating the application,
-    ReTrace will be able to restore the stack trace completely.
-    <p>
+    ReTrace will be able to restore the stack trace completely.</li>
 
 <li>If the line numbers have been removed, mapping obfuscated method names
     back to their original names has become ambiguous. Retrace will list all
     possible original method names for each line in the stack trace. The user
     can then try to deduce the actual stack trace manually, based on the logic
-    of the program.
+    of the program.</li>
 
 </ul>
 <p>
@@ -105,12 +116,12 @@
 
 Unobfuscated elements and obfuscated elements for which no mapping is available
 will be left unchanged.
-<p>
 
-<hr>
+<hr />
+<noscript><div><a target="_top" href="../../index.html" class="button">Show menu</a></div></noscript>
 <address>
-Copyright &copy; 2002-2009
-<a href="http://www.graphics.cornell.edu/~eric/">Eric Lafortune</a>.
+Copyright &copy; 2002-2012
+<a target="other" href="http://www.lafortune.eu/">Eric Lafortune</a>.
 </address>
 </body>
 </html>

=== modified file 'docs/manual/sections.html'
--- docs/manual/sections.html	2008-05-15 10:39:48 +0000
+++ docs/manual/sections.html	2012-07-12 00:24:28 +0000
@@ -1,4 +1,4 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
@@ -42,22 +42,18 @@
 document.write(document.location.hostname == "proguard.sourceforge.net" ?
   "http://sourceforge.net/sflogo.php?group_id=54750&amp;type=1" :
   "../sflogo.png");
-document.write("\" width=\"88\" height=\"31\" alt=\"SourceForge\">");
+document.write("\" width=\"88\" height=\"31\" alt=\"SourceForge\" />");
 //-->
 </script>
 <noscript>
-<img src="../sflogo.png" width="88" height="31" alt="SourceForge">
+<img src="../sflogo.png" width="88" height="31" alt="SourceForge" />
 </noscript>
 
 </a>
 
 <p>
-<a href="http://www.luciad.com/" target="other">
-<img src="../luciadlogo.png" width="88" height="24" alt="Luciad"></a>
-
-<p>
-<a href="http://www.javadocking.com/" target="other">
-<img src="../sanawarelogo.png" width="88" height="24" alt="Luciad"></a>
+<a href="http://www.saikoa.com/" target="_top">
+<img src="../saikoalogo.png" width="88" height="19" alt="Saikoa" /></a>
 </center>
 
 </body>

=== modified file 'docs/manual/style.css'
--- docs/manual/style.css	2009-10-09 16:17:49 +0000
+++ docs/manual/style.css	2012-07-12 00:24:28 +0000
@@ -2,20 +2,24 @@
 
 /* Global settings. */
 
-body {
+body
+{
   background: #FFFFFF;
 }
 
-h1 {
+h1
+{
   text-align: center;
 }
 
-h2 {
+h2
+{
   background: #EEEEFF;
   padding: 10px;
 }
 
-dt {
+dt
+{
   padding: 6px;
 }
 
@@ -25,23 +29,50 @@
   float: right;
 }
 
-dd {
+dd
+{
   padding: 6px;
 }
 
-pre {
+pre
+{
   padding: 10px;
   background: #E0E0E0;
 }
 
+.spacious li
+{
+  padding: 8px;
+}
+
+.shifted li
+{
+  margin-left: 50px;
+}
+
+img.float
+{
+  float: left;
+}
+
 a
 {
   text-decoration: none;
 }
 
+a.button
+{
+  color: #000000;
+  text-decoration: none;
+  background: #E0E0E0;
+  border: 1px outset #FFFFFF;
+  float: right;
+}
+
 /* Settings for variable width code. */
 
-p.code {
+p.code
+{
   padding: 10px;
   background: #E0E0E0;
 }
@@ -49,34 +80,39 @@
 
 /* Settings for diagrams. */
 
-table.diagram {
+table.diagram
+{
   padding: 8px;
   border: none;
   border-spacing: 2px;
 }
 
-td.transparentblock {
+td.transparentblock
+{
   text-align: center;
   padding: 10px 0px;
 }
 
-td.whiteblock {
+td.whiteblock
+{
   width: 100px;
   text-align: center;
-  border: solid #C0C0C0 1px;
+  border: 1px solid #C0C0C0;
   background: #E0E0E0;
   padding: 10px 0px;
 }
 
-td.lightblock {
+td.lightblock
+{
   width: 100px;
   text-align: center;
-  border: solid #8888FF 1px;
+  border: 1px solid #8888FF;
   background: #BBBBFF;
   padding: 20px 0px;
 }
 
-td.darkblock {
+td.darkblock
+{
   width: 100px;
   text-align: center;
   background: #8888FF;
@@ -85,8 +121,9 @@
 
 /* Settings for buttons. */
 
-td.button {
+td.button
+{
   background: #E0E0E0;