beamer 3.08 (6jun10)

git-svn-id: svn://tug.org/texlive/trunk@18777 c570f23f-e606-0410-a88d-b1316a301751

60 files changed, 4222 insertions, 11212 deletions

diff --git a/Master/texmf-dist/doc/latex/beamer/AUTHORS b/Master/texmf-dist/doc/latex/beamer/AUTHORS
index 6e10d46bf89..9828c605062 100644
--- a/Master/texmf-dist/doc/latex/beamer/AUTHORS
+++ b/Master/texmf-dist/doc/latex/beamer/AUTHORS
@@ -1,9 +1,23 @@
 Main development:
 
 Till Tantau <tantau@users.sourceforge.net>
+Joseph Wright <joseph.wright@morningstar2.co.uk>
+Vedran Mileti\'c <vmiletic@inf.uniri.hr>
 
 
-Theme constributors:
+Patch contributions:
+
+Daniel Arteaga <http://bitbucket.org/darteaga> (documentation fixes)
+Tim Bell <bhat@users.sourceforge.net> (documentation fixes)
+Karl Berry <karl@freefriends.org> (fix for geometry 5.0)
+Kanru Chen <koster@debian.org.tw> (fix for subfig)
+Vladimir Lomov <lomov.vl@gmail.com> (original fix for geometry 5.0)
+Heiko Oberdiek <heiko.oberdiek@googlemail.com> (fix for hyperref (sub)section*)
+Martin Quinson <martin.quinson@loria.fr> (add option to style subsubsection)
+Andreas Scherer <andreas_coder@freenet.de> (documentation fixes)
+
+
+Theme contributors:
 
 Paul Gomme <paul-gomme@uiowa.edu> (compress option for beamerthemesplit)
 Manuel Carro <mcarro@fi.upm.es> (Madrid theme)
diff --git a/Master/texmf-dist/doc/latex/beamer/ChangeLog b/Master/texmf-dist/doc/latex/beamer/ChangeLog
index 710b5b9b168..a2360e3831e 100644
--- a/Master/texmf-dist/doc/latex/beamer/ChangeLog
+++ b/Master/texmf-dist/doc/latex/beamer/ChangeLog
@@ -1,6 +1,647 @@
+changeset:   414:73413e8124bd
+tag:         tip
+tag:         master
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 14:25:17 2010 +0200
+files:       FILES
+description:
+Update FILES.
+
+
+changeset:   413:809d38e3c3aa
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 14:20:56 2010 +0200
+files:       examples/a-lecture/beamerexample-lecture-logo.pdf
+description:
+Add a logo that was missing in a-lecture.
+
+
+changeset:   412:7e7cc5e53e9d
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 14:18:42 2010 +0200
+files:       base/beamerbasetheorems.sty
+description:
+Fix that makes beamerexample-lecture-print-version compile.
+
+
+changeset:   411:fa7ec00e7b95
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 13:53:12 2010 +0200
+files:       doc/Makefile
+description:
+Make Makefile a bit more useful.
+
+
+changeset:   410:d1a9b48be06d
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 13:34:07 2010 +0200
+files:       base/beamerbasecolor.sty
+description:
+Really fix issue #1 beamercolorbox: unexpected behavior.
+
+
+changeset:   409:bff0a9294b45
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 13:23:19 2010 +0200
+files:       base/beamer.cls base/beamerbaseframe.sty base/beamerbasemisc.sty
+description:
+Hopefully fix #8 beamer should generate pdf page labels using hyperref.
+
+
+changeset:   408:8ad93b65b084
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 13:05:23 2010 +0200
+files:       base/beamerbasetoc.sty
+description:
+Fix issue #27 Page numbers when using \addcontentsline.
+
+
+changeset:   407:4bbb4d4d3157
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 13:00:01 2010 +0200
+files:       doc/beamerug-compatibility.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-graphics.tex doc/beamerug-introduction.tex doc/beamerug-tutorial.tex doc/beamerug-workflow.tex doc/licenses/LICENSE
+description:
+More documentation updates: mention luatex and xetex in places where they are relevant. Fix some more incorrect new paragraphs.
+
+
+changeset:   406:1c2022836935
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 12:59:07 2010 +0200
+files:       AUTHORS
+description:
+Add Daniel Arteaga to patch contributors.
+
+
+changeset:   405:3875786488eb
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun Jun 06 11:31:13 2010 +0200
+files:       doc/beamerug-license.tex doc/beameruserguide.tex
+description:
+Update GFDL license 1.3.
+
+
+changeset:   404:cb13b61d2456
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Jun 04 18:12:49 2010 +0200
+files:       doc/beamerug-license.tex doc/beameruserguide.tex
+description:
+Minor cosmetic fixes for documentation.
+
+
+changeset:   403:d4ffbef1def7
+user:        Joseph Wright <joseph.wright@morningstar2.co.uk>
+date:        Wed Jun 02 19:10:54 2010 +0100
+files:       doc/beamerug-installation.tex doc/beamerug-tutorial.tex
+description:
+Doc fixes from Daniel Arteaga
+
+
+changeset:   402:81f9e33f7cc2
+user:        Joseph Wright <joseph.wright@morningstar2.co.uk>
+date:        Tue Jun 01 20:03:53 2010 +0100
+files:       base/beamerbaselocalstructure.sty
+description:
+Do not gobble optional arguments for lists in article mode (fixes #24)
+
+
+changeset:   401:d7f4e7c9b001
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Mon May 31 16:17:18 2010 +0200
+files:       base/beamerbasecolor.sty
+description:
+(Hopefully) fix issue #21 blocks with [default] corners not placed properly in columns env.
+
+
+changeset:   400:67558c7682d2
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Mon May 31 15:54:08 2010 +0200
+files:       doc/beamerug-compatibility.tex
+description:
+Fix issue #17 corrections and wishes.
+
+
+changeset:   399:0eb40b9b455f
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Mon May 31 15:25:47 2010 +0200
+files:       doc/beamerug-animations.tex doc/beamerug-color.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-globalstructure.tex doc/beamerug-guidelines.tex doc/beamerug-introduction.tex doc/beamerug-localstructure.tex doc/beamerug-nonpresentation.tex doc/beamerug-solutions.tex doc/beamerug-themes.tex doc/beamerug-twoscreens.tex doc/beamerug-workflow.tex
+description:
+Documentation fixes: I-->Till or I-->we.
+
+
+changeset:   398:1b0256162842
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 22 09:46:44 2010 +0200
+files:       base/beamer.cls
+description:
+Fix fontsize breakage.
+
+
+changeset:   397:6f7b78175593
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue May 11 21:18:26 2010 +0200
+files:       doc/beamerug-fonts.tex doc/beamerug-installation.tex doc/beamerug-introduction.tex doc/beamerug-tutorial.tex
+description:
+More documentation fixes.
+
+
+changeset:   396:9d58995b9c4d
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue May 11 20:31:20 2010 +0200
+files:       doc/beamerug-animations.tex doc/beamerug-color.tex doc/beamerug-compatibility.tex doc/beamerug-elements.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-globalstructure.tex doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-installation.tex doc/beamerug-interaction.tex doc/beamerug-introduction.tex doc/beamerug-license.tex doc/beamerug-localstructure.tex doc/beamerug-nonpresentation.tex doc/beamerug-notes.tex doc/beamerug-overlays.tex doc/beamerug-solutions.tex doc/beamerug-themes.tex doc/beamerug-transparancies.tex doc/beamerug-tricks.tex doc/beamerug-tutorial.tex doc/beamerug-twoscreens.tex doc/beamerug-workflow.tex
+description:
+Documentation fixes part 4 (mostly ready for release now):
+-- add a comma.
+-- Fedora aptitude->yum.
+-- indentation and newlines.
+
+
+changeset:   395:cd36e8a33c6b
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Mon May 10 10:36:07 2010 +0200
+files:       base/beamerbasefont.sty
+description:
+Alphabetical ordering of fonts in beamerbasefonts.sty
+
+
+changeset:   394:9c8df196cc46
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Mon May 10 10:33:56 2010 +0200
+files:       base/beamerbasefont.sty doc/beamerug-fonts.tex
+description:
+Add arev to professional fonts support and document it.
+
+
+changeset:   393:0706bb3e61a2
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 09 21:21:02 2010 +0200
+files:       AUTHORS INSTALL README TODO doc/beamerug-emulation.tex doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-installation.tex doc/beamerug-interaction.tex doc/beamerug-introduction.tex doc/beamerug-license.tex doc/beamerug-localstructure.tex doc/beamerug-nonpresentation.tex doc/licenses/LICENSE
+description:
+More documentation fixes. Fix non-TeX doc files that come with beamer.
+
+
+changeset:   392:5791bac97c15
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 09 11:15:37 2010 +0200
+files:       doc/beamerug-introduction.tex
+description:
+Add note about fourth part in introduction that was missing.
+
+
+changeset:   391:6abdefb5f79f
+parent:      389:647d08b36bfb
+parent:      390:9cd0dc417be7
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 09 11:06:41 2010 +0200
+description:
+Merge.
+
+
+changeset:   390:9cd0dc417be7
+parent:      387:26a58c6f1267
+user:        Joseph Wright <joseph.wright@morningstar2.co.uk>
+date:        Sat May 08 22:13:22 2010 +0100
+files:       doc/beamerug-introduction.tex
+description:
+Add a few thanks (especially to Vedran: he's taking the lead, so I don't have to!)
+
+
+changeset:   389:647d08b36bfb
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 09 11:05:11 2010 +0200
+files:       base/beamer.cls doc/beamerug-frames.tex doc/beameruserguide.tex
+description:
+Change 3:2 aspect ratio to be 135x90 instead of 150x100. Document this.
+
+
+changeset:   388:1d6e4de28728
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 09 11:02:15 2010 +0200
+files:       base/beamerbasearticle.sty
+description:
+Add some options to hyperref in beamerarticle.
+
+
+changeset:   387:26a58c6f1267
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 08 22:02:43 2010 +0200
+files:       base/beamer.cls doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-installation.tex doc/beamerug-license.tex doc/beamerug-twoscreens.tex doc/beamerug-workflow.tex doc/beameruserguide.tex
+description:
+Rename screenratio option to aspectratio and document it. Add 3:2 ratio support. Change "GNU Public License" in documentation to "GNU General Public License". Add "or any later version" for consistency. Return \input{beamerug-compatibility} where it belongs.
+
+
+changeset:   386:4ee5c6a4781a
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 08 20:54:05 2010 +0200
+files:       doc/beamerug-animations.tex doc/beamerug-color.tex doc/beamerug-compatibility.tex doc/beamerug-elements.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-globalstructure.tex doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-installation.tex doc/beamerug-interaction.tex doc/beamerug-license.tex doc/beamerug-localstructure.tex doc/beamerug-macros.tex doc/beamerug-nonpresentation.tex doc/beamerug-notes.tex doc/beamerug-overlays.tex doc/beamerug-solutions.tex doc/beamerug-transparancies.tex doc/beamerug-tricks.tex doc/beamerug-tutorial.tex doc/beamerug-twoscreens.tex doc/beamerug-workflow.tex doc/beameruserguide.tex
+description:
+Documentation fixes, part 2.
+-- add notes about |poppler| and evince/okular.
+-- fix linebreaks.
+-- add FIXME note to a place where explanation for option for slide layout should be.
+
+
+changeset:   385:161eaf4bc28c
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 08 14:41:37 2010 +0200
+files:       AUTHORS doc/beamercolorthemeexample.tex doc/beamerfontthemeexample.tex doc/beamerouterthemeexample.tex doc/beamerthemeexample.tex doc/beamerthemeexamplebase.tex doc/beamerug-animations.tex doc/beamerug-compatibility.tex doc/beamerug-fonts.tex doc/beamerug-installation.tex doc/beamerug-introduction.tex doc/beamerug-themes.tex doc/beamerug-twoscreens.tex doc/beameruserguide.tex
+description:
+Updating documentation for version 3.08, part 1 (more to follow). Short changelog:
+-- remove linebreaks in paragraphs (they are very inconsisent anyway)
+-- mention Debian and Ubuntu in "installation" instead of just Debian, mention versions
+-- mention Fedora
+-- put TeX Live and MacTeX vs. MikTeX and proTeXt
+-- replace "my" with "our" and "I" with "we"
+-- put Till's thanks into quotation, add mine, and put placeholder for Joseph's
+-- convert all documents to plain ASCII, and put utf8 inputenc instead of latin1 (just in case)
+-- use lmodern and T1 fontenc
+-- mention utf8 vs utf8x in presentation and article mode and hyperref in article mode
+
+
+changeset:   384:9a9b38bd58b5
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 08 14:19:49 2010 +0200
+files:       base/beamerbasefont.sty
+description:
+Revert "use lmodern if available". This produced weird results on some older presentations due to slightly different metrics.
+
+
+changeset:   383:5584dad462a9
+user:        Joseph Wright <joseph.wright@morningstar2.co.uk>
+date:        Fri May 07 09:01:43 2010 +0100
+files:       base/beamerbaseoverlay.sty
+description:
+Reset fonts and justification inside overlayarea (fixes bug #11)
+
+
+changeset:   382:6feac3ddebc1
+user:        Joseph Wright <joseph.wright@morningstar2.co.uk>
+date:        Thu May 06 17:54:55 2010 +0100
+files:       base/beamerbasesection.sty
+description:
+Make setting \beamer@tocsectionnumber global, to fix bug #12
+
+
+changeset:   381:1cbf4232a7a9
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sun May 02 10:21:05 2010 +0200
+files:       base/beamerbasecolor.sty
+description:
+Backed out changeset 939cbc288417, breaks a lot of things.
+
+
+changeset:   380:939cbc288417
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 20:10:53 2010 +0200
+files:       base/beamerbasecolor.sty
+description:
+Fix #1 beamercolorbox: unexpected behavior.
+
+
+changeset:   379:d0b34a51204f
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 19:43:54 2010 +0200
+files:       base/beamer.cls
+description:
+Add screensize option (1610, 169, 149, 54, 43; default 43). Remove 169layout and 1610layout that were experimental implementation of same thing.
+
+
+changeset:   378:7063f09e9019
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 18:39:27 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty
+description:
+Add support for option 'utf8' also to article mode. Pass unicode to hyperref if utf8 is specified.
+
+
+changeset:   377:751dcaeea5e0
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 18:18:32 2010 +0200
+files:       base/beamer.cls
+description:
+Fix the utf8 option: utf8x with inputenc is intended for ucs, while utf8 with inputenc works without ucs. This has to be documented.
+
+
+changeset:   376:052a1dd6382c
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 17:36:28 2010 +0200
+files:       base/beamerbasefont.sty
+description:
+Also use lmodern in article mode.
+
+
+changeset:   375:fe10ecea5804
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 17:30:03 2010 +0200
+files:       base/beamerbasefont.sty
+description:
+Use lmodern by default (instead of cmr) if available.
+
+
+changeset:   374:dea7546469ce
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 14:10:34 2010 +0200
+files:       base/beamerbasesection.sty
+description:
+Fixed issue #7 Broken hyperlinks in header.
+
+
+changeset:   373:d5368d515366
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 13:54:34 2010 +0200
+files:       base/beamerbaseframe.sty
+description:
+Fix #6 Add option to stop frame numbering after a slide. The key is noframenumbering, but it might change for consistency before release happens.
+
+
+changeset:   372:efa082c6111d
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 13:27:03 2010 +0200
+files:       AUTHORS base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseauxtemplates.sty base/beamerbaseboxes.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseexercise.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbaserequires.sty base/beamerbasesection.sty base/beamerbasetemplates.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetranslator.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty themes/font/beamerfontthemedefault.sty
+description:
+\mode<> code consistency fixes. Remove newlines at the ends of files.
+
+
+changeset:   371:a5badc796104
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 12:36:41 2010 +0200
+files:       base/beamerbasetitle.sty
+description:
+Fix issue #3 article mode: \titlepage resets page counter.
+
+
+changeset:   370:c9cd35db708e
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 11:54:37 2010 +0200
+files:       doc/beamerug-compatibility.tex doc/beamerug-installation.tex doc/beameruserguide.tex
+description:
+Documentation fixes by Andreas Scherer (part 2).
+
+
+changeset:   369:f9755262cad5
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 11:49:56 2010 +0200
+files:       AUTHORS doc/beamerug-introduction.tex
+description:
+Documentation fixes by Andreas Scherer (part 1).
+
+
+changeset:   368:14718f68e732
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 11:43:08 2010 +0200
+files:       AUTHORS base/beamerbasetoc.sty
+description:
+subsubsectionstyle support (patch by Martin Quinson).
+
+
+changeset:   367:79a97133a1e1
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat May 01 11:28:02 2010 +0200
+files:       doc/beamerug-animations.tex.rej doc/beamerug-color.tex.rej doc/beamerug-elements.tex.rej doc/beamerug-emulation.tex.rej doc/beamerug-fonts.tex.rej doc/beamerug-frames.tex.rej doc/beamerug-globalstructure.tex doc/beamerug-globalstructure.tex.rej doc/beamerug-guidelines.tex doc/beamerug-guidelines.tex.rej doc/beamerug-interaction.tex doc/beamerug-interaction.tex.rej doc/beamerug-localstructure.tex doc/beamerug-localstructure.tex.rej doc/beamerug-nonpresentation.tex.rej doc/beamerug-themes.tex doc/beamerug-themes.tex.rej doc/beamerug-tutorial.tex doc/beamerug-tutorial.tex.rej doc/beamerug-workflow.tex doc/beamerug-workflow.tex.rej
+description:
+Manually merge rejected documentation fixes done by Tim Bell.
+
+
+changeset:   366:b288180510af
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 30 10:04:38 2010 +0200
+files:       AUTHORS doc/beamerug-animations.tex doc/beamerug-animations.tex.rej doc/beamerug-color.tex doc/beamerug-color.tex.rej doc/beamerug-elements.tex doc/beamerug-elements.tex.rej doc/beamerug-emulation.tex doc/beamerug-emulation.tex.rej doc/beamerug-fonts.tex doc/beamerug-fonts.tex.rej doc/beamerug-frames.tex doc/beamerug-frames.tex.rej doc/beamerug-globalstructure.tex doc/beamerug-globalstructure.tex.rej doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-guidelines.tex.rej doc/beamerug-interaction.tex doc/beamerug-interaction.tex.rej doc/beamerug-introduction.tex doc/beamerug-localstructure.tex doc/beamerug-localstructure.tex.rej doc/beamerug-nonpresentation.tex doc/beamerug-nonpresentation.tex.rej doc/beamerug-overlays.tex doc/beamerug-themes.tex doc/beamerug-themes.tex.rej doc/beamerug-tricks.tex doc/beamerug-tutorial.tex doc/beamerug-tutorial.tex.rej doc/beamerug-workflow.tex doc/beamerug-workflow.tex.rej doc/beameruserguide.tex
+description:
+Import doc fixes by Tim Bell (wip).
+
+
+changeset:   365:9d2103924578
+parent:      364:b811d0060c52
+parent:      363:dd2ef3616c35
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Wed Apr 28 23:56:57 2010 +0200
+files:       base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbaseoverlay.sty base/beamerbasetoc.sty emulation/beamerprosper.sty emulation/beamerseminar.sty
+description:
+Eliminate other head (hint to myself: try the code before you push).
+
+
+changeset:   364:b811d0060c52
+parent:      362:6dd151388527
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Wed Apr 28 23:49:50 2010 +0200
+files:       doc/beamerug-introduction.tex emulation/beamerfoils.sty emulation/beamerprosper.sty emulation/beamerseminar.sty emulation/beamertexpower.sty extensions/multimedia/multimedia.sty extensions/multimedia/multimediasymbols.sty
+description:
+Update copyrights. Fix a typo in documentation.
+
+
+changeset:   363:dd2ef3616c35
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Wed Apr 28 23:38:22 2010 +0200
+files:       base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbaseoverlay.sty base/beamerbasetoc.sty emulation/beamerfoils.sty emulation/beamerprosper.sty emulation/beamerseminar.sty emulation/beamertexpower.sty extensions/multimedia/multimedia.sty extensions/multimedia/multimediasymbols.sty
+description:
+Change all occurences of =#n to ={#n}. Update copyrights.
+
+
+changeset:   362:6dd151388527
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 27 15:35:46 2010 +0200
+files:       base/beamer.cls
+description:
+Implement 16:9 (169layout) and 16:10 (1610layout). The interface for calling these will probably change before the final release.
+
+
+changeset:   361:982469101dd6
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 27 14:45:50 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoptions.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbaserequires.sty base/beamerbasesection.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetranslator.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty doc/beamerug-animations.tex doc/beamerug-color.tex doc/beamerug-compatibility.tex doc/beamerug-elements.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-globalstructure.tex doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-installation.tex doc/beamerug-interaction.tex doc/beamerug-introduction.tex doc/beamerug-license.tex doc/beamerug-localstructure.tex doc/beamerug-macros.tex doc/beamerug-nonpresentation.tex doc/beamerug-notes.tex doc/beamerug-overlays.tex doc/beamerug-themes.tex doc/beamerug-transparancies.tex doc/beamerug-tricks.tex doc/beamerug-tutorial.tex doc/beamerug-twoscreens.tex emulation/beamerfoils.sty emulation/beamerprosper.sty emulation/beamerseminar.sty emulation/beamertexpower.sty emulation/examples/beamerexample-texpower.tex extensions/multimedia/multimedia.sty extensions/multimedia/multimediasymbols.sty themes/inner/beamerinnerthemerectangles.sty themes/inner/beamerinnerthemerounded.sty themes/outer/beamerouterthemesidebar.sty themes/theme/beamerthemeBerkeley.sty themes/theme/beamerthemePaloAlto.sty
+description:
+Remove useless (and most of the time wrong) %%% lines at the end of many files.
+
+
+changeset:   360:5a25f58600c3
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 27 14:17:50 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseauxtemplates.sty base/beamerbaseboxes.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoptions.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbaserequires.sty base/beamerbasesection.sty base/beamerbasetemplates.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetranslator.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty doc/beamercolorthemeexample.tex doc/beamerfontthemeexample.tex doc/beamerinnerthemeexample.tex doc/beamerouterthemeexample.tex doc/beamerthemeexample.tex doc/beamerthemeexamplebase.tex doc/beamerug-animations.tex doc/beamerug-color.tex doc/beamerug-compatibility.tex doc/beamerug-elements.tex doc/beamerug-emulation.tex doc/beamerug-fonts.tex doc/beamerug-frames.tex doc/beamerug-globalstructure.tex doc/beamerug-graphics.tex doc/beamerug-guidelines.tex doc/beamerug-installation.tex doc/beamerug-interaction.tex doc/beamerug-introduction.tex doc/beamerug-license.tex doc/beamerug-localstructure.tex doc/beamerug-macros.tex doc/beamerug-nonpresentation.tex doc/beamerug-notes.tex doc/beamerug-overlays.tex doc/beamerug-solutions.tex doc/beamerug-themes.tex doc/beamerug-transparancies.tex doc/beamerug-tricks.tex doc/beamerug-tutorial.tex doc/beamerug-twoscreens.tex doc/beamerug-workflow.tex doc/beameruserguide.tex doc/themeexamples/beamerthemeexample.tex scripts/commentProvidePackageRCS.pl
+description:
+Add files that were missing in previous commit. Cleanup whitespace. Update copyright in documentation. Remove perl script, not necessary anymore as KeywordExtension for Mercurial works nice.
+
+
+changeset:   359:41b5745e061e
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 27 13:12:37 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseboxes.sty base/beamerbasefont.sty base/beamerbasemisc.sty base/beamerbaseoptions.sty base/beamerbasercs.sty base/beamerbasesection.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty
+description:
+Initial attempt at merging required packages by presentation and article mode. Attempt to include translator if exists; currently automatically loads all dictionaries. Fix lots of indentation, spaces, etc.
+
+
+changeset:   358:44025e1f75aa
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 27 10:34:48 2010 +0200
+files:       TODO base/beamerbasemisc.sty
+description:
+More translations. Will soon move translator check into a separate file. Add a reminder about beamerposter.
+
+
+changeset:   357:fb0213df2be8
+user:        Vedran Miletić <vmiletic@inf.uniri.hr>
+date:        Mon Apr 26 22:33:24 2010 +0200
+files:       TODO
+description:
+Update TODO.
+
+
+changeset:   356:165210fa3865
+user:        Vedran Miletić <vmiletic@inf.uniri.hr>
+date:        Mon Apr 26 22:25:00 2010 +0200
+files:       AUTHORS INSTALL README TODO base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseauxtemplates.sty base/beamerbaseboxes.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseexercise.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoptions.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbasesection.sty base/beamerbasetemplates.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty
+description:
+Cosmetic fixes to README, INSTALL, AUTHORS. Update copyright in base/.
+
+
+changeset:   355:49c1487b9540
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat Apr 24 10:53:35 2010 +0200
+files:       base/beamerbasesection.sty
+description:
+Add translator support to beamerbasesection.sty. Hopefully, at some point code will be reorganized so same check will not need to be in many locations.
+
+
+changeset:   354:6d1611720086
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Sat Apr 24 09:33:35 2010 +0200
+files:       base/beamerbasecompatibility.sty
+description:
+Make Heiko's fix really work this time.
+
+
+changeset:   353:08e824c02526
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 19:10:37 2010 +0200
+files:       base/beamerbasecompatibility.sty base/beamerbasesection.sty
+description:
+Attempt to fix empty subsection. Add a note about sectionname.
+
+
+changeset:   352:2c581c4899a6
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 18:05:28 2010 +0200
+files:       base/beamerbasecompatibility.sty
+description:
+Integrate Heiko's fix. Comment phantomsection.
+
+
+changeset:   351:d428f2b0d290
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 17:49:02 2010 +0200
+files:       base/beamerarticle.sty base/beamerbasearticle.sty
+description:
+Fix hyperref in beamerarticle and add option nohyperref.
+
+
+changeset:   350:25f85d59db1e
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 17:12:41 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseauxtemplates.sty base/beamerbaseboxes.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseexercise.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoptions.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbasesection.sty base/beamerbasetemplates.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty emulation/beamerfoils.sty emulation/beamerprosper.sty emulation/beamerseminar.sty emulation/beamertexpower.sty themes/color/beamercolorthemealbatross.sty themes/color/beamercolorthemebeaver.sty themes/color/beamercolorthemebeetle.sty themes/color/beamercolorthemecrane.sty themes/color/beamercolorthemedefault.sty themes/color/beamercolorthemedolphin.sty themes/color/beamercolorthemedove.sty themes/color/beamercolorthemefly.sty themes/color/beamercolorthemelily.sty themes/color/beamercolorthemeorchid.sty themes/color/beamercolorthemerose.sty themes/color/beamercolorthemeseagull.sty themes/color/beamercolorthemeseahorse.sty themes/color/beamercolorthemesidebartab.sty themes/color/beamercolorthemestructure.sty themes/color/beamercolorthemewhale.sty themes/color/beamercolorthemewolverine.sty themes/font/beamerfontthemedefault.sty themes/font/beamerfontthemeprofessionalfonts.sty themes/font/beamerfontthemeserif.sty themes/font/beamerfontthemestructurebold.sty themes/font/beamerfontthemestructureitalicserif.sty themes/font/beamerfontthemestructuresmallcapsserif.sty themes/inner/beamerinnerthemecircles.sty themes/inner/beamerinnerthemedefault.sty themes/inner/beamerinnerthemeinmargin.sty themes/inner/beamerinnerthemerectangles.sty themes/inner/beamerinnerthemerounded.sty themes/outer/beamerouterthemedefault.sty themes/outer/beamerouterthemeinfolines.sty themes/outer/beamerouterthememiniframes.sty themes/outer/beamerouterthemeshadow.sty themes/outer/beamerouterthemesidebar.sty themes/outer/beamerouterthemesmoothbars.sty themes/outer/beamerouterthemesmoothtree.sty themes/outer/beamerouterthemesplit.sty themes/outer/beamerouterthemetree.sty themes/theme/beamerthemeAnnArbor.sty themes/theme/beamerthemeAntibes.sty themes/theme/beamerthemeBergen.sty themes/theme/beamerthemeBerkeley.sty themes/theme/beamerthemeBerlin.sty themes/theme/beamerthemeBoadilla.sty themes/theme/beamerthemeCambridgeUS.sty themes/theme/beamerthemeCopenhagen.sty themes/theme/beamerthemeDarmstadt.sty themes/theme/beamerthemeDresden.sty themes/theme/beamerthemeFrankfurt.sty themes/theme/beamerthemeGoettingen.sty themes/theme/beamerthemeHannover.sty themes/theme/beamerthemeIlmenau.sty themes/theme/beamerthemeJuanLesPins.sty themes/theme/beamerthemeLuebeck.sty themes/theme/beamerthemeMadrid.sty themes/theme/beamerthemeMalmoe.sty themes/theme/beamerthemeMarburg.sty themes/theme/beamerthemeMontpellier.sty themes/theme/beamerthemePaloAlto.sty themes/theme/beamerthemePittsburgh.sty themes/theme/beamerthemeRochester.sty themes/theme/beamerthemeSingapore.sty themes/theme/beamerthemeSzeged.sty themes/theme/beamerthemeWarsaw.sty themes/theme/beamerthemeboxes.sty themes/theme/beamerthemedefault.sty themes/theme/compatibility/beamerthemebars.sty themes/theme/compatibility/beamerthemeclassic.sty themes/theme/compatibility/beamerthemecompatibility.sty themes/theme/compatibility/beamerthemelined.sty themes/theme/compatibility/beamerthemeplain.sty themes/theme/compatibility/beamerthemeshadow.sty themes/theme/compatibility/beamerthemesidebar.sty themes/theme/compatibility/beamerthemesplit.sty themes/theme/compatibility/beamerthemetree.sty
+description:
+Uncomment RCS again. Mercurial KeywordExtension provides necessary keywords.
+
+
+changeset:   349:c1c2e9d829c2
+parent:      348:d8963a755aa7
+parent:      1:10c7a1de136c
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 16:57:02 2010 +0200
+description:
+Merge empty vendor branch.
+
+
+changeset:   348:d8963a755aa7
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 23 09:46:02 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasearticle.sty base/beamerbaseauxtemplates.sty base/beamerbaseboxes.sty base/beamerbasecolor.sty base/beamerbasecompatibility.sty base/beamerbasedecode.sty base/beamerbaseexercise.sty base/beamerbasefont.sty base/beamerbaseframe.sty base/beamerbaseframecomponents.sty base/beamerbaseframesize.sty base/beamerbaselocalstructure.sty base/beamerbasemisc.sty base/beamerbasemodes.sty base/beamerbasenavigation.sty base/beamerbasenotes.sty base/beamerbaseoptions.sty base/beamerbaseoverlay.sty base/beamerbasercs.sty base/beamerbasesection.sty base/beamerbasetemplates.sty base/beamerbasethemes.sty base/beamerbasetheorems.sty base/beamerbasetitle.sty base/beamerbasetoc.sty base/beamerbasetwoscreens.sty base/beamerbaseverbatim.sty emulation/beamerfoils.sty emulation/beamerprosper.sty emulation/beamerseminar.sty emulation/beamertexpower.sty scripts/commentProvidePackageRCS.pl themes/color/beamercolorthemealbatross.sty themes/color/beamercolorthemebeaver.sty themes/color/beamercolorthemebeetle.sty themes/color/beamercolorthemecrane.sty themes/color/beamercolorthemedefault.sty themes/color/beamercolorthemedolphin.sty themes/color/beamercolorthemedove.sty themes/color/beamercolorthemefly.sty themes/color/beamercolorthemelily.sty themes/color/beamercolorthemeorchid.sty themes/color/beamercolorthemerose.sty themes/color/beamercolorthemeseagull.sty themes/color/beamercolorthemeseahorse.sty themes/color/beamercolorthemesidebartab.sty themes/color/beamercolorthemestructure.sty themes/color/beamercolorthemewhale.sty themes/color/beamercolorthemewolverine.sty themes/font/beamerfontthemedefault.sty themes/font/beamerfontthemeprofessionalfonts.sty themes/font/beamerfontthemeserif.sty themes/font/beamerfontthemestructurebold.sty themes/font/beamerfontthemestructureitalicserif.sty themes/font/beamerfontthemestructuresmallcapsserif.sty themes/inner/beamerinnerthemecircles.sty themes/inner/beamerinnerthemedefault.sty themes/inner/beamerinnerthemeinmargin.sty themes/inner/beamerinnerthemerectangles.sty themes/inner/beamerinnerthemerounded.sty themes/outer/beamerouterthemedefault.sty themes/outer/beamerouterthemeinfolines.sty themes/outer/beamerouterthememiniframes.sty themes/outer/beamerouterthemeshadow.sty themes/outer/beamerouterthemesidebar.sty themes/outer/beamerouterthemesmoothbars.sty themes/outer/beamerouterthemesmoothtree.sty themes/outer/beamerouterthemesplit.sty themes/outer/beamerouterthemetree.sty themes/theme/beamerthemeAnnArbor.sty themes/theme/beamerthemeAntibes.sty themes/theme/beamerthemeBergen.sty themes/theme/beamerthemeBerkeley.sty themes/theme/beamerthemeBerlin.sty themes/theme/beamerthemeBoadilla.sty themes/theme/beamerthemeCambridgeUS.sty themes/theme/beamerthemeCopenhagen.sty themes/theme/beamerthemeDarmstadt.sty themes/theme/beamerthemeDresden.sty themes/theme/beamerthemeFrankfurt.sty themes/theme/beamerthemeGoettingen.sty themes/theme/beamerthemeHannover.sty themes/theme/beamerthemeIlmenau.sty themes/theme/beamerthemeJuanLesPins.sty themes/theme/beamerthemeLuebeck.sty themes/theme/beamerthemeMadrid.sty themes/theme/beamerthemeMalmoe.sty themes/theme/beamerthemeMarburg.sty themes/theme/beamerthemeMontpellier.sty themes/theme/beamerthemePaloAlto.sty themes/theme/beamerthemePittsburgh.sty themes/theme/beamerthemeRochester.sty themes/theme/beamerthemeSingapore.sty themes/theme/beamerthemeSzeged.sty themes/theme/beamerthemeWarsaw.sty themes/theme/beamerthemeboxes.sty themes/theme/beamerthemedefault.sty themes/theme/compatibility/beamerthemebars.sty themes/theme/compatibility/beamerthemeclassic.sty themes/theme/compatibility/beamerthemecompatibility.sty themes/theme/compatibility/beamerthemelined.sty themes/theme/compatibility/beamerthemeplain.sty themes/theme/compatibility/beamerthemeshadow.sty themes/theme/compatibility/beamerthemesidebar.sty themes/theme/compatibility/beamerthemesplit.sty themes/theme/compatibility/beamerthemetree.sty
+description:
+Comment all \ProvidePackageRCS (thanks Lucia) and also a \ProvideClassRCS in beamer.cls. Need to redo these two for Mercurial eventually.
+
+
+changeset:   347:eabeb2bfd1f2
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Thu Apr 22 19:44:22 2010 +0200
+files:       scripts/commentProvidePackageRCS.pl
+description:
+Added Perl script written by Lucia Načinović that automatically comments or uncomments \ProvidePackageRCS $Header$ lines.
+
+
+changeset:   346:ec8ab8469dca
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Thu Apr 22 18:58:35 2010 +0200
+files:       base/beamerarticle.sty base/beamerbasearticle.sty
+description:
+Two minor cosmetic fixes for beamerarticle.
+
+
+changeset:   345:23a715253d39
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Thu Apr 22 18:52:02 2010 +0200
+files:       base/beamer.cls base/beamerbasearticle.sty
+description:
+Initial work on making beamerarticle more robust (i.e. using same package set that presentation mode includes so it doesn't fail in weird ways).
+
+Minor fix to make \beamer@version definition more consistent. It would probably be a good idea to define it in one place instead of two. Will think about it.
+
+
+changeset:   344:9643d7015401
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 20 22:51:12 2010 +0200
+files:       base/beamerbasecompatibility.sty
+description:
+Import fix for subfig by Kanru Chen.
+
+
+changeset:   343:8b34d0c9f803
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Tue Apr 20 22:48:18 2010 +0200
+files:       base/beamer.cls base/beamerarticle.sty base/beamerbasesection.sty base/beamerbasetitle.sty themes/inner/beamerinnerthemedefault.sty
+description:
+Bump version to 3.08, just to differ it from 3.07 floating around. Initial work on sectionpage in style of partpage. TODO:
+-- redesign and make separate styles in same way partpage has.
+-- fix compatibility with babel (it's Section regardless of babel language; not so with Part).
+
+
+changeset:   342:4a40d0469958
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 16 12:05:28 2010 +0200
+files:       base/beamerbasecompatibility.sty base/beamerbasetwoscreens.sty
+description:
+Import of geometry 5.0 compatibility fix by Karl Berry and Vladimir Lomov done in February 2010. More info: http://tug.org/pipermail/tex-live/2010-February/024834.html
+
+
+changeset:   341:11950b16aa05
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 16 11:57:19 2010 +0200
+files:       base/beamerbasetwoscreens.sty
+description:
+Import bugfix for \pgfpagescurrentpagewillbelogicalpage by herbert (hv) done one 2009-06-14.
+
+
+changeset:   340:8cb030d7c7ac
+user:        Vedran Miletić <rivanvx@gmail.com>
+date:        Fri Apr 16 11:28:27 2010 +0200
+files:       themes/color/beamercolorthemebeaver.sty
+description:
+Import of "Fixed syntax error in themes/color/beamercolorthemebeaver.sty (Ubuntu Launchpad: #232452)." by Tan Rui Boon <ruiboon@gmail.com>
+
+
+
+
+2007-07-04 Till Tantau <tantau@users.sourceforge.net>
+
+	- Fixed missing guards in optional arguments. (like \item[{hi[]}])
+
+2007-03-20 Till Tantau <tantau@users.sourceforge.net>
+
+	- Fixed superfluous entry in FILES
+	- Added "open" option in multimedia.sty.
+	- Fixed sound player problem.
+	- Fixed manifest files.
+	- Added handling of professional fonts mtpro2 and lucimatx.
+
 2007-03-11 Till Tantau <tantau@users.sourceforge.net>
 
-	CVS:
+	Version 3.07:
 	- LyX layout removed since it is now part of the LyX
 	  development tree.
 	- Cleaned up documentation.
diff --git a/Master/texmf-dist/doc/latex/beamer/FILES b/Master/texmf-dist/doc/latex/beamer/FILES
index 0fe02a9ca67..97509bc6108 100644
--- a/Master/texmf-dist/doc/latex/beamer/FILES
+++ b/Master/texmf-dist/doc/latex/beamer/FILES
@@ -1,203 +1,279 @@
-latex-beamer-3.07/AUTHORS
-latex-beamer-3.07/base/art/beamericonarticle.20.eps
-latex-beamer-3.07/base/art/beamericonarticle.20.pdf
-latex-beamer-3.07/base/art/beamericonarticle.eps
-latex-beamer-3.07/base/art/beamericonarticle.pdf
-latex-beamer-3.07/base/art/beamericonarticle.tex
-latex-beamer-3.07/base/art/beamericonbook.20.eps
-latex-beamer-3.07/base/art/beamericonbook.20.pdf
-latex-beamer-3.07/base/art/beamericonbook.eps
-latex-beamer-3.07/base/art/beamericonbook.pdf
-latex-beamer-3.07/base/art/beamericonbook.tex
-latex-beamer-3.07/base/beamer.cls
-latex-beamer-3.07/base/beamerarticle.sty
-latex-beamer-3.07/base/beamerbasearticle.sty
-latex-beamer-3.07/base/beamerbaseauxtemplates.sty
-latex-beamer-3.07/base/beamerbaseboxes.sty
-latex-beamer-3.07/base/beamerbasecolor.sty
-latex-beamer-3.07/base/beamerbasecompatibility.sty
-latex-beamer-3.07/base/beamerbasedecode.sty
-latex-beamer-3.07/base/beamerbaseexercise.sty
-latex-beamer-3.07/base/beamerbasefont.sty
-latex-beamer-3.07/base/beamerbaseframe.sty
-latex-beamer-3.07/base/beamerbaseframecomponents.sty
-latex-beamer-3.07/base/beamerbaseframesize.sty
-latex-beamer-3.07/base/beamerbaselocalstructure.sty
-latex-beamer-3.07/base/beamerbasemisc.sty
-latex-beamer-3.07/base/beamerbasemodes.sty
-latex-beamer-3.07/base/beamerbasenavigation.sty
-latex-beamer-3.07/base/beamerbasenotes.sty
-latex-beamer-3.07/base/beamerbaseoptions.sty
-latex-beamer-3.07/base/beamerbaseoverlay.sty
-latex-beamer-3.07/base/beamerbasercs.sty
-latex-beamer-3.07/base/beamerbasesection.sty
-latex-beamer-3.07/base/beamerbasetemplates.sty
-latex-beamer-3.07/base/beamerbasethemes.sty
-latex-beamer-3.07/base/beamerbasetheorems.sty
-latex-beamer-3.07/base/beamerbasetitle.sty
-latex-beamer-3.07/base/beamerbasetoc.sty
-latex-beamer-3.07/base/beamerbasetwoscreens.sty
-latex-beamer-3.07/base/beamerbaseverbatim.sty
-latex-beamer-3.07/ChangeLog
-latex-beamer-3.07/doc/beamercolorthemeexample.tex
-latex-beamer-3.07/doc/beamerfontthemeexample.tex
-latex-beamer-3.07/doc/beamerinnerthemeexample.tex
-latex-beamer-3.07/doc/beamerouterthemeexample.tex
-latex-beamer-3.07/doc/beamerthemeexample.tex
-latex-beamer-3.07/doc/beamerthemeexamplebase.tex
-latex-beamer-3.07/doc/beamerug-animations.tex
-latex-beamer-3.07/doc/beamerug-color.tex
-latex-beamer-3.07/doc/beamerug-compatibility.tex
-latex-beamer-3.07/doc/beamerug-elements.tex
-latex-beamer-3.07/doc/beamerug-emulation.tex
-latex-beamer-3.07/doc/beamerug-fonts.tex
-latex-beamer-3.07/doc/beamerug-frames.tex
-latex-beamer-3.07/doc/beamerug-globalstructure.tex
-latex-beamer-3.07/doc/beamerug-graphics.tex
-latex-beamer-3.07/doc/beamerug-guidelines.tex
-latex-beamer-3.07/doc/beamerug-installation.tex
-latex-beamer-3.07/doc/beamerug-interaction.tex
-latex-beamer-3.07/doc/beamerug-introduction.tex
-latex-beamer-3.07/doc/beamerug-license.tex
-latex-beamer-3.07/doc/beamerug-localstructure.tex
-latex-beamer-3.07/doc/beamerug-macros.tex
-latex-beamer-3.07/doc/beamerug-nonpresentation.tex
-latex-beamer-3.07/doc/beamerug-notes.tex
-latex-beamer-3.07/doc/beamerug-overlays.tex
-latex-beamer-3.07/doc/beamerug-solutions.tex
-latex-beamer-3.07/doc/beamerug-themes.tex
-latex-beamer-3.07/doc/beamerug-transparancies.tex
-latex-beamer-3.07/doc/beamerug-tricks.tex
-latex-beamer-3.07/doc/beamerug-tutorial.tex
-latex-beamer-3.07/doc/beamerug-twoscreens.tex
-latex-beamer-3.07/doc/beamerug-workflow.tex
-latex-beamer-3.07/doc/beameruserguide.pdf
-latex-beamer-3.07/doc/beameruserguide.tex
-latex-beamer-3.07/doc/licenses/gnu-free-documentation-license-1.2.txt
-latex-beamer-3.07/doc/licenses/gnu-public-license-2.txt
-latex-beamer-3.07/doc/licenses/latex-project-public-license-1.3c.txt
-latex-beamer-3.07/doc/licenses/LICENSE
-latex-beamer-3.07/doc/licenses/manifest-code.txt
-latex-beamer-3.07/doc/licenses/manifest-documentation.txt
-latex-beamer-3.07/doc/Makefile
-latex-beamer-3.07/emulation/beamerfoils.sty
-latex-beamer-3.07/emulation/beamerprosper.sty
-latex-beamer-3.07/emulation/beamerseminar.sty
-latex-beamer-3.07/emulation/beamertexpower.sty
-latex-beamer-3.07/emulation/examples/beamerexample-foils.tex
-latex-beamer-3.07/emulation/examples/beamerexample-prosper.tex
-latex-beamer-3.07/emulation/examples/beamerexample-seminar.tex
-latex-beamer-3.07/emulation/examples/beamerexample-texpower.tex
-latex-beamer-3.07/examples/a-conference-talk/beamerexample-conference-talk.pdf
-latex-beamer-3.07/examples/a-conference-talk/beamerexample-conference-talk.tex
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-beamer-version.pdf
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-beamer-version.tex
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-beamer-version.tex~
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-body.tex
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-logo.pdf
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic1.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic2.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic3.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic4.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic5.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-pic6.jpg
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-print-version.pdf
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-print-version.tex
-latex-beamer-3.07/examples/a-lecture/beamerexample-lecture-style.tex
-latex-beamer-3.07/examples/lyx-based-presentation/beamerexample-lyx.lyx
-latex-beamer-3.07/extensions/multimedia/multimedia.sty
-latex-beamer-3.07/extensions/multimedia/multimediasymbols.sty
-latex-beamer-3.07/extensions/multimedia/xmpmulti.sty
-latex-beamer-3.07/FILES
-latex-beamer-3.07/INSTALL
-latex-beamer-3.07/README
-latex-beamer-3.07/solutions/conference-talks/conference-ornate-20min.de.lyx
-latex-beamer-3.07/solutions/conference-talks/conference-ornate-20min.de.tex
-latex-beamer-3.07/solutions/conference-talks/conference-ornate-20min.en.lyx
-latex-beamer-3.07/solutions/conference-talks/conference-ornate-20min.en.tex
-latex-beamer-3.07/solutions/conference-talks/conference-ornate-20min.fr.tex
-latex-beamer-3.07/solutions/generic-talks/generic-ornate-15min-45min.de.lyx
-latex-beamer-3.07/solutions/generic-talks/generic-ornate-15min-45min.de.tex
-latex-beamer-3.07/solutions/generic-talks/generic-ornate-15min-45min.en.lyx
-latex-beamer-3.07/solutions/generic-talks/generic-ornate-15min-45min.en.tex
-latex-beamer-3.07/solutions/generic-talks/generic-ornate-15min-45min.fr.tex
-latex-beamer-3.07/solutions/short-talks/speaker_introduction-ornate-2min.de.lyx
-latex-beamer-3.07/solutions/short-talks/speaker_introduction-ornate-2min.de.tex
-latex-beamer-3.07/solutions/short-talks/speaker_introduction-ornate-2min.en.lyx
-latex-beamer-3.07/solutions/short-talks/speaker_introduction-ornate-2min.en.tex
-latex-beamer-3.07/solutions/short-talks/speaker_introduction-ornate-2min.fr.tex
-latex-beamer-3.07/themes/color/beamercolorthemealbatross.sty
-latex-beamer-3.07/themes/color/beamercolorthemebeaver.sty
-latex-beamer-3.07/themes/color/beamercolorthemebeetle.sty
-latex-beamer-3.07/themes/color/beamercolorthemecrane.sty
-latex-beamer-3.07/themes/color/beamercolorthemedefault.sty
-latex-beamer-3.07/themes/color/beamercolorthemedolphin.sty
-latex-beamer-3.07/themes/color/beamercolorthemedove.sty
-latex-beamer-3.07/themes/color/beamercolorthemefly.sty
-latex-beamer-3.07/themes/color/beamercolorthemelily.sty
-latex-beamer-3.07/themes/color/beamercolorthemeorchid.sty
-latex-beamer-3.07/themes/color/beamercolorthemerose.sty
-latex-beamer-3.07/themes/color/beamercolorthemeseagull.sty
-latex-beamer-3.07/themes/color/beamercolorthemeseahorse.sty
-latex-beamer-3.07/themes/color/beamercolorthemesidebartab.sty
-latex-beamer-3.07/themes/color/beamercolorthemestructure.sty
-latex-beamer-3.07/themes/color/beamercolorthemewhale.sty
-latex-beamer-3.07/themes/color/beamercolorthemewolverine.sty
-latex-beamer-3.07/themes/font/beamerfontthemedefault.sty
-latex-beamer-3.07/themes/font/beamerfontthemeprofessionalfonts.sty
-latex-beamer-3.07/themes/font/beamerfontthemeserif.sty
-latex-beamer-3.07/themes/font/beamerfontthemestructurebold.sty
-latex-beamer-3.07/themes/font/beamerfontthemestructureitalicserif.sty
-latex-beamer-3.07/themes/font/beamerfontthemestructuresmallcapsserif.sty
-latex-beamer-3.07/themes/inner/beamerinnerthemecircles.sty
-latex-beamer-3.07/themes/inner/beamerinnerthemedefault.sty
-latex-beamer-3.07/themes/inner/beamerinnerthemeinmargin.sty
-latex-beamer-3.07/themes/inner/beamerinnerthemerectangles.sty
-latex-beamer-3.07/themes/inner/beamerinnerthemerounded.sty
-latex-beamer-3.07/themes/outer/beamerouterthemedefault.sty
-latex-beamer-3.07/themes/outer/beamerouterthemeinfolines.sty
-latex-beamer-3.07/themes/outer/beamerouterthememiniframes.sty
-latex-beamer-3.07/themes/outer/beamerouterthemeshadow.sty
-latex-beamer-3.07/themes/outer/beamerouterthemesidebar.sty
-latex-beamer-3.07/themes/outer/beamerouterthemesmoothbars.sty
-latex-beamer-3.07/themes/outer/beamerouterthemesmoothtree.sty
-latex-beamer-3.07/themes/outer/beamerouterthemesplit.sty
-latex-beamer-3.07/themes/outer/beamerouterthemetree.sty
-latex-beamer-3.07/themes/theme/beamerthemeAnnArbor.sty
-latex-beamer-3.07/themes/theme/beamerthemeAntibes.sty
-latex-beamer-3.07/themes/theme/beamerthemeBergen.sty
-latex-beamer-3.07/themes/theme/beamerthemeBerkeley.sty
-latex-beamer-3.07/themes/theme/beamerthemeBerlin.sty
-latex-beamer-3.07/themes/theme/beamerthemeBoadilla.sty
-latex-beamer-3.07/themes/theme/beamerthemeboxes.sty
-latex-beamer-3.07/themes/theme/beamerthemeCambridgeUS.sty
-latex-beamer-3.07/themes/theme/beamerthemeCopenhagen.sty
-latex-beamer-3.07/themes/theme/beamerthemeDarmstadt.sty
-latex-beamer-3.07/themes/theme/beamerthemedefault.sty
-latex-beamer-3.07/themes/theme/beamerthemeDresden.sty
-latex-beamer-3.07/themes/theme/beamerthemeFrankfurt.sty
-latex-beamer-3.07/themes/theme/beamerthemeGoettingen.sty
-latex-beamer-3.07/themes/theme/beamerthemeHannover.sty
-latex-beamer-3.07/themes/theme/beamerthemeIlmenau.sty
-latex-beamer-3.07/themes/theme/beamerthemeJuanLesPins.sty
-latex-beamer-3.07/themes/theme/beamerthemeLuebeck.sty
-latex-beamer-3.07/themes/theme/beamerthemeMadrid.sty
-latex-beamer-3.07/themes/theme/beamerthemeMalmoe.sty
-latex-beamer-3.07/themes/theme/beamerthemeMarburg.sty
-latex-beamer-3.07/themes/theme/beamerthemeMontpellier.sty
-latex-beamer-3.07/themes/theme/beamerthemePaloAlto.sty
-latex-beamer-3.07/themes/theme/beamerthemePittsburgh.sty
-latex-beamer-3.07/themes/theme/beamerthemeRochester.sty
-latex-beamer-3.07/themes/theme/beamerthemeSingapore.sty
-latex-beamer-3.07/themes/theme/beamerthemeSzeged.sty
-latex-beamer-3.07/themes/theme/beamerthemeWarsaw.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemebars.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemeclassic.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemecompatibility.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemelined.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemeplain.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemeshadow.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemesidebar.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemesplit.sty
-latex-beamer-3.07/themes/theme/compatibility/beamerthemetree.sty
-latex-beamer-3.07/TODO
+.:
+AUTHORS
+base/
+ChangeLog
+doc/
+emacs/
+emulation/
+examples/
+extensions/
+FILES
+INSTALL
+README
+solutions/
+themes/
+TODO
+
+./base:
+art/
+beamerarticle.sty
+beamerbasearticle.sty
+beamerbaseauxtemplates.sty
+beamerbaseboxes.sty
+beamerbasecolor.sty
+beamerbasecompatibility.sty
+beamerbasedecode.sty
+beamerbaseexercise.sty
+beamerbasefont.sty
+beamerbaseframecomponents.sty
+beamerbaseframesize.sty
+beamerbaseframe.sty
+beamerbaselocalstructure.sty
+beamerbasemisc.sty
+beamerbasemodes.sty
+beamerbasenavigation.sty
+beamerbasenotes.sty
+beamerbaseoptions.sty
+beamerbaseoverlay.sty
+beamerbasercs.sty
+beamerbaserequires.sty
+beamerbasesection.sty
+beamerbasetemplates.sty
+beamerbasethemes.sty
+beamerbasetheorems.sty
+beamerbasetitle.sty
+beamerbasetoc.sty
+beamerbasetranslator.sty
+beamerbasetwoscreens.sty
+beamerbaseverbatim.sty
+beamer.cls
+
+./base/art:
+beamericonarticle.20.eps
+beamericonarticle.20.pdf
+beamericonarticle.eps
+beamericonarticle.pdf
+beamericonarticle.tex
+beamericonbook.20.eps
+beamericonbook.20.pdf
+beamericonbook.eps
+beamericonbook.pdf
+beamericonbook.tex
+
+./doc:
+beamercolorthemeexample.tex
+beamerfontthemeexample.tex
+beamerinnerthemeexample.tex
+beamerouterthemeexample.tex
+beamerthemeexamplebase.tex
+beamerthemeexample.tex
+beamerug-animations.tex
+beamerug-color.tex
+beamerug-compatibility.tex
+beamerug-elements.tex
+beamerug-emulation.tex
+beamerug-fonts.tex
+beamerug-frames.tex
+beamerug-globalstructure.tex
+beamerug-graphics.tex
+beamerug-guidelines.tex
+beamerug-installation.tex
+beamerug-interaction.tex
+beamerug-introduction.tex
+beamerug-license.tex
+beamerug-localstructure.tex
+beamerug-macros.tex
+beamerug-nonpresentation.tex
+beamerug-notes.tex
+beamerug-overlays.tex
+beamerug-solutions.tex
+beamerug-themes.tex
+beamerug-transparancies.tex
+beamerug-tricks.tex
+beamerug-tutorial.tex
+beamerug-twoscreens.tex
+beamerug-workflow.tex
+beameruserguide.pdf
+beameruserguide.tex
+licenses/
+Makefile
+themeexamples/
+
+./doc/licenses:
+LICENSE
+
+./doc/themeexamples:
+beamerthemeexample.tex
+beamerthememakeexamples.sh
+
+./emacs:
+beamer.el
+
+./emulation:
+beamerfoils.sty
+beamerprosper.sty
+beamerseminar.sty
+beamertexpower.sty
+examples/
+
+./emulation/examples:
+beamerexample-foils.tex
+beamerexample-prosper.tex
+beamerexample-seminar.tex
+beamerexample-texpower.tex
+
+./examples:
+a-conference-talk/
+a-lecture/
+lyx-based-presentation/
+Makefile
+
+./examples/a-conference-talk:
+beamerexample-conference-talk.pdf
+beamerexample-conference-talk.tex
+
+./examples/a-lecture:
+beamerexample-lecture-beamer-version.pdf
+beamerexample-lecture-beamer-version.tex
+beamerexample-lecture-body.tex
+beamerexample-lecture-logo.pdf
+beamerexample-lecture-pic1.jpg
+beamerexample-lecture-pic2.jpg
+beamerexample-lecture-pic3.jpg
+beamerexample-lecture-pic4.jpg
+beamerexample-lecture-pic5.jpg
+beamerexample-lecture-pic6.jpg
+beamerexample-lecture-print-version.pdf
+beamerexample-lecture-print-version.tex
+beamerexample-lecture-style.tex
+
+./examples/lyx-based-presentation:
+beamerexample-lyx.lyx
+
+./extensions:
+multimedia/
+
+./extensions/multimedia:
+multimedia.sty
+multimediasymbols.sty
+xmpmulti.sty
+
+./solutions:
+conference-talks/
+generic-talks/
+short-talks/
+
+./solutions/conference-talks:
+conference-ornate-20min.de.lyx
+conference-ornate-20min.de.tex
+conference-ornate-20min.en.lyx
+conference-ornate-20min.en.tex
+conference-ornate-20min.fr.tex
+
+./solutions/generic-talks:
+generic-ornate-15min-45min.de.lyx
+generic-ornate-15min-45min.de.tex
+generic-ornate-15min-45min.en.lyx
+generic-ornate-15min-45min.en.tex
+generic-ornate-15min-45min.fr.tex
+
+./solutions/short-talks:
+speaker_introduction-ornate-2min.de.lyx
+speaker_introduction-ornate-2min.de.tex
+speaker_introduction-ornate-2min.en.lyx
+speaker_introduction-ornate-2min.en.tex
+speaker_introduction-ornate-2min.fr.tex
+
+./themes:
+color/
+font/
+inner/
+outer/
+theme/
+
+./themes/color:
+beamercolorthemealbatross.sty
+beamercolorthemebeaver.sty
+beamercolorthemebeetle.sty
+beamercolorthemecrane.sty
+beamercolorthemedefault.sty
+beamercolorthemedolphin.sty
+beamercolorthemedove.sty
+beamercolorthemefly.sty
+beamercolorthemelily.sty
+beamercolorthemeorchid.sty
+beamercolorthemerose.sty
+beamercolorthemeseagull.sty
+beamercolorthemeseahorse.sty
+beamercolorthemesidebartab.sty
+beamercolorthemestructure.sty
+beamercolorthemewhale.sty
+beamercolorthemewolverine.sty
+
+./themes/font:
+beamerfontthemedefault.sty
+beamerfontthemeprofessionalfonts.sty
+beamerfontthemeserif.sty
+beamerfontthemestructurebold.sty
+beamerfontthemestructureitalicserif.sty
+beamerfontthemestructuresmallcapsserif.sty
+
+./themes/inner:
+beamerinnerthemecircles.sty
+beamerinnerthemedefault.sty
+beamerinnerthemeinmargin.sty
+beamerinnerthemerectangles.sty
+beamerinnerthemerounded.sty
+
+./themes/outer:
+beamerouterthemedefault.sty
+beamerouterthemeinfolines.sty
+beamerouterthememiniframes.sty
+beamerouterthemeshadow.sty
+beamerouterthemesidebar.sty
+beamerouterthemesmoothbars.sty
+beamerouterthemesmoothtree.sty
+beamerouterthemesplit.sty
+beamerouterthemetree.sty
+
+./themes/theme:
+beamerthemeAnnArbor.sty
+beamerthemeAntibes.sty
+beamerthemeBergen.sty
+beamerthemeBerkeley.sty
+beamerthemeBerlin.sty
+beamerthemeBoadilla.sty
+beamerthemeboxes.sty
+beamerthemeCambridgeUS.sty
+beamerthemeCopenhagen.sty
+beamerthemeDarmstadt.sty
+beamerthemedefault.sty
+beamerthemeDresden.sty
+beamerthemeFrankfurt.sty
+beamerthemeGoettingen.sty
+beamerthemeHannover.sty
+beamerthemeIlmenau.sty
+beamerthemeJuanLesPins.sty
+beamerthemeLuebeck.sty
+beamerthemeMadrid.sty
+beamerthemeMalmoe.sty
+beamerthemeMarburg.sty
+beamerthemeMontpellier.sty
+beamerthemePaloAlto.sty
+beamerthemePittsburgh.sty
+beamerthemeRochester.sty
+beamerthemeSingapore.sty
+beamerthemeSzeged.sty
+beamerthemeWarsaw.sty
+compatibility/
+
+./themes/theme/compatibility:
+beamerthemebars.sty
+beamerthemeclassic.sty
+beamerthemecompatibility.sty
+beamerthemelined.sty
+beamerthemeplain.sty
+beamerthemeshadow.sty
+beamerthemesidebar.sty
+beamerthemesplit.sty
+beamerthemetree.sty
diff --git a/Master/texmf-dist/doc/latex/beamer/INSTALL b/Master/texmf-dist/doc/latex/beamer/INSTALL
index 0253c579ab8..60cf396cb57 100644
--- a/Master/texmf-dist/doc/latex/beamer/INSTALL
+++ b/Master/texmf-dist/doc/latex/beamer/INSTALL
@@ -1,49 +1,27 @@
-------------------------------------------------------------
-1. Installing the beamer class:
-------------------------------------------------------------
+Installing the Beamer class
+===========================
 
-TeX stuff:
+* TeX stuff:
 
-+ For the impatient: 
+  + For the impatient:
 
-  Put all files somewhere where TeX can find them. Also install the
-  following packages somewhere where TeX can find them:  
+    Put all files somewhere where TeX can find them. Also install the following
+    packages somewhere where TeX can find them:
 
-  - pgf, version >= 1.00
-  - xcolor, version >= 2.00
+    - pgf, version >= 1.00
+    - xcolor, version >= 2.00
 
-+ Long version:
+   + Long version:
 
-  In the user's guide, which you find in the file
-  doc/beameruserguide.pdf, you will find a detailed explanation on how
-  to install the beamer class.
+     In the users guide, which you can find in the file doc/beameruserguide.pdf,
+     you will find a detailed explanation on how to install the beamer class.
 
+* LyX Stuff:
 
-LyX Stuff:
+  The LyX documentation is part of the users guide doc/beameruserguide.pdf. It
+  also explains how to install the LyX-related files.
 
-The LyX documentation is also in the main documentation file
-doc/beameruserguide.pdf. It also explains how to install the LyX
-related files.
-
-
-Emacs Stuff:
-
-There is a file emacs/beamer.el that adds some beamer stuff to emacs'
-AucTeX mode. Read the instructions in that file on how to install it.
-
-
-------------------------------------------------------------
-2. License
-------------------------------------------------------------
-
-The beamer class is licensed under the GPL, Version 2, see the
-documentation for details. 
-
-
-------------------------------------------------------------
-3. Bugs, suggestions, contact with the authors
-------------------------------------------------------------
-
-Go to http://sourceforge.net/projects/latex-beamer/ to submit bug
-reports, request new features, etc.
+* Emacs Stuff:
 
+  There is a file emacs/beamer.el that adds some beamer stuff to emacs' AucTeX
+  mode. Read the instructions in that file on how to install it.
diff --git a/Master/texmf-dist/doc/latex/beamer/README b/Master/texmf-dist/doc/latex/beamer/README
index 92ac8f6a077..c685108704c 100644
--- a/Master/texmf-dist/doc/latex/beamer/README
+++ b/Master/texmf-dist/doc/latex/beamer/README
@@ -1,11 +1,9 @@
-beamer -- A LaTeX class for producing presentations
-
-See the documentation in doc/beameruserguide.pdf for a user
-manual. Read the INSTALL file for installing the class on your 
-system.
-
-Please go to http://sourceforge.net/projects/latex-beamer/
-to submit bug reports, request new features, etc.
-
+Beamer---A LaTeX class for producing presentations
+==================================================
 
+* See the documentation in doc/beameruserguide.pdf for a user manual.
+* See the information in doc/licenses/LICENSE for information on licensing.
+* Read the INSTALL file for installing the class on your system.
 
+Please go to http://bitbucket.org/rivanvx/beamer to submit bug reports,
+request new features, etc.
diff --git a/Master/texmf-dist/doc/latex/beamer/TODO b/Master/texmf-dist/doc/latex/beamer/TODO
index e127f061db6..4e4fad305f2 100644
--- a/Master/texmf-dist/doc/latex/beamer/TODO
+++ b/Master/texmf-dist/doc/latex/beamer/TODO
@@ -1,24 +1,28 @@
- 1) Some commands for creating a lecture title page.
- 2) Perhaps add an way of showing photos of the authors and the
-    institutes in a convenient way.
- 3) Add more artwork.
- 4) Add an faq section.
- 5) Add miniframes and list of frames.
- 6) Add commands for creating toc entries without nav entries.
- 8) Make beamer compatible with bibentry.
- 9) Make beamer compatible with caption package.
-10) Make beamer compatible with acrotex.
-11) Make label= create a special label for the last slide of a frame.
-12) Perhaps add the option of creating "slide labels" for overlay
-    specs.
-13) Add options for absolute and relative positioning the logo.
-14) Make \part create entries in toc, if desired.
-15) Add poster support, 16:10 support, 16:9 support.
-16) Make beamer compatible with ntheorem.
-17) Reset color mixin after group.
-18) Make \label work accross lectures.
-19) Show short forms of (sub)sections on notes.
-20) Add debug mode for finding errors more easily in TeX and LyX.
-21) Throw away textpos boxes after suppressed pages.
-22) Make pgfpages work together with everyshipout.
-23) Make \emph work inside \section commands.
+ToDo list
+=========
+
+* Some commands for creating a lecture title page.
+* Make \label work accross lectures.
+* Perhaps add an way of showing photos of the authors and the institutes in a convenient way.
+* Add more artwork.
+* Add an faq section to users guide.
+* Add miniframes and list of frames.
+* Add commands for creating toc entries without nav entries.
+* Make beamer compatible with bibentry.
+* Make beamer compatible with caption package.
+* Make beamer compatible with acrotex.
+* Make beamer work with biblatex in a nicer way.
+* Make beamer more compatible with XeLaTeX.
+* Make label= create a special label for the last slide of a frame.
+* Perhaps add the option of creating "slide labels" for overlay specs.
+* Add options for absolute and relative positioning the logo.
+* Make \part create entries in toc, if desired.
+* Add poster support. Maybe even contact beamerposter authors about integrating it with beamer.
+* Make beamer compatible with ntheorem.
+* Reset color mixing after group.
+* Show short forms of (sub)sections on notes.
+* Add debug mode for finding errors more easily in TeX and LyX.
+* Throw away textpos boxes after suppressed pages.
+* Make pgfpages work together with everyshipout.
+* Make \emph work inside \section commands.
+* Make all strings use translator and extend translator if necessary.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/Makefile b/Master/texmf-dist/doc/latex/beamer/doc/Makefile
index cc1cca8abd7..3cfa5acf72e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/Makefile
+++ b/Master/texmf-dist/doc/latex/beamer/doc/Makefile
@@ -61,4 +61,4 @@ beamerugoutertheme%.pdf: beamerouterthemeexample.tex beamerthemeexamplebase.tex
 	mv beamerouterthemeexample.pdf $@
 
 clean:
-	rm -f *.aux *.log *.bbl *.blg *.ps *.dvi *.pdf *.toc *.out *.snm
+	rm -f *.aux *.bbl *-blx.bib *.bcf *.blg *.fdb_latexmk *.idx *.ilg *.ind *.log *mpgraph.mp *.nav *.out *.snm *.synctex.gz *.tmp *.toc *.tui *.tuc *.tuo *.vrb *~ beamerug*.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamercolorthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamercolorthemeexample.tex
index 2d933fc130f..1694b9a0e55 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamercolorthemeexample.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamercolorthemeexample.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamercolorthemeexample.tex,v 1.12 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \documentclass[hyperref={draft}]{beamer}
 
@@ -60,8 +61,4 @@
 \fi
 
 
-
-
 \input{beamerthemeexamplebase}
-
-
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerfontthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerfontthemeexample.tex
index 7aad193a61a..cf2c500e0ff 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerfontthemeexample.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerfontthemeexample.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerfontthemeexample.tex,v 1.6 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \documentclass[hyperref={draft}]{beamer}
 
@@ -17,4 +18,5 @@
 
 \usefonttheme{\themename}
 
+
 \input{beamerthemeexamplebase}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerinnerthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerinnerthemeexample.tex
index 7a41186f9e4..9c482fd5d61 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerinnerthemeexample.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerinnerthemeexample.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerinnerthemeexample.tex,v 1.3 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \documentclass[hyperref={draft}]{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerouterthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerouterthemeexample.tex
index 2223eb75280..e061b811e7e 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerouterthemeexample.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerouterthemeexample.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerouterthemeexample.tex,v 1.3 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \documentclass[hyperref={draft}]{beamer}
 
@@ -18,4 +19,5 @@
 \useoutertheme{\themename}
 \usecolortheme{seahorse}
 
+
 \input{beamerthemeexamplebase}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexample.tex
index 0643d9f8680..120f8e1a09c 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexample.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexample.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerthemeexample.tex,v 1.7 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \documentclass[hyperref={draft}]{beamer}
 
@@ -17,4 +18,5 @@
 
 \usetheme{\themename}
 
+
 \input{beamerthemeexamplebase}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexamplebase.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexamplebase.tex
index c139210e3b8..0511af30cf2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexamplebase.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerthemeexamplebase.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerthemeexamplebase.tex,v 1.6 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \beamertemplatesolidbackgroundcolor{black!5}
 \beamertemplatetransparentcovered
@@ -46,10 +47,8 @@
     \item<2-> Let $q$ be the product of the first $p$ numbers.
     \item<3-> Then $q$\;+\,$1$ is not divisible by any of them.
     \item<1-> Thus $q$\;+\,$1$ is also prime and greater than $p$.\qedhere
-    \end{enumerate}      
+    \end{enumerate}
   \end{proof}
 \end{frame}
 
 \end{document}
-
-
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
index 6bd72b91e4f..cb283bb43e7 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-animations.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,102 +8,38 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-animations.tex,v 1.4 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Animations, Sounds, and Slide Transitions}
 
+
 \subsection{Animations}
 
 \subsubsection{Including External Animation Files}
-
 \label{section-multimedia}
 
-If you have created an animation using some external
-program (like a renderer), you can use the capabilities of the
-presentation program (like the Acrobat Reader) to show the
-animation. Unfortunately, currently there is no portable way of doing
-this and even the Acrobat Reader does not support this feature on all
-platforms.
+If you have created an animation using some external program (like a renderer), you can use the capabilities of the presentation program (like the Acrobat Reader) to show the animation. Unfortunately, currently there is no portable way of doing this and even the Acrobat Reader does not support this feature on all platforms.
 
-To include an animation in a presentation, you can use, for example,
-the package |multimedia.sty| which is part of the \beamer\
-package. You have to include this package explicitly. Despite being
-distributed as part of the \beamer\ distribution, this package is
-perfectly self-sufficient and can be used independently of \beamer.
+To include an animation in a presentation, you can use, for example, the package |multimedia.sty| which is part of the \beamer\ package. You have to include this package explicitly. Despite being distributed as part of the \beamer\ distribution, this package is perfectly self-sufficient and can be used independently of \beamer.
 
 \begin{package}{{multimedia}}
-  A stand-alone package that implements several commands for including
-  external animation and sound files in a \pdf\ document. The package
-  can be used together with both |dvips| plus |ps2pdf| and |pdflatex|,
-  though the special sound support is available only in |pdflatex|.
-
-  When including this package, you must also include the |hyperref|
-  package. Since you will typically want to include |hyperref| only at
-  the very end of the preamble, |multimedia| will not include
-  |hyperref| itself. However, |multimedia| can be included both before
-  and after |hyperref|. Since \beamer\ includes |hyperref|
-  automatically, you need not worry about this when creating a
-  presentation using \beamer.
+  A stand-alone package that implements several commands for including external animation and sound files in a \pdf\ document. The package can be used together with both |dvips| plus |ps2pdf| and |pdflatex|, though the special sound support is available only in |pdflatex|.
+
+  When including this package, you must also include the |hyperref| package. Since you will typically want to include |hyperref| only at the very end of the preamble, |multimedia| will not include |hyperref| itself. However, |multimedia| can be included both before and after |hyperref|. Since \beamer\ includes |hyperref| automatically, you need not worry about this when creating a presentation using \beamer.
 \end{package}
 
-For including an animation in a \pdf\ file, you can use the command
-|\movie|, which is explained below. Depending on the used options,
-this command will either setup the \pdf\ file such that the viewer
-application (like the Acrobat Reader) itself will try to play the
-movie or that an external program will be called. The latter approach,
-though much less flexible, must be taken if the viewer application is
-unable to display the movie itself.
-
-\begin{command}{\movie\oarg{options}\marg{poster text}\marg{movie
-  filename}} 
-  This command will insert the movie with the filename \meta{movie
-  filename} into the \pdf\ file. The movie file must reside at some
-  place where the viewer application will be able to find it,
-  which is typically only the directory in which the final \pdf\ file
-  resides. The movie file will \emph{not} be embedded into the \pdf\
-  file in the sense that the actual movie data is part of the
-  |main.pdf| file. The movie file must hence be copied and passed
-  along with the \pdf\ file. (Nevertheless, one often says that the
-  movie is ``embedded'' in the document, but that just means that one can
-  click on the movie when viewing the document and the movie will
-  start to play.) 
-
-  The movie will use a rectangular area whose size is determined
-  either by the |width=| and |height=| options or by the size of the
-  \meta{poster text}. The \meta{poster text} can be any \TeX\ text;
-  for example, it might be a |\pgfuseimage| command or an
-  |\includegraphics| command or a |pgfpicture| environment or just
-  plain text. The \meta{poster text} is typeset in a box, the box is
-  inserted into the normal text, and the movie rectangle is put
-  exactly over this box. Thus, if the \meta{poster text} is an image
-  from the movie, this image will be shown until the movie is started,
-  when it will be exactly replaced by the movie itself. However, there
-  is also a different, sometimes better, way of creating a poster image,
-  namely by using the |poster| option as explained later on.
-
-  The aspect ratio of the movie will \emph{not} be corrected
-  automatically if the dimension of the \meta{poster text} box does
-  not have the same aspect ratio. Most movies have an aspect ratio of
-  4:3 or 16:9.
-
-  Despite the name, a movie may consist only of sound with no
-  images. In this case, the \meta{posert text} might be a symbol
-  representing the sound. There is also a different, dedicated
-  command for including sounds in a \pdf\ file, see the |\sound|
-  command in Section~\ref{section-sound}. 
-
-  Unless further options are given, the movie will start only when the
-  user clicks on it. Whether the viewer application can actually
-  display the movie depends on the application and the version. For
-  example, the Acrobat Reader up to version~5 does not seem to be able
-  to display any movies or sounds on Linux. On the other hand, the
-  Acrobat Reader Version~6 on MacOS is able to display anything that
-  QuickTime can display, which is just about everything. Embedding
-  movies in a \pdf\ document is provided for by the \pdf\ standard and
-  is not a peculiarity of the Acrobat Reader. In particular, one might
-  expect other viewers like |xpdf| to support embedded movies in the
-  future.
+For including an animation in a \pdf\ file, you can use the command |\movie|, which is explained below. Depending on the used options, this command will either setup the \pdf\ file such that the viewer application (like the Acrobat Reader) itself will try to play the movie or that an external program will be called. The latter approach, though much less flexible, must be taken if the viewer application is unable to display the movie itself.
+
+\begin{command}{\movie\oarg{options}\marg{poster text}\marg{movie filename}}
+  This command will insert the movie with the filename \meta{movie filename} into the \pdf\ file. The movie file must reside at some place where the viewer application will be able to find it, which is typically only the directory in which the final \pdf\ file resides. The movie file will \emph{not} be embedded into the \pdf\ file in the sense that the actual movie data is part of the |main.pdf| file. The movie file must hence be copied and passed along with the \pdf\ file. (Nevertheless, one often says that the movie is ``embedded'' in the document, but that just means that one can click on the movie when viewing the document and the movie will start to play.)
+
+  The movie will use a rectangular area whose size is determined either by the |width=| and |height=| options or by the size of the \meta{poster text}. The \meta{poster text} can be any \TeX\ text; for example, it might be a |\pgfuseimage| command or an |\includegraphics| command or a |pgfpicture| environment or just plain text. The \meta{poster text} is typeset in a box, the box is inserted into the normal text, and the movie rectangle is put exactly over this box. Thus, if the \meta{poster text} is an image from the movie, this image will be shown until the movie is started, when it will be exactly replaced by the movie itself. However, there is also a different, sometimes better, way of creating a poster image, namely by using the |poster| option as explained later on.
+
+  The aspect ratio of the movie will \emph{not} be corrected automatically if the dimension of the \meta{poster text} box does not have the same aspect ratio. Most movies have an aspect ratio of 4:3 or 16:9.
+
+  Despite the name, a movie may consist only of sound with no images. In this case, the \meta{poster text} might be a symbol representing the sound. There is also a different, dedicated command for including sounds in a \pdf\ file, see the |\sound| command in Section~\ref{section-sound}.
+
+  Unless further options are given, the movie will start only when the user clicks on it. Whether the viewer application can actually display the movie depends on the application and the version. For example, the Acrobat Reader up to version~5 does not seem to be able to display any movies or sounds on Linux. On the other hand, the Acrobat Reader Version~6 on MacOS is able to display anything that QuickTime can display, which is just about everything. Embedding movies in a \pdf\ document is provided for by the \pdf\ standard and is not a peculiarity of the Acrobat Reader. In particular, one might expect other viewers like |xpdf| and |poppler|-based viewers (Okular, Evince) to support embedded movies in the future.
 
   \example
   |\movie{\pgfuseimage{myposterimage}}{mymovie.avi}|
@@ -110,106 +47,54 @@ unable to display the movie itself.
   \example
   |\movie[width=3cm,height=2cm,poster]{}{mymovie.mpg}|
 
-  If your viewer application is not able to render your movie, but
-  some external application is, you must use the |externalviewer|
-  option. This will ask the viewer application to launch an
-  application for showing the movie instead of displaying it
-  itself. Since this application is started in a new window, this not
-  nearly as nice as having the movie be displayed directly by the
-  viewer (unless you use evil trickery to suppress the frame of the
-  viewer application). Which application is chosen is left to the
-  discreetion of the viewer application, which tries to make its
-  choice according to the extension of the \meta{movie filename} and
-  according to some mapping table for mapping extensions 
-  to viewer applications. How this mapping table can be modified
-  depends on the viewer application, please see the release notes of
-  your viewer.
-  
+  If your viewer application is not able to render your movie, but some external application is, you must use the |externalviewer| option. This will ask the viewer application to launch an application for showing the movie instead of displaying it itself. Since this application is started in a new window, this is not nearly as nice as having the movie displayed directly by the viewer (unless you use evil trickery to suppress the frame of the viewer application). Which application is chosen is left to the discretion of the viewer application, which tries to make its choice according to the extension of the \meta{movie filename} and according to some mapping table for mapping extensions to viewer applications. How this mapping table can be modified depends on the viewer application, please see the release notes of your viewer.
+
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|autostart|}. Causes the movie to start playing immediately
-    when the page is shown. At most one movie can be started in this
-    way. The viewer application will typically be able to show only at
-    most one movie at the same time anyway. When the page is no longer
-    shown, the movie immediately stops. This can be a problem if you
-    use the |\movie| command to include a sound that should be played
-    on after the page has been closed. In this case, the |\sound|
-    command must be used.
-  \item
-    \declare{|borderwidth=|}\meta{\TeX\ dimension}. Causes a border of
-    thickness \meta{\TeX\ dimension} to be drawn around the
-    movie. Some versions of the Acrobat Reader seem to have a bug and
-    do not display this border if is smaller than 0.5bp (about
-    0.51pt).
-  \item
-    \declare{|depth=|}\meta{\TeX\ dimension}. Overrides the depth of the
-    \meta{poster text} box and sets it to the given dimension.
-  \item
-    \declare{|duration=|}\meta{time}|s|. Specifies in seconds how long
-    the movie should be shown. The \meta{time} may be a fractional
-    value and must be followed by the letter |s|. For example,
-    |duration=1.5s| will show the movie for one and a half seconds. In
-    conjunction with the |start| option, you can ``cut out'' a part of
-    a movie for display.
-  \item
-    \declare{|externalviewer|}. As explained above, this causes an
-    external application to be launched for displaying the movie in a
-    separate window. Most options, like |duration| or |loop|, have no
-    effect since they are not passed along to the viewer application.
-  \item
-    \declare{|height=|}\meta{\TeX\ dimension}. Overrides the height of the
-    \meta{poster text} box and sets it to the given dimension.
-  \item
-    \declare{|label=|}\meta{movie label}. Assigns a label to the movie
-    such that it can later be referenced by the command
-    |\hyperlinkmovie|, which can be used to stop the movie or to show
-    a different part of it. The \meta{movie label} is not a normal
-    label. It should not be too fancy, since it is inserted literally
-    into the \pdf\ code. In particular, it should not contain closing
-    parentheses. 
-  \item
-    \declare{|loop|}. Causes the movie to start again when the end has
-    been reached. Normally, the movie just stops at the end.
-  \item
-    \declare{|once|}. Causes the movie to just stop at the end. This is
-    the default.
-  \item
-    \declare{|palindrome|}. Causes the movie to start playing backwards
-    when the end has been reached, and to start playing forward once
-    more when the beginning is reached, and so on.
-  \item
-    \declare{|poster|}. Asks the viewer application to show the first
-    image of the movie when the movie is not playing. Normally,
-    nothing is shown when the movie is not playing (and thus the box
-    containing the \meta{poster text} is shown). For a movie that does
-    not have any images (but sound) or for movies with an
-    uninformative first image this option is not so useful.
+    \declare{|autostart|}. Causes the movie to start playing immediately when the page is shown. At most one movie can be started in this way. The viewer application will typically be able to show at most one movie at the same time anyway. When the page is no longer shown, the movie immediately stops. This can be a problem if you use the |\movie| command to include a sound that should be played on after the page has been closed. In this case, the |\sound| command must be used.
+  \item
+    \declare{|borderwidth=|}\meta{\TeX\ dimension}. Causes a border of thickness \meta{\TeX\ dimension} to be drawn around the movie. Some versions of the Acrobat Reader seem to have a bug and do not display this border if is smaller than 0.5bp (about 0.51pt).
+  \item
+    \declare{|depth=|}\meta{\TeX\ dimension}. Overrides the depth of the \meta{poster text} box and sets it to the given dimension.
+  \item
+    \declare{|duration=|}\meta{time}|s|. Specifies in seconds how long the movie should be shown. The \meta{time} may be a fractional value and must be followed by the letter |s|. For example, |duration=1.5s| will show the movie for one and a half seconds. In conjunction with the |start| option, you can ``cut out'' a part of a movie for display.
+  \item
+    \declare{|externalviewer|}. As explained above, this causes an external application to be launched for displaying the movie in a separate window. Most options, like |duration| or |loop|, have no effect since they are not passed along to the viewer application.
+  \item
+    \declare{|height=|}\meta{\TeX\ dimension}. Overrides the height of the \meta{poster text} box and sets it to the given dimension.
+  \item
+    \declare{|label=|}\meta{movie label}. Assigns a label to the movie such that it can later be referenced by the command |\hyperlinkmovie|, which can be used to stop the movie or to show a different part of it. The \meta{movie label} is not a normal label. It should not be too fancy, since it is inserted literally into the \pdf\ code. In particular, it should not contain closing parentheses.
+  \item
+    \declare{|loop|}. Causes the movie to start again when the end has been reached. Normally, the movie just stops at the end.
+  \item
+    \declare{|once|}. Causes the movie to just stop at the end. This is the default.
+  \item
+    \declare{|open|}. Causes the player to stay open when the movie has finished.
+  \item
+    \declare{|palindrome|}. Causes the movie to start playing backwards when the end has been reached, and to start playing forward once more when the beginning is reached, and so on.
+  \item
+    \declare{|poster|}. Asks the viewer application to show the first image of the movie when the movie is not playing. Normally, nothing is shown when the movie is not playing (and thus the box containing the \meta{poster text} is shown). For a movie that does not have any images (but sound) or for movies with an uninformative first image this option is not so useful.
   \item
     \declare{|repeat|} is the same as |loop|.
   \item
-    \declare{|showcontrols=|}\meta{true or false}. Causes a control bar
-    to be displayed below the movie while it is playing. Instead of
-    |showcontrols=true| you can also just say |showcontrols|. By
-    default, no control bar is shown.
+    \declare{|showcontrols=|}\meta{true or false}. Causes a control bar to be displayed below the movie while it is playing. Instead of |showcontrols=true| you can also just say |showcontrols|. By default, no control bar is shown.
   \item
-    \declare{|start=|}\meta{time}|s|. Causes the first
-    \meta{time} seconds of the movie to be skipped. For example,
-    |start=10s,duration=5s| will show seconds 10 to 15 of the movie,
-    when you play the movie.
+    \declare{|start=|}\meta{time}|s|. Causes the first \meta{time} seconds of the movie to be skipped. For example, |start=10s,duration=5s| will show seconds 10 to 15 of the movie, when you play the movie.
   \item
-    \declare{|width=|}\meta{\TeX dimension} works like the |height|
-    option, only for the width of the poster box.
+    \declare{|width=|}\meta{\TeX dimension} works like the |height| option, only for the width of the poster box.
   \end{itemize}
 
-  \example The following example creates a ``background sound'' for
-  the slide.
+  \example
+  The following example creates a ``background sound'' for the slide.
+
 \begin{verbatim}
 \movie[autostart]{}{test.wav}
 \end{verbatim}
 
-  \example A movie with two extra buttons for showing different parts
-  of the movie.
+  \example
+  A movie with two extra buttons for showing different parts of the movie.
+
 \begin{verbatim}
 \movie[label=cells,width=4cm,height=3cm,poster,showcontrols,duration=5s]{}{cells.avi}
 
@@ -219,84 +104,48 @@ unable to display the movie itself.
 \end{verbatim}
 \end{command}
 
-A movie can serve as the destination of a special kind of hyperlink,
-namely a hyperlink introduced using the following command:
+A movie can serve as the destination of a special kind of hyperlink, namely a hyperlink introduced using the following command:
 
-\begin{command}{\hyperlinkmovie\oarg{options}\marg{movie
-      label}\marg{text}}
-  Causes the \meta{text} to become a movie hyperlink. When you click
-  on the \meta{text}, the movie with the label \meta{movie label} will
-  start to play (or stop or pause or resume, depending on the
-  \meta{options}). The movie must be on the same page as the
-  hyperlink.
+\begin{command}{\hyperlinkmovie\oarg{options}\marg{movie label}\marg{text}}
+  Causes the \meta{text} to become a movie hyperlink. When you click on the \meta{text}, the movie with the label \meta{movie label} will start to play (or stop or pause or resume, depending on the \meta{options}). The movie must be on the same page as the hyperlink.
 
-  The following \meta{options} may be given, many of which are the
-  same as for the |\movie| command; if a different option is given for
-  the link than for the movie itself, the option for the link takes precedence:
+  The following \meta{options} may be given, many of which are the same as for the |\movie| command; if a different option is given for the link than for the movie itself, the option for the link takes precedence:
   \begin{itemize}
   \item
-    \declare{|duration=|}\meta{time}|s|. As for |\movie|, this causes
-    the movie to be played only for the given number of seconds.
+    \declare{|duration=|}\meta{time}|s|. As for |\movie|, this causes the movie to be played only for the given number of seconds.
   \item
-    \declare{|loop|} and \declare{|repeat|}.  As for |\movie|, this causes
-    the movie to loop.
+    \declare{|loop|} and \declare{|repeat|}.  As for |\movie|, this causes the movie to loop.
   \item
-    \declare{|once|}.  As for |\movie|, this causes
-    the movie to played only once.
+    \declare{|once|}.  As for |\movie|, this causes the movie to played only once.
   \item
-    \declare{|palindrome|}.  As for |\movie|, this causes
-    the movie to be played forth and back.
+    \declare{|palindrome|}.  As for |\movie|, this causes the movie to be played forth and back.
   \item
-    \declare{|pause|}. Causes the playback of the movie to be paused, if
-    the movie was currently playing. If not, nothing happens.
+    \declare{|pause|}. Causes the playback of the movie to be paused, if the movie was currently playing. If not, nothing happens.
   \item
-    \declare{|play|}. Causes the movie to be played from whatever start
-    position is specified. If the movie is already playing, it will be
-    stopped and restarted at the starting position. This is the default.
+    \declare{|play|}. Causes the movie to be played from whatever start position is specified. If the movie is already playing, it will be stopped and restarted at the starting position. This is the default.
   \item
-    \declare{|resume|}. Resumes playback of the movie, if it has
-    previously been paused. If has not been paused, but not started or
-    is already playing, nothing happens.
+    \declare{|resume|}. Resumes playback of the movie, if it has previously been paused. If has not been paused, but not started or is already playing, nothing happens.
   \item
-    \declare{|showcontrols=|}\meta{true or false}. As for |\movie|, this
-    causes a control bar to be shown or not shown during playback.
+    \declare{|showcontrols=|}\meta{true or false}. As for |\movie|, this causes a control bar to be shown or not shown during playback.
   \item
-    \declare{|start=|}\meta{time}|s|. As for |\movie|, this causes
-    the given number of seconds to be skipped at the beginning of the
-    movie if |play| is used to start the movie.
+    \declare{|start=|}\meta{time}|s|. As for |\movie|, this causes the given number of seconds to be skipped at the beginning of the movie if |play| is used to start the movie.
   \item
     \declare{|stop|}. Causes the playback of the movie to be stopped.
   \end{itemize}
 \end{command}
 
-
 \subsubsection{Animations Created by Showing Slides in Rapid Succession}
 
-You can create an animation in a portable way by using the
-overlay commands of the \beamer\ package to create a series of slides
-that, when shown in rapid succession, present an animation. This is a
-flexible approach, but such animations will typically be rather static
-since it will take some time to advance from one slide to the
-next. This approach is mostly useful for animations where you want
-to explain each ``picture'' of the animation.
-When you advance slides ``by hand,'' that is, by pressing a forward
-button, it typically takes at least a second for the next slide to
-show.
-
-More ``lively'' animations can be created by relying on a capability
-of the viewer program. Some programs support
-showing slides only for a certain number of seconds during a
-presentation (for the Acrobat Reader this works only in full-screen
-mode). By setting the number of seconds to zero, you can create a
-rapid succession of slides.
-
-To facilitate the creation of animations using this feature, the
-following commands can be used: |\animate| and |\animatevalue|.
+You can create an animation in a portable way by using the overlay commands of the \beamer\ package to create a series of slides that, when shown in rapid succession, present an animation. This is a flexible approach, but such animations will typically be rather static since it will take some time to advance from one slide to the next. This approach is mostly useful for animations where you want to explain each ``picture'' of the animation. When you advance slides ``by hand,'' that is, by pressing a forward button, it typically takes at least a second for the next slide to show.
+
+More ``lively'' animations can be created by relying on a capability of the viewer program. Some programs support showing slides only for a certain number of seconds during a presentation (for the Acrobat Reader this works only in full-screen mode). By setting the number of seconds to zero, you can create a rapid succession of slides.
+
+To facilitate the creation of animations using this feature, the following commands can be used: |\animate| and |\animatevalue|.
 
 \begin{command}{\animate\ssarg{overlay specification}}
-  The slides specified by \meta{overlay specification} will be shown
-  only as shortly as  possible.
-\example
+  The slides specified by \meta{overlay specification} will be shown as quickly as possible.
+
+  \example
 \begin{verbatim}
 \begin{frame}
   \frametitle{A Five Slide Animation}
@@ -315,15 +164,9 @@ following commands can be used: |\animate| and |\animatevalue|.
   This command is ignored in |article| mode.
 \end{command}
 
-\begin{command}{\animatevalue|<|\meta{start slide}|-|\meta{end slide}|>|%
-    \marg{name}\marg{start value}\marg{end value}}
-  The \meta{name} must be the name of a counter or a dimension.
-  It will be varied between two values. For the slides in the
-  specified range, the counter or dimension is set to an interpolated
-  value that depends on the current slide number. On slides before the
-  \meta{start slide}, the counter or dimension is set to \meta{start
-    value}; on the slides after the \meta{end slide} it is set to
-  \meta{end value}.
+\begin{command}{\animatevalue|<|\meta{start slide}|-|\meta{end slide}|>| \marg{name}\marg{start value}\marg{end value}}
+  The \meta{name} must be the name of a counter or a dimension. It will be varied between two values. For the slides in the specified range, the counter or dimension is set to an interpolated value that depends on the current slide number. On slides before the \meta{start slide}, the counter or dimension is set to \meta{start value}; on the slides after the \meta{end slide} it is set to \meta{end value}.
+
   \example
 \begin{verbatim}
 \newcount\opaqueness
@@ -374,12 +217,7 @@ following commands can be used: |\animate| and |\animatevalue|.
   This command is ignored in |article| mode.
 \end{command}
 
-If your animation ``graphics'' reside in individual external graphic
-files, you might also consider using the |\multiinclude| command,
-which is explained in Section~\ref{section-mpmulti}, together with
-|\animate|. For example, you might create an animation like this,
-assuming you have created graphic files named |animation.1| through to
-|animation.10|:
+If your animation ``graphics'' reside in individual external graphic files, you might also consider using the |\multiinclude| command, which is explained in Section~\ref{section-mpmulti}, together with |\animate|. For example, you might create an animation like this, assuming you have created graphic files named |animation.1| through to |animation.10|:
 
 \begin{verbatim}
 \begin{frame}
@@ -388,230 +226,114 @@ assuming you have created graphic files named |animation.1| through to
 \end{frame}
 \end{verbatim}
 
-
-
-
-\subsubsection{Including External Animations Residing in Multiple
-  Image Files}
+\subsubsection{Including External Animations Residing in Multiple Image Files}
 \label{section-xmpmulti}
 \label{section-mpmulti}
 
-Some animations reside in external files in the following way: For
-each stage of the animation there is an image file containing
-an image for this stage. You can include such a series of images
-conveniently by using the style |mpmulti.sty| from the ppower4
-package. This style, written by Klaus Guntermann, 
-introduces a command called |\multiinclude| that takes the base name
-of a graphic file like |mygraphic| and will then search for files
-called |mygraphic.0|, |mygraphic.1|, and so on, till no more files are
-found. It will then include these graphics files using the
-|\includegraphics| command, but will put these graphics ``on top of
-each other.'' Furthermore, and this is the important part,
-it inserts a |\pause| command after each graphic. This command is
-defined in the ppower4 package and has the same effect as the |\pause|
-command of \beamer. For this reason, both ppower4 and also \beamer\
-will first display the basic graphic and will then additionally show
-the next graphic on each slide.
-
-If you try to use |mpmulti.sty| directly, you will run into the
-problem that it includes a file called |pause.sty|, which is part of
-the ppower4 package. 
-
-You might also consider using the style |xmpmulti.sty| that comes with
-\beamer. This file is mainly identical to |mpmulti|, except for two
-differences: First, it does not include |pause.sty|, a style that
-conceptually clashes with \beamer, although \beamer\ contains a
-workaround that sidesteps the problem. Second, it extends the
-|\multiinclude| command by allowing a special default overlay
-specification to be given. The effect of this is explained below. 
+Some animations reside in external files in the following way: For each stage of the animation there is an image file containing an image for this stage. You can include such a series of images conveniently by using the style |mpmulti.sty| from the ppower4 package. This style, written by Klaus Guntermann, introduces a command called |\multiinclude| that takes the base name of a graphic file like |mygraphic| and will then search for files called |mygraphic.0|, |mygraphic.1|, and so on, till no more files are found. It will then include these graphics files using the |\includegraphics| command, but will put these graphics ``on top of each other.'' Furthermore, and this is the important part, it inserts a |\pause| command after each graphic. This command is defined in the ppower4 package and has the same effect as the |\pause| command of \beamer. For this reason, both ppower4 and also \beamer\ will first display the basic graphic and will then additionally show the next graphic on each slide.
+
+If you try to use |mpmulti.sty| directly, you will run into the problem that it includes a file called |pause.sty|, which is part of the ppower4 package.
+
+You might also consider using the style |xmpmulti.sty| that comes with \beamer. This file is mainly identical to |mpmulti|, except for two differences: First, it does not include |pause.sty|, a style that conceptually clashes with \beamer, although \beamer\ contains a workaround that sidesteps the problem. Second, it extends the |\multiinclude| command by allowing a special default overlay specification to be given. The effect of this is explained below.
 
 \begin{package}{{xmpmulti}}
-  Defines the command |\multiinclude|. The code of this package is
-  due to Klaus Guntermann with some additions of mine. It can used
-  together with \beamer\ and with ppower4, i.\,e., it can be used as a
-  replacement for |mpmulti| if the |pause| package is also included in
-  a ppower4-presentation. 
+  Defines the command |\multiinclude|. The code of this package is due to Klaus Guntermann with some additions of mine. It can used together with \beamer\ and with ppower4, i.\,e., it can be used as a replacement for |mpmulti| if the |pause| package is also included in a ppower4-presentation.
 \end{package}
 
-\begin{command}{\multiinclude\opt{|[<|\meta{default overlay
-        specification}|>]|}\oarg{options}\marg{base file name}}
-  Except for the possibility of specifying a \meta{default overlay
-    specification}, this command is identical to the |\multiinclude|
-  command from the ppower4 package.
-
-  If no overlay specification is given, the command will search for
-  files called \meta{base file name}|.|\meta{number} for increasing
-  numbers \meta{number}, starting with zero. As long as it finds these
-  files, it issues an |\includegraphics| command on them. The files
-  following the first one are put ``on top'' of the first one. Between
-  any two invocations of |\includegraphics|, a |\pause| command is
-  inserted. You can modify this behaviour is different ways by given
-  suitable \meta{options}, see below.
-
-  \example Assume that MetaPost has created files called |gra.0|,
-  |gra.1|, and |gra.2|. You can then create frame consisting of three
-  slides that incrementally show the graphic as follows:
+\begin{command}{\multiinclude\opt{|[<|\meta{default overlay specification}|>]|}\oarg{options}\marg{base file name}}
+  Except for the possibility of specifying a \meta{default overlay specification}, this command is identical to the |\multiinclude| command from the ppower4 package.
+
+  If no overlay specification is given, the command will search for files called \meta{base file name}|.|\meta{number} for increasing numbers \meta{number}, starting with zero. As long as it finds these files, it issues an |\includegraphics| command on them. The files following the first one are put ``on top'' of the first one. Between any two invocations of |\includegraphics|, a |\pause| command is inserted. You can modify this behaviour is different ways by given suitable \meta{options}, see below.
+
+  \example
+  Assume that MetaPost has created files called |gra.0|, |gra.1|, and |gra.2|. You can then create frame consisting of three slides that incrementally show the graphic as follows:
 
 \begin{verbatim}
 \begin{frame}
   \multiinclude{gra}
 \end{frame}
 \end{verbatim}
-  
-  The effect of providing a \meta{default overlay specification} is
-  the following: First, no |\pause| command is inserted between
-  graphics. Instead, each graphic is surrounded by an |actionenv|
-  environment with the overlay specification set to \meta{default
-    overlay specification}.
-
-  \example You can create the same effect as in the previous example
-  using |\multiinclude[<+->]{gra}|.
-
-  \example For a more interesting usage of the \meta{default overlay
-    specification}, consider the following usage:
+
+  The effect of providing a \meta{default overlay specification} is the following: First, no |\pause| command is inserted between graphics. Instead, each graphic is surrounded by an |actionenv| environment with the overlay specification set to \meta{default overlay specification}.
+
+  \example
+  You can create the same effect as in the previous example using |\multiinclude[<+->]{gra}|.
+
+  \example
+  For a more interesting usage of the \meta{default overlay specification}, consider the following usage:
+
 \begin{verbatim}
 \multiinclude[<alert@+| +->]{gra}
 \end{verbatim}
-  This will always paint the most recently added part of the graphic
-  in red (assuming you do not use special colors in the graphic
-  itself).
 
-  \example In order to have each graphic completely \emph{replace} the
-  previous one, you could use |\multiinclude[<+>]{gra}|.
+  This will always paint the most recently added part of the graphic in red (assuming you do not use special colors in the graphic itself).
+
+  \example
+  In order to have each graphic completely \emph{replace} the previous one, you could use |\multiinclude[<+>]{gra}|.
 
-  The following \meta{options} may be given (these are the same as for
-  the original command from the ppower4 package):
+  The following \meta{options} may be given (these are the same as for the original command from the ppower4 package):
   \begin{itemize}
   \item
-    \declare{|pause=|\meta{command}} replaces the default pausing
-    command |\pause| by \meta{command}. If a \meta{default overlay
-      specification} is given, the default pausing command is empty;
-    otherwise it is |\pause|. Note that commands like |\pauselevel|
-    are not available in |\beamer|.
+    \declare{|pause=|\meta{command}} replaces the default pausing command |\pause| by \meta{command}. If a \meta{default overlay specification} is given, the default pausing command is empty; otherwise it is |\pause|. Note that commands like |\pauselevel| are not available in |\beamer|.
   \item
-    \declare{|graphics=|\meta{options}} passes the \meta{options} to
-    the |\includegraphics| command.
+    \declare{|graphics=|\meta{options}} passes the \meta{options} to the |\includegraphics| command.
 
     \example |\multiinclude[graphics={height=5cm}]{gra}|
   \item
-    \declare{|format=|\meta{extension}} will cause the file names for
-    which we search change from \meta{base file name}|.|\meta{number}
-    to \meta{base file name}|-|\meta{number}|.|\meta{extension}. Note
-    the change from the dot to a hyphen. This option allows you to
-    include, say, |.jpg| files.
+    \declare{|format=|\meta{extension}} will cause the file names for which we search change from \meta{base file name}|.|\meta{number} to \meta{base file name}|-|\meta{number}|.|\meta{extension}. Note the change from the dot to a hyphen. This option allows you to include, say, |.jpg| files.
   \item
-    \declare{|start=|\meta{number}} specifies the start
-    \meta{number}. The default is zero.
+    \declare{|start=|\meta{number}} specifies the start \meta{number}. The default is zero.
   \item
-    \declare{|end=|\meta{number}} specifies the end 
-    \meta{number}. The default is infinity.
-  \end{itemize}  
+    \declare{|end=|\meta{number}} specifies the end \meta{number}. The default is infinity.
+  \end{itemize}
 \end{command}
 
-Note that, if you do not use the |format=| option, the
-|\includegraphics| command will be somewhat at a loss in which format
-your graphic file actually is. After all, it end with the cryptic
-``format suffix'' |.0| or |.1|. You can tell |\includegraphics| that
-any file having a suffix it knows nothing about is actually in format,
-say, |.mps|, using the following command:
+Note that, if you do not use the |format=| option, the |\includegraphics| command will be somewhat at a loss in which format your graphic file actually is. After all, it ends with the cryptic ``format suffix'' |.0| or |.1|. You can tell |\includegraphics| that any file having a suffix it knows nothing about is actually in format, say, |.mps|, using the following command:
+
 \begin{verbatim}
 \DeclareGraphicsRule{*}{mps}{*}{}
 \end{verbatim}
 
 
-
-
-
-
-
 \subsection{Sounds}
 \label{section-sound}
-You can include sounds in a presentation. Such sound can be played
-when you open a slide or when a certain button is clicked. The
-commands for including sounds are defined in the package |multimedia|,
-which is introduced in Section~\ref{section-multimedia}.
-
-As was already pointed out in Section~\ref{section-multimedia}, a
-sound can be included in a \pdf\ presentation by treating it as a
-movie and using the |\movie| command. While this is perfectly
-sufficient in most cases, there are two cases where this approach is
-not satisfactory:
+
+You can include sounds in a presentation. Such sound can be played when you open a slide or when a certain button is clicked. The commands for including sounds are defined in the package |multimedia|, which is introduced in Section~\ref{section-multimedia}.
+
+As was already pointed out in Section~\ref{section-multimedia}, a sound can be included in a \pdf\ presentation by treating it as a movie and using the |\movie| command. While this is perfectly sufficient in most cases, there are two cases where this approach is not satisfactory:
 \begin{enumerate}
 \item
-  When a page is closed, any playing movie is immediately
-  stopped. Thus, you cannot use the |\movie| command to create sounds
-  that persist for a longer time.
+  When a page is closed, any playing movie is immediately stopped. Thus, you cannot use the |\movie| command to create sounds that persist for a longer time.
 \item
   You cannot play two movies at the same time.
 \end{enumerate}
 
-The \pdf\ specification introduces special sound objects, which are
-treated quite differently from movie objects. You can create a sound
-object using the command |\sound|, which is somewhat similar to
-|\movie|. There also exists a |\hyperlinksound| command, which is
-similar to |\hyperlinkmovie|. While it is conceptually better to use
-|\sound| for sounds, there are a number of this to consider before
-using it:
+The \pdf\ specification introduces special sound objects, which are treated quite differently from movie objects. You can create a sound object using the command |\sound|, which is somewhat similar to |\movie|. There also exists a |\hyperlinksound| command, which is similar to |\hyperlinkmovie|. While it is conceptually better to use |\sound| for sounds, there are a number of things to consider before using it:
 \begin{itemize}
 \item
-  Several sounds \emph{can} be played at the same time. In particular,
-  it is possible to play a general sound in parallel to a (hopefully
-  silent) movie.
+  Several sounds \emph{can} be played at the same time. In particular, it is possible to play a general sound in parallel to a (hopefully silent) movie.
 \item
-  A sound playback \emph{can} persist after the current page is closed
-  (though it need not).
+  A sound playback \emph{can} persist after the current page is closed (though it need not).
 \item
-  The data of a sound file \emph{can} be completely embedded in a
-  \pdf\ file, obliberating the need to ``carry around'' other files.
+  The data of a sound file \emph{can} be completely embedded in a \pdf\ file, obliberating the need to ``carry around'' other files.
 \item
-  The sound objects do \emph{not} work together with |dvips| and
-  |ps2pdf|. They only work with |pdflatex|.
+  The sound objects do \emph{not} work together with |dvips| and |ps2pdf|. They only work with |pdflatex|.
 \item
-  There is much less control over what part of a sound should be
-  played. In particular, no control bar is shown and you can
-  specify neither the start time nor the duration.
+  There is much less control over what part of a sound should be played. In particular, no control bar is shown and you can specify neither the start time nor the duration.
 \item
-  A bug in some versions of the Acrobat Reader makes it necessary to
-  provide very exact details on the encoding of the sound file. You
-  have to provide the sampling rate, the number of channels (mono or
-  stereo), the number of bits per sample, and the sample encoding
-  method (raw, signed, Alaw or $\mu$law). If you do not know this data
-  or provide it incorrectly, the sound will be played incorrectly.
+  A bug in some versions of the Acrobat Reader makes it necessary to provide very exact details on the encoding of the sound file. You have to provide the sampling rate, the number of channels (mono or stereo), the number of bits per sample, and the sample encoding method (raw, signed, Alaw or $\mu$law). If you do not know this data or provide it incorrectly, the sound will be played incorrectly.
 \item
-  It seems  that you can only include uncompressed sound data,
-  which can easily become huge. This is not required by the
-  specification, but I have been unable to make the Acrobat Reader
-  play any compressed data. Data formats that \emph{do} work are
-  |.aif| and |.au|.
+  It seems that you can only include uncompressed sound data, which can easily become huge. This is not required by the specification, but some versions of Acrobat Reader are unable to play any compressed data. Data formats that \emph{do} work are |.aif| and |.au|.
 \end{itemize}
 
+\begin{command}{\sound\oarg{options}\marg{sound poster text}\marg{sound filename}}
+  This command will insert the sound with the filename \meta{sound filename} into the \pdf\ file. As for |\movie|, the file must be accessible when the sound is to be played. Unlike |\movie|, you can however use the option |inlinesound| to actually embed the sound data in the \pdf\ file.
 
-\begin{command}{\sound\oarg{options}\marg{sound poster text}\marg{sound
-      filename}}
-  This command will insert the sound with the filename \meta{sound
-    filename} into the \pdf\ file. As for |\movie|, the file must be
-  accessible when the sound is to be played. Unlike |\movie|, you can
-  however use the option |inlinesound| to actually embed the sound
-  data in the \pdf\ file. 
-
-  Also as for a movie, the \meta{sound poster text} will be be put in
-  a box that, when clicked on, will start playing the movie. However,
-  you might also leave this box empty and only use the |autostart|
-  option. Once playback of a sound has started, it can only be stopped
-  by starting the playback of a different sound or by use of the
-  |\hyperlinkmute| command. 
-  
-  The supported sound formats depend on the viewer application. My
-  version of the Acrobat Reader supports |.aif| and |.au|. I also need
-  to specify information like the sampling rate, even though this
-  information could be extracted from the sound file and even though
-  the \pdf\ standard specifies that the viewer application should do
-  so. In this regard, my version of the Acrobat Reader seems to be
-  non-standard-conforming.
-
-  This command only works together with |pdflatex|. If you use
-  |dvips|, the poster is still shown, but clicking it has no effect
-  and no sound is embedded in any way.
+  Also as for a movie, the \meta{sound poster text} will be be put in a box that, when clicked on, will start playing the movie. However, you might also leave this box empty and only use the |autostart| option. Once playback of a sound has started, it can only be stopped by starting the playback of a different sound or by use of the |\hyperlinkmute| command.
+
+  The supported sound formats depend on the viewer application. Some versions of Acrobat Reader support |.aif| and |.au|. Sometimes you also need to specify information like the sampling rate, even though this information could be extracted from the sound file and even though the \pdf\ standard specifies that the viewer application should do so. In this regard, some versions of Acrobat Reader seems to be non-standard-conforming.
+
+  This command only works together with |pdflatex|. If you use |dvips|, the poster is still shown, but clicking it has no effect and no sound is embedded in any way.
 
   \example
   |\sound[autostart,samplingrate=22050]{}{applause.au}|
@@ -619,109 +341,67 @@ using it:
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|autostart|}. Causes the sound to start playing immediately
-    when the page is shown.
+    \declare{|autostart|}. Causes the sound to start playing immediately when the page is shown.
   \item
-    \declare{|automute|}. Causes all sounds to be muted when the current
-    page is left.
+    \declare{|automute|}. Causes all sounds to be muted when the current page is left.
   \item
-    \declare{|bitspersample=|}\meta{8 or 16}. Specifies the number of
-    bits per sample in the sound file. If this number is 16, this
-    option need not be specified.
+    \declare{|bitspersample=|}\meta{8 or 16}. Specifies the number of bits per sample in the sound file. If this number is 16, this option need not be specified.
   \item
-    \declare{|channels=|}\meta{1 or 2}. Specifies whether the sound is
-    mono or stereo. If the sound is mono, this option need not be specified.
+    \declare{|channels=|}\meta{1 or 2}. Specifies whether the sound is mono or stereo. If the sound is mono, this option need not be specified.
   \item
-    \declare{|depth=|}\meta{\TeX\ dimension}. Overrides the depth of the
-    \meta{sound poster text} box and sets it to the given dimension.
+    \declare{|depth=|}\meta{\TeX\ dimension}. Overrides the depth of the \meta{sound poster text} box and sets it to the given dimension.
   \item
-    \declare{|encoding=|}\meta{method}. Specifies the encoding method,
-    which may be |Raw|, |Signed|, |muLaw|, or |ALaw|. If the method is
-    |muLaw|, this option need not be specified.
+    \declare{|encoding=|}\meta{method}. Specifies the encoding method, which may be |Raw|, |Signed|, |muLaw|, or |ALaw|. If the method is |muLaw|, this option need not be specified.
   \item
-    \declare{|height=|}\meta{\TeX\ dimension}. Overrides the height of the
-    \meta{sound poster text} box and sets it to the given dimension.
+    \declare{|height=|}\meta{\TeX\ dimension}. Overrides the height of the \meta{sound poster text} box and sets it to the given dimension.
   \item
-    \declare{|inlinesound|} causes the sound data to be stored directly
-    in the \pdf-file.
+    \declare{|inlinesound|} causes the sound data to be stored directly in the \pdf-file.
   \item
-    \declare{|label=|}\meta{sound label}. Assigns a label to the sound
-    such that it can later be referenced by the command
-    |\hyperlinksound|, which can be used to start a sound. The
-    \meta{sound label} is not a normal label. 
+    \declare{|label=|}\meta{sound label}. Assigns a label to the sound such that it can later be referenced by the command |\hyperlinksound|, which can be used to start a sound. The \meta{sound label} is not a normal label.
   \item
-    \declare{|loop|} or \declare{|repeat|}. Causes the sound to start
-    again when the end has been reached.
+    \declare{|loop|} or \declare{|repeat|}. Causes the sound to start again when the end has been reached.
   \item
-    \declare{|mixsound=|}\meta{true or false}. If set to |true|, the
-    sound is played in addition to any sound that is already
-    playing. If set to |false| all other sounds (though not sound from
-    movies) are stopped before the the sound is played. The default is
-    |false|. 
+    \declare{|mixsound=|}\meta{true or false}. If set to |true|, the sound is played in addition to any sound that is already playing. If set to |false| all other sounds (though not sound from movies) are stopped before the sound is played. The default is |false|.
   \item
-    \declare{|samplingrate=|}\meta{number}. Specifies the number of
-    samples per second in the sound file. If this number is 44100,
-    this option need not be specified.
+    \declare{|samplingrate=|}\meta{number}. Specifies the number of samples per second in the sound file. If this number is 44100, this option need not be specified.
   \item
-    \declare{|width=|}\meta{\TeX\ dimension} works like the |height|
-    option, only for the width of the poster box.
+    \declare{|width=|}\meta{\TeX\ dimension} works like the |height| option, only for the width of the poster box.
   \end{itemize}
 
-  \example The following example creates a ``background sound'' for
-  the slide, assuming that |applause.au| is encoded correctly (44100
-  samples per second, mono, $\mu$law encoded, 16 bits per sample).
+  \example
+  The following example creates a ``background sound'' for the slide, assuming that |applause.au| is encoded correctly (44100 samples per second, mono, $\mu$law encoded, 16 bits per sample).
+
 \begin{verbatim}
 \sound[autostart]{}{applause.au}
 \end{verbatim}
 \end{command}
 
-Just like movies, sounds can also serve as  destinations of special
-sound hyperlinks. 
+Just like movies, sounds can also serve as  destinations of special sound hyperlinks.
 
-\begin{command}{\hyperlinksound\oarg{options}\marg{sound
-      label}\marg{text}}
-  Causes the \meta{text} to become a sound hyperlink. When you click
-  on the \meta{text}, the sound with the label \meta{sound label} will
-  start to play.
+\begin{command}{\hyperlinksound\oarg{options}\marg{sound label}\marg{text}}
+  Causes the \meta{text} to become a sound hyperlink. When you click on the \meta{text}, the sound with the label \meta{sound label} will start to play.
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|loop|} or \declare{|repeat|}. Causes the sound to start
-    again when the end has been reached.
+    \declare{|loop|} or \declare{|repeat|}. Causes the sound to start again when the end has been reached.
   \item
-    \declare{|mixsound=|}\meta{true or false}. If set to |true|, the
-    sound is played in addition to any sound that is already
-    playing. If set to |false| all other sounds (though not sound from
-    movies) is stopped before the the sound is played. The default is
-    |false|. 
+    \declare{|mixsound=|}\meta{true or false}. If set to |true|, the sound is played in addition to any sound that is already playing. If set to |false| all other sounds (though not sound from movies) are stopped before the sound is played. The default is |false|.
   \end{itemize}
 \end{command}
 
-Since there is no direct way of stopping the playback of a sound, the
-following command is useful:
-
+Since there is no direct way of stopping the playback of a sound, the following command is useful:
 
 \begin{command}{\hyperlinkmute\marg{text}}
-  Causes the \meta{text} to become a hyperlink that, when clicked,
-  stops the playback of all sounds.
+  Causes the \meta{text} to become a hyperlink that, when clicked, stops the playback of all sounds.
 \end{command}
 
 
-
-
 \subsection{Slide Transitions}
 
-\textsc{pdf} in general, and the Acrobat Reader in particular, offer a
-standardized way of defining \emph{slide transitions}. Such a
-transition is a visual effect that is used to show the slide. For
-example, instead of just showing the slide immediately, whatever was
-shown before might slowly ``dissolve'' and be replaced by the slide's
-content.
+\pdf\ in general, and the Acrobat Reader in particular, offer a standardized way of defining \emph{slide transitions}. Such a transition is a visual effect that is used to show the slide. For example, instead of just showing the slide immediately, whatever was shown before might slowly ``dissolve'' and be replaced by the slide's content.
 
-There are a number of commands that can be used to specify what effect
-should be used when the current slide is presented. Consider the
-following example:
+There are a number of commands that can be used to specify what effect should be used when the current slide is presented. Consider the following example:
 
 \begin{verbatim}
 \frame{\pgfuseimage{youngboy}}
@@ -730,13 +410,11 @@ following example:
   \pgfuseimage{man}
 }
 \end{verbatim}
-The command |\transdissolve| causes the slide of the
-second frame to be shown in a ``dissolved way.'' Note that the
-dissolving is a property of the second frame, not of the first one. We
-could have placed the command anywhere on the frame.
 
-The transition commands are overlay-specification-aware. We could
-collapse the two frames into one frame like this:
+The command |\transdissolve| causes the slide of the second frame to be shown in a ``dissolved way.'' Note that the dissolving is a property of the second frame, not of the first one. We could have placed the command anywhere on the frame.
+
+The transition commands are overlay-specification-aware. We could collapse the two frames into one frame like this:
+
 \begin{verbatim}
 \begin{frame}
   \only<1>{\pgfuseimage{youngboy}}
@@ -744,26 +422,16 @@ collapse the two frames into one frame like this:
   \transdissolve<2>
 \end{frame}
 \end{verbatim}
-This states that on the first slide the young boy should be shown, on
-the second slide the old man should be shown, and when the second
-slide is shown, it should be  shown in a ``dissolved way.''
 
-In the following, the different commands for creating transitional
-effects are listed. All of them take an optional argument that may
-contain a list of \meta{key}|=|\meta{value} pairs. The following
-options are possible:
+This states that on the first slide the young boy should be shown, on the second slide the old man should be shown, and when the second slide is shown, it should be shown in a ``dissolved way.''
+
+In the following, the different commands for creating transitional effects are listed. All of them take an optional argument that may contain a list of \meta{key}|=|\meta{value} pairs. The following options are possible:
 
 \begin{itemize}
 \item
-  |duration=|\meta{seconds}. Specifies the number of \meta{seconds}
-  the transition effect needs. Default is one second, but often a
-  shorter one (like 0.2 seconds) is more appropriate. Viewer
-  applications, especially Acrobat, may interpret this option in
-  slightly strange ways.
+  |duration=|\meta{seconds}. Specifies the number of \meta{seconds} the transition effect needs. Default is one second, but often a shorter one (like 0.2 seconds) is more appropriate. Viewer applications, especially Acrobat, may interpret this option in slightly strange ways.
 \item
-  |direction=|\meta{degree}. For ``directed'' effects, this option
-  specifies the effect's direction. Allowed values are |0|, |90|,
-  |180|, |270|, and for the glitter effect also |315|.
+  |direction=|\meta{degree}. For ``directed'' effects, this option specifies the effect's direction. Allowed values are |0|, |90|, |180|, |270|, and for the glitter effect also |315|.
 \end{itemize}
 
 \articlenote
@@ -773,78 +441,63 @@ All of these commands are ignored in |article| mode.
 You must insert these commands using \TeX-mode.
 
 \begin{command}{\transblindshorizontal\sarg{overlay specification}\oarg{options}}
-  Show the slide as if horizontal blinds where pulled away.
+  Show the slide as if horizontal blinds were pulled away.
   \example|\transblindshorizontal|
 \end{command}
-  
+
 \begin{command}{\transblindsvertical\sarg{overlay specification}\oarg{options}}
-  Show the slide as if vertical blinds where pulled away.
+  Show the slide as if vertical blinds were pulled away.
   \example|\transblindsvertical<2,3>|
 \end{command}
-  
+
 \begin{command}{\transboxin\sarg{overlay specification}\oarg{options}}
   Show the slide by moving to the center from all four sides.
   \example|\transboxin<1>|
 \end{command}
-  
+
 \begin{command}{\transboxout\sarg{overlay specification}\oarg{options}}
-  Show the slide by showing more and more of a rectangular area that
-  is centered on the slide center.
+  Show the slide by showing more and more of a rectangular area that is centered on the slide center.
   \example|\transboxout|
 \end{command}
- 
+
 \begin{command}{\transdissolve\sarg{overlay specification}\oarg{options}}
   Show the slide by slowly dissolving what was shown before.
   \example|\transdissolve[duration=0.2]|
 \end{command}
-  
+
 \begin{command}{\transglitter\sarg{overlay specification}\oarg{options}}
-  Show the slide with a glitter effect that sweeps in the specified
-  direction.
+  Show the slide with a glitter effect that sweeps in the specified direction.
   \example|\transglitter<2-3>[direction=90]|
 \end{command}
-  
+
 \begin{command}{\transsplitverticalin\sarg{overlay specification}\oarg{options}}
   Show the slide by sweeping two vertical lines from the sides inward.
   \example|\transsplitverticalin|
 \end{command}
-  
+
 \begin{command}{\transsplitverticalout\sarg{overlay specification}\oarg{options}}
   Show the slide by sweeping two vertical lines from the center outward.
   \example|\transsplitverticalout|
 \end{command}
-  
+
 \begin{command}{\transsplithorizontalin\sarg{overlay specification}\oarg{options}}
   Show the slide by sweeping two horizontal lines from the sides inward.
   \example|\transsplithorizontalin|
 \end{command}
-  
+
 \begin{command}{\transsplithorizontalout\sarg{overlay specification}\oarg{options}}
   Show the slide by sweeping two horizontal lines from the center outward.
   \example|\transsplithorizontalout|
 \end{command}
- 
+
 \begin{command}{\transwipe\sarg{overlay specification}\oarg{options}}
-  Show the slide by sweeping a single line in the specified direction,
-  thereby ``wiping out'' the previous contents.
+  Show the slide by sweeping a single line in the specified direction, thereby ``wiping out'' the previous contents.
   \example|\transwipe[direction=90]|
 \end{command}
 
-
-You can also specify how \emph{long} a given slide should be shown,
-using the following overlay-specification-aware command:
+You can also specify how \emph{long} a given slide should be shown, using the following overlay-specification-aware command:
 
 \begin{command}{\transduration\sarg{overlay specification}\marg{number of seconds}}
-  In full screen mode, show the slide for \meta{number of seconds}.
-  In zero is specified, the slide is shown as short as possible. This
-  can be used to create interesting pseudo-animations.
+  In full screen mode, show the slide for \meta{number of seconds}. If zero is specified, the slide is shown as short as possible. This can be used to create interesting pseudo-animations.
   \example|\transduration<2>{1}|
 \end{command}
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-color.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-color.tex
index d4bca1e840b..8e8b46b7b76 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-color.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-color.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,43 +8,27 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-color.tex,v 1.25 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Colors}
 
 \label{section-colors}
 
-\beamer's color management allows you to specify the color of every
-element (like, say, the color of the section entries in a table of
-contents or, say, the color of the subsection entries in a mini table
-of contents in a sidebar). While the system is quite powerful, it is
-not trivial to use. To simplify the usage of the color system, you
-should consider using a predefined color theme, which takes care of
-everything for you.
-
-In the following, color themes are explained first. The rest of the
-section consists of explanations of how the color management works
-internally. You will need to read these sections only if you wish to
-write your own color themes; or if you are quite happy with the
-predefined themes but you absolutely insist that displayed
-mathematical text simply has to be typeset in a lovely pink.
+\beamer's color management allows you to specify the color of every element (like, say, the color of the section entries in a table of contents or, say, the color of the subsection entries in a mini table of contents in a sidebar). While the system is quite powerful, it is not trivial to use. To simplify the usage of the color system, you should consider using a predefined color theme, which takes care of everything for you.
 
+In the following, color themes are explained first. The rest of the section consists of explanations of how the color management works internally. You will need to read these sections only if you wish to write your own color themes; or if you are quite happy with the predefined themes but you absolutely insist that displayed mathematical text simply has to be typeset in a lovely pink.
 
 
 \subsection{Color Themes}
 
-In order to also show the effect of the different color themes on the
-sidebar, in the following examples the color themes are used together
-with the outer theme |sidebar|.
+In order to also show the effect of the different color themes on the sidebar, in the following examples the color themes are used together with the outer theme |sidebar|.
 
 \subsubsection{Default and Special-Purpose Color Themes}
 
 \begin{colorthemeexample}{default}
-  The |default| color theme is very sober. It installs little special
-  colors and even less backgrounds. The default color theme sets up
-  the default parent relations between the different \beamer-colors.
+  The |default| color theme is very sober. It installs little special colors and even less backgrounds. The default color theme sets up the default parent relations between the different \beamer-colors.
 
-  The main colors set in the |default| color theme are the following: 
+  The main colors set in the |default| color theme are the following:
   \begin{itemize}
   \item
     |normal text| is black on white.
@@ -52,338 +37,172 @@ with the outer theme |sidebar|.
   \item
     |example text| is a dark green (green with 50\% black).
   \item
-    |structure| is set to a light version of MidnightBlue
-    (more precisely, 20\% red, 20\% green, and 70\% blue).  
+    |structure| is set to a light version of MidnightBlue (more precisely, 20\% red, 20\% green, and 70\% blue).
   \end{itemize}
-  Use this theme for a no-nonsense presentation. Since this theme is
-  loaded by default, you cannot ``reload'' it after having loaded
-  another color theme.
+  Use this theme for a no-nonsense presentation. Since this theme is loaded by default, you cannot ``reload'' it after having loaded another color theme.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}[\oarg{options}]{structure}
-  The example was created using |\usecolortheme[named=SeaGreen]{structure}|. 
-  
-  This theme offers a convenient way of changing the color used for
-  structural elements. More precisely, it just changes the foreground
-  of the \beamer-color |structure|. You can also achieve this by
-  directly invoking the function |\setbeamercolor|, but this color
-  theme makes things a bit easier.
-
-  The theme offers several \meta{options}, which can be used to
-  specify the color to be used for structural elements:
+  The example was created using |\usecolortheme[named=SeaGreen]{structure}|.
+
+  This theme offers a convenient way of changing the color used for structural elements. More precisely, it just changes the foreground of the \beamer-color |structure|. You can also achieve this by directly invoking the function |\setbeamercolor|, but this color theme makes things a bit easier.
+
+  The theme offers several \meta{options}, which can be used to specify the color to be used for structural elements:
   \begin{itemize}
   \item
-    \declare{|rgb=|\marg{rgb tuple}} sets the |structure| foreground
-    to the specified red-green-blue tuple. The numbers are given as
-    decimals between 0 and 1. For example, |rgb={0.5,0,0}| yields a
-    dark red.
+    \declare{|rgb=|\marg{rgb tuple}} sets the |structure| foreground to the specified red-green-blue tuple. The numbers are given as decimals between 0 and 1. For example, |rgb={0.5,0,0}| yields a dark red.
   \item
-    \declare{|RGB=|\marg{rgb tuple}} does the same as |rgb|, except
-    that the numbers range between 0 and 255. For example,
-    |RGB={128,0,0}|  yields a dark red.
+    \declare{|RGB=|\marg{rgb tuple}} does the same as |rgb|, except that the numbers range between 0 and 255. For example, |RGB={128,0,0}|  yields a dark red.
   \item
-    \declare{|cmyk=|\marg{cymk tuple}} sets the |structure| foreground
-    to the specified cyan-magenta-yellow-black tuple. The numbers are
-    given as decimals between 0 and 1. For example, |cymk={0,1,1,0.5}|
-    yields a dark red.
+    \declare{|cmyk=|\marg{cmyk tuple}} sets the |structure| foreground to the specified cyan-magenta-yellow-black tuple. The numbers are given as decimals between 0 and 1. For example, |cmyk={0,1,1,0.5}| yields a dark red.
   \item
-    \declare{|cmy=|\marg{cym tuple}} is similar to |cmyk|, except that
-    the black component is not specified.
+    \declare{|cmy=|\marg{cmy tuple}} is similar to |cmyk|, except that the black component is not specified.
   \item
-    \declare{|hsb=|\marg{hsb tuple}}  sets the |structure| foreground
-    to the specified hue-saturation-brightness tuple. The numbers are
-    given as decimals between 0 and 1. For example, |hsb={0,1,.5}|
-    yields a dark red.
+    \declare{|hsb=|\marg{hsb tuple}}  sets the |structure| foreground to the specified hue-saturation-brightness tuple. The numbers are given as decimals between 0 and 1. For example, |hsb={0,1,.5}| yields a dark red.
   \item
-    \declare{|named=|\marg{color name}} sets the |structure| foreground
-    to a named color. This color must previously have been defined
-    using the |\DefineNamedColor| command. Adding the class option
-    |xcolor=dvipsnames| will install a long list of standard
-    names. See the file |dvipsnam.def| for the list.
+    \declare{|named=|\marg{color name}} sets the |structure| foreground to a named color. This color must previously have been defined using the |\DefineNamedColor| command. Adding the class option |xcolor=dvipsnames| or |xcolor=svgnames| will install a long list of standard |dvips| or SVG color names (respectively). See the file |dvipsnam.def| for the list.
   \end{itemize}
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{sidebartab}
-  This theme changes the colors in a sidebar such that the current
-  entry in a table of contents shown there gets hilighted by showing a
-  different background behind it.
+  This theme changes the colors in a sidebar such that the current entry in a table of contents shown there gets highlighted by showing a different background behind it.
 \end{colorthemeexample}
 
-
-
 \subsubsection{Complete Color Themes}
 
-A ``complete'' color theme is a color theme that completely specifies
-all colors for all parts of a frame. It installs specific colors and
-does not derive the colors from, say, the |structure| \beamer-color.
-Complete color themes happen to have names of flying animals.
+A ``complete'' color theme is a color theme that completely specifies all colors for all parts of a frame. It installs specific colors and does not derive the colors from, say, the |structure| \beamer-color. Complete color themes happen to have names of flying animals.
 
 \begin{colorthemeexample}{albatross}
-  The color theme is a ``dark'' or ``inverted'' theme using yellow on
-  blue as the main colors. The color theme also installs a slightly
-  darker background color for blocks, which is necessary for
-  presentation themes that use shadows, but which (in my opinion) is
-  undesirable for all other presentation themes. By using the |lily|
-  color theme together with this theme, the backgrounds for blocks can
-  be removed.
-
-  When using a light-on-dark theme like this one, be aware that there
-  are certain disadvantages:
+  The color theme is a ``dark'' or ``inverted'' theme using yellow on blue as the main colors. The color theme also installs a slightly darker background color for blocks, which is necessary for presentation themes that use shadows, but which (in Till's opinion) is undesirable for all other presentation themes. By using the |lily| color theme together with this theme, the backgrounds for blocks can be removed.
+
+  When using a light-on-dark theme like this one, be aware that there are certain disadvantages:
   \begin{itemize}
   \item
-    If the room in which the talk is given has been ``darkened,''
-    using such a theme makes it more difficult for the audience to
-    take or read notes.
+    If the room in which the talk is given has been ``darkened,'' using such a theme makes it more difficult for the audience to take or read notes.
   \item
-    Since the room becomes darker, the pupil becomes larger, thus
-    making it harder for the eye to focus. This \emph{can} make text
-    harder to  read.
+    Since the room becomes darker, the pupil becomes larger, thus making it harder for the eye to focus. This \emph{can} make text harder to read.
   \item
     Printing such slides is difficult at best.
   \end{itemize}
 
-  On the other hand, a light-on-dark presentation often appears to be
-  more ``stylish''  than a plain black-on-white one.
+  On the other hand, a light-on-dark presentation often appears to be more ``stylish'' than a plain black-on-white one.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|overlystylish|} installs a background canvas that
-    is, in my opinion, way too stylish. But then, I do not want
-    to press my taste on other people. When using this option, it is
-    probably a very good idea to also use the |lily| color theme.      
+  \item
+    \declare{|overlystylish|} installs a background canvas that is, in Till's opinion, way too stylish. But then, it is not his intention to press his taste on other people. When using this option, it is probably a very good idea to also use the |lily| color theme.
   \end{itemize}
 
-  \example The |overlystylish| option together with the |lily| color theme:
-  \genericthemeexample{colorthemealbatrossstylish}
+  \example
+  The |overlystylish| option together with the |lily| color theme: \genericthemeexample{colorthemealbatrossstylish}
 \end{colorthemeexample}
 
-
 \begin{colorthemeexample}{beetle}
-  The main ``theme behing this theme'' is to use white and black text
-  on gray background. The white text is used for special emphasis, the
-  black text for normal text. The ``outer stuff'' like the headline
-  and the footline use, however, a bluish color. To change this color,
-  change the background of |palette primary|.
-  
-  Great care must be taken with this theme since both the white/gray
-  and the black/gray contrasts are much lower than with other
-  themes. Make sure that the contrast is high enough for the actual
-  presentation.
+  The main ``theme behind this theme'' is to use white and black text on gray background. The white text is used for special emphasis, the black text for normal text. The ``outer stuff'' like the headline and the footline use, however, a bluish color. To change this color, change the background of |palette primary|.
 
-  You can change the ``grayish'' background by changing the background
-  of |normal text|.
+  Great care must be taken with this theme since both the white/gray and the black/gray contrasts are much lower than with other themes. Make sure that the contrast is high enough for the actual presentation.
+
+  You can change the ``grayish'' background by changing the background of |normal text|.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{crane}
-  This theme uses the colors of the Lufthansa, whose logo is a
-  crane. It is \emph{not} an official theme by that company, however. 
+  This theme uses the colors of Lufthansa, whose logo is a crane. It is \emph{not} an official theme by that company, however.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{dove}
-  This theme is nearly a black and white theme and useful for creating
-  presentations that are easy to print on a black-and-white
-  printer. The theme uses grayscale in certain unavoidable cases, but
-  never color. It also changes the font of alerted text to boldface.
-
-  When using this theme, you should consider using the class option
-  |gray|, which ensures that all colors are converted to
-  grayscale. Also consider using the |structurebold| font theme.
-\end{colorthemeexample}
+  This theme is nearly a black and white theme and useful for creating presentations that are easy to print on a black-and-white printer. The theme uses grayscale in certain unavoidable cases, but never color. It also changes the font of alerted text to boldface.
 
+  When using this theme, you should consider using the class option |gray|, which ensures that all colors are converted to grayscale. Also consider using the |structurebold| font theme.
+\end{colorthemeexample}
 
 \begin{colorthemeexample}{fly}
-  This theme is the ``consequent'' version  of |beetle| and uses
-  white/black/gray throughout. It does not go particularly well with
-  themes that use shadows.
+  This theme is the ``consequent'' version of |beetle| and uses white/black/gray throughout. It does not go particularly well with themes that use shadows.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{seagull}
-  Like the |dove| color theme, this theme is useful for printing on a
-  black-and-white printer. However, it uses different shades of gray
-  extensively, which may or may not look good on a transparency.
+  Like the |dove| color theme, this theme is useful for printing on a black-and-white printer. However, it uses different shades of gray extensively, which may or may not look good on a transparency.
 \end{colorthemeexample}
 
-
 \begin{colorthemeexample}{wolverine}
-  The theme is based on the colors of the University of Michigan's
-  mascot, a wolverine. 
+  The theme is based on the colors of the University of Michigan's mascot, a wolverine.
 
   \themeauthor Madhusudan Singh.
 \end{colorthemeexample}
 
-
 \begin{colorthemeexample}{beaver}
-  The theme is based on the colors of the MIT's mascot, a beaver. 
+  The theme is based on the colors of the MIT's mascot, a beaver.
 
   \themeauthor Madhusudan Singh.
 \end{colorthemeexample}
 
-
 \subsubsection{Inner Color Themes}
 
-Inner color themes only specify the colors of elements used in inner
-themes. Most noticably, they specify the colors used for blocks. They can
-be used together with other (color) themes. If they are used to change the
-inner colors installed by a presentation theme or another color theme,
-they should obviously be specified \emph{after} the other theme has
-been loaded. Inner color themes happen to have flower names.
+Inner color themes only specify the colors of elements used in inner themes. Most noticably, they specify the colors used for blocks. They can be used together with other (color) themes. If they are used to change the inner colors installed by a presentation theme or another color theme, they should obviously be specified \emph{after} the other theme has been loaded. Inner color themes happen to have flower names.
 
 \begin{colorthemeexample}{lily}
-  This theme is mainly used to \emph{uninstall} any block colors setup
-  by another theme, restoring the colors used in the |default|
-  theme. In particular, using this theme will remove all background
-  colors for blocks.
+  This theme is mainly used to \emph{uninstall} any block colors setup by another theme, restoring the colors used in the |default| theme. In particular, using this theme will remove all background colors for blocks.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{orchid}
-  This theme installs white-on-dark block titles. The background of
-  the title of a normal block is set to the foreground of the
-  structure color, the foreground is set to white. The background of
-  alerted blocks are set to red and of example blocks to green. The
-  body of blocks get a nearly transparent background.
+  This theme installs white-on-dark block titles. The background of the title of a normal block is set to the foreground of the structure color, the foreground is set to white. The background of alerted blocks are set to red and of example blocks to green. The body of blocks get a nearly transparent background.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{rose}
-  This theme installs nearly transparent backgrounds for both block
-  titles and block bodies. This theme is much less ``aggressive'' than
-  the |orchid| theme. The background colors are derived from the
-  foreground of the structure \beamer-color.
+  This theme installs nearly transparent backgrounds for both block titles and block bodies. This theme is much less ``aggressive'' than the |orchid| theme. The background colors are derived from the foreground of the structure \beamer-color.
 \end{colorthemeexample}
 
-
 \subsubsection{Outer Color Themes}
 
-An outer color theme changes the palette colors, on which the colors
-used in the headline, footline, and sidebar 
-are based by default. Outer color themes normally do not change the
-color of inner elements, except possibly for |titlelike|. They have
-happen to sea-animal names. 
+An outer color theme changes the palette colors, on which the colors used in the headline, footline, and sidebar are based by default. Outer color themes normally do not change the color of inner elements, except possibly for |titlelike|. They have happen to be sea-animal names.
 
 \begin{colorthemeexample}{whale}
-  Installs a white-on-dark palette for the headline, footline, and
-  sidebar. The backgrounds used there are set to shades between the
-  structure \beamer-color and black. The foreground is set to
-  white.
-
-  While this color theme can appear to be aggressive, you should note
-  that a dark bar at the border of a frame will have a somewhat
-  different appearance during a presentation than it has on paper:
-  During a presentation the projection on the 
-  wall is usually surrounded by blackness. Thus, a dark bar will
-  not create a contrast as opposed to the way it does on
-  paper. Indeed, using this theme will cause the main part of the
-  frame to be more at the focus of attention.
-
-  The counterpart to the theme with respect to blocks is the |orchid|
-  theme. However, pairing it with the |rose| color theme is also
-  interesting. 
+  Installs a white-on-dark palette for the headline, footline, and sidebar. The backgrounds used there are set to shades between the structure \beamer-color and black. The foreground is set to white.
+
+  While this color theme can appear to be aggressive, you should note that a dark bar at the border of a frame will have a somewhat different appearance during a presentation than it has on paper: During a presentation the projection on the wall is usually surrounded by blackness. Thus, a dark bar will not create a contrast as opposed to the way it does on paper. Indeed, using this theme will cause the main part of the frame to be more at the focus of attention.
+
+  The counterpart to the theme with respect to blocks is the |orchid| theme. However, pairing it with the |rose| color theme is also interesting.
 \end{colorthemeexample}
 
 \begin{colorthemeexample}{seahorse}
-  Installs a near-transparent backgrounds for the headline, footline,
-  and sidebar. Using this theme will cause navigational elements to be
-  much less ``dominant'' than when using the |whale| theme (see the
-  discussion on contrast there, though).
+  Installs a near-transparent backgrounds for the headline, footline, and sidebar. Using this theme will cause navigational elements to be much less ``dominant'' than when using the |whale| theme (see the discussion on contrast there, though).
 
-  It goes well with the |rose| or the |lily| color theme. Pairing it
-  with the |orchid| overemphasizes blocks (in my opinion).
+  It goes well with the |rose| or the |lily| color theme. Pairing it with the |orchid| overemphasizes blocks (in Till's opinion).
 \end{colorthemeexample}
 
-
 \begin{colorthemeexample}{dolphin}
-  A color theme somewhere in the middle between the whale and the
-  seahorse. It was graciously donated by Manuel Carro. Like the
-  seahorse, it goes well with the |rose| and the |lily| color theme. 
+  A color theme somewhere in the middle between the whale and the seahorse. It was graciously donated by Manuel Carro. Like the seahorse, it goes well with the |rose| and the |lily| color theme.
 \end{colorthemeexample}
 
 
-
-
 \subsection{Changing the Colors Used for Different Elements of a Presentation}
 
 This section explains how \beamer's color management works.
 
+\subsubsection{Overview of Beamer's Color Management}
 
+In \beamer's philosophy, every element of a presentation can have a different color. Unfortunately, it turned out that simply assigning a single color to every element of a presentation is not such a good idea. First of all, we sometimes want colors of elements to change during a presentation, like the color of the item indicators when they become alerted or inside an example block. Second, some elements naturally have two colors, namely a foreground and a background, but not always. Third, sometimes elements somehow should not have any special color but should simply ``run along'' with the color of their surrounding. Finally, giving a special color to every element makes it very hard to globally change colors (like changing all the different kind-of-blue things into kind-of-red things) and it makes later extensions even harder.
 
-\subsubsection{Overview of Beamer's Color Management}
+For all these reasons, the color of an element in \beamer\ is a structured object, which we call a \emph{\beamer-color}. Every \beamer-color has two parts: a foreground and a background. Either of these may be ``empty,'' which means that whatever foreground or background was active before should remain active when the color is used.
 
-In \beamer's philosophy, every element of a presentation can have a
-different color. Unfortunately, it turned out that simply assigning a
-single color to every element of a presentation is not such a good
-idea. First of all, we sometimes  want colors of elements to change
-during a presentation, like the color of the item indicators when they
-become alerted or inside an example block. Second, some elements
-naturally have two colors, namely a foreground and a background, but
-not always. Third, sometimes element somehow should not have any
-special color but should simply ``run along'' with the color of their
-surrounding. Finally, giving a special color to every element makes it
-very hard to globally change colors (like changing all the different
-kind-of-blue things into kind-of-red things) and it makes later
-extensions even harder.
-
-For all these reasons, the color of an element in \beamer\ is a
-structured object, which I call a \emph{\beamer-color}. Every
-\beamer-color has two parts: a foreground and a background. Either of
-these may be ``empty,'' which means that whatever foreground or
-background was active before should remain active when the color is
-used.
-
-\beamer-colors can \emph{inherit} from other \beamer-colors and the
-default themes make extensive use of this feature. For example, there
-is a \beamer-color called |structure| and all sorts of elements
-inherit from this color. Thus, if someone changes |structure|, the
-color of all these elements automatically change accordingly. When a
-color inherits from another color, it can nevertheless still override
-only the foreground or the background.
-
-It is also possible to ``inherit'' from another \beamer-color in a more
-sophisticated way, which is more like \emph{using} the other
-\beamer-color in an indirect way. You can specify that, say, the
-background of the title should be a 90\% of the background of normal
-text and 10\% of the foreground of |structure|.
-
-Inheritance and using of other \beamer-colors is done
-dynamically. This means that if one of the parent \beamer-colors
-changes during the presentation, the derived colors automatically also
-change.
-
-The default color theme, which is always loaded, installs numerous
-\beamer-colors and inheritance relations between them. These colors
-are explained throughout this guide. The color used for, say,
-frametitles is discussed in the section on frametitles, and so on.  
+\beamer-colors can \emph{inherit} from other \beamer-colors and the default themes make extensive use of this feature. For example, there is a \beamer-color called |structure| and all sorts of elements inherit from this color. Thus, if someone changes |structure|, the color of all these elements automatically change accordingly. When a color inherits from another color, it can nevertheless still override only the foreground or the background.
 
+It is also possible to ``inherit'' from another \beamer-color in a more sophisticated way, which is more like \emph{using} the other \beamer-color in an indirect way. You can specify that, say, the background of the title should be a 90\% of the background of normal text and 10\% of the foreground of |structure|.
+
+Inheritance and using of other \beamer-colors is done dynamically. This means that if one of the parent \beamer-colors changes during the presentation, the derived colors automatically also change.
+
+The default color theme, which is always loaded, installs numerous \beamer-colors and inheritance relations between them. These colors are explained throughout this guide. The color used for, say, frametitles is discussed in the section on frametitles, and so on.
 
 \subsubsection{Using Beamer's Colors}
 
-A \beamer-color is not a normal color as defined by the |color| and
-|xcolor| packages and, accordingly, cannot be used directly as in
-commands like |\color| or |\colorlet|. Instead, in order to use a
-\beamer-color, you should first call the command |\usebeamercolor|,
-which is explained below. This command will setup two (normal) colors
-called |fg| (for foreground) and |bg| (for, well, guess what). You can
-then say |\color{fg}| to install the foreground color and
-|\color{bg}| to install the background color. You can also use the
-colors |fg| and |bg| in any context in which you normally use a color
-like, say, |red|. If a \beamer-color does not have a foreground or a
-background, the colors |fg| or |bg| (or both) remain unchanged. 
-
-Inside templates, this command will typically have already been called
-for you with the option |[fg]|. 
-
-\begin{command}{\usebeamercolor\opt{|*|}\oarg{fg or
-      bg}\marg{beamer-color name}}
-  This command (possibly) changes the two colors |fg| and |bg| to the
-  foreground and background color of the \meta{beamer-color name}. If
-  the \beamer-color does not specify a foreground, |fg| is left
-  unchanged; if does not specify a background, |bg| is left
-  unchanged. 
-
-  You will often wish to directly use the color |fg| or |bg| after
-  using this command. For this common situation, the optional argument
-  \meta{fg or bg} is useful, which may be either |fg| or
-  |bg|. Giving this option will cause the foreground |fg| or the
-  background |bg| to be immediately installed after they have been
-  setup. Thus, the following command
+A \beamer-color is not a normal color as defined by the |color| and |xcolor| packages and, accordingly, cannot be used directly as in commands like |\color| or |\colorlet|. Instead, in order to use a \beamer-color, you should first call the command |\usebeamercolor|, which is explained below. This command will setup two (normal) colors called |fg| (for foreground) and |bg| (for, well, guess what). You can then say |\color{fg}| to install the foreground color and |\color{bg}| to install the background color. You can also use the colors |fg| and |bg| in any context in which you normally use a color like, say, |red|. If a \beamer-color does not have a foreground or a background, the colors |fg| or |bg| (or both) remain unchanged.
+
+Inside templates, this command will typically have already been called for you with the option |[fg]|.
+
+\begin{command}{\usebeamercolor\opt{|*|}\oarg{fg or bg}\marg{beamer-color name}}
+  This command (possibly) changes the two colors |fg| and |bg| to the foreground and background color of the \meta{beamer-color name}. If the \beamer-color does not specify a foreground, |fg| is left unchanged; if does not specify a background, |bg| is left unchanged.
+
+  You will often wish to directly use the color |fg| or |bg| after using this command. For this common situation, the optional argument \meta{fg or bg} is useful, which may be either |fg| or |bg|. Giving this option will cause the foreground |fg| or the background |bg| to be immediately installed after they have been setup. Thus, the following command
+  
 \begin{verbatim}
 \usebeamercolor[fg]{normal text}
 \end{verbatim}
@@ -393,35 +212,13 @@ for you with the option |[fg]|.
 \color{fg}
 \end{verbatim}
 
-  If you use the starred version of this command, the \beamer-color
-  |normal text| is used before the command is invoked. This ensures
-  that, barring evil trickery, the colors |fg| and |bg| will be setup
-  independently of whatever colors happened to be in use when the
-  command is invoked.
-
-  This command has special side-effects. First, the (normal) color
-  |parent.bg| is set to the value of |bg| prior to this call. Thus you
-  can access the color that was in use prior to the call of this
-  command via the color |parent.bg|.
-
-  Second, the special color \meta{beamer-color name}|.fg| is \emph{globally}
-  set to the same value as |fg| and \meta{beamer-color name}|.bg| is
-  globally set to the value of |bg|. This allows you to access the
-  foreground or background of a certain \meta{beamer-color name} after
-  another \beamer-color has been used. However, referring to these
-  special global colors should be kept to the unavoidable minimum and
-  should be done as locally as possible since a change of the
-  \beamer-color will not reflect in a change of the colors
-  \meta{beamer-color name}|.fg| and \meta{beamer-color name}|.bg|
-  until the next invocation of |\usebeamercolor|. Also, if the
-  \meta{beamer-color name} does not specify a foreground or a
-  background color, then the values of the special colors are whatever
-  happened to be the foreground or background at the time of the last
-  invocation of |\usebeamercolor|.
-
-  So, try not to get into the habit of writing |\color{structure.fg}|
-  all the time, at least not without a |\usebeamercolor{structure}|
-  close by.
+  If you use the starred version of this command, the \beamer-color |normal text| is used before the command is invoked. This ensures that, barring evil trickery, the colors |fg| and |bg| will be setup independently of whatever colors happened to be in use when the command is invoked.
+
+  This command has special side-effects. First, the (normal) color |parent.bg| is set to the value of |bg| prior to this call. Thus you can access the color that was in use prior to the call of this command via the color |parent.bg|.
+
+  Second, the special color \meta{beamer-color name}|.fg| is \emph{globally} set to the same value as |fg| and \meta{beamer-color name}|.bg| is globally set to the value of |bg|. This allows you to access the foreground or background of a certain \meta{beamer-color name} after another \beamer-color has been used. However, referring to these special global colors should be kept to the unavoidable minimum and should be done as locally as possible since a change of the \beamer-color will not reflect in a change of the colors \meta{beamer-color name}|.fg| and \meta{beamer-color name}|.bg| until the next invocation of |\usebeamercolor|. Also, if the \meta{beamer-color name} does not specify a foreground or a background color, then the values of the special colors are whatever happened to be the foreground or background at the time of the last invocation of |\usebeamercolor|.
+
+  So, try not to get into the habit of writing |\color{structure.fg}| all the time, at least not without a |\usebeamercolor{structure}| close by.
 
   \example
 \begin{verbatim}
@@ -432,18 +229,14 @@ for you with the option |[fg]|.
     \colorbox{bg}{Frame Title}
   }
 \end{verbatim}
-  
+
   \articlenote
   This command has no effect in |article| mode.
 \end{command}
 
 
-\begin{command}{\ifbeamercolorempty\oarg{fg or bg}\marg{beamer-color
-      name}\marg{if undefined}\marg{if defined}}
-  This command can be used to check whether the foreground or
-  background of some \meta{beamer-color name} is non-empty. If the
-  foreground or background of \meta{beamer-color name} is defined,
-  \meta{if defined} will be executed, otherwise the \meta{if undefined} code.
+\begin{command}{\ifbeamercolorempty\oarg{fg or bg}\marg{beamer-color name}\marg{if undefined}\marg{if defined}}
+  This command can be used to check whether the foreground or background of some \meta{beamer-color name} is non-empty. If the foreground or background of \meta{beamer-color name} is defined, \meta{if defined} will be executed, otherwise the \meta{if undefined} code.
 
   \example
 \begin{verbatim}
@@ -459,65 +252,43 @@ for you with the option |[fg]|.
 \end{verbatim}
 \end{command}
 
-
-
-
 \subsubsection{Setting Beamer's Colors}
 
-To set or to change a \beamer-color, you can use the command
-|\setbeamercolor|.
+To set or to change a \beamer-color, you can use the command |\setbeamercolor|.
 
 \begin{command}{\setbeamercolor\opt{|*|}\marg{beamer-color name}\marg{options}}
-  Sets or changes a \beamer-color. The \meta{beamer-color name} should
-  be a reasonably simple text (do not try too much trickery and avoid
-  punctuation symbols), but it may contain spaces. Thus, |normal text|
-  is a valid \meta{beamer-color name} and so is |My Color Number 2|.
+  Sets or changes a \beamer-color. The \meta{beamer-color name} should be a reasonably simple text (do not try too much trickery and avoid punctuation symbols), but it may contain spaces. Thus, |normal text| is a valid \meta{beamer-color name} and so is |My Color Number 2|.
 
-  In the most simple case, you just specify a foreground by giving the
-  |fg=| option and, possibly, also a background using the |bg=|
-  option.
+  In the most simple case, you just specify a foreground by giving the |fg=| option and, possibly, also a background using the |bg=| option.
 
   \example |\setbeamercolor{normal text}{fg=black,bg=mylightgrey}|
   \example |\setbeamercolor{alerted text}{fg=red!80!black}|
-  
-  The effect of this command is accumulative, thus the following two
-  commands
+
+  The effect of this command is accumulative, thus the following two commands
+
 \begin{verbatim}
 \setbeamercolor{section in toc}{fg=blue}
 \setbeamercolor{section in toc}{bg=white}
 \end{verbatim}
-  have the same effect as 
+  have the same effect as
 \begin{verbatim}
 \setbeamercolor{section in toc}{fg=blue,bg=white}
 \end{verbatim}
-  Naturally, a second call with the same kind of \meta{option} set to
-  a different value overrides a previous call.
 
-  The starred version first resets everything, thereby ``switching
-  off'' the accumulative effect. Use this starred version to
-  completely reset the definition of some \beamer-color.
+  Naturally, a second call with the same kind of \meta{option} set to a different value overrides a previous call.
+
+  The starred version first resets everything, thereby ``switching off'' the accumulative effect. Use this starred version to completely reset the definition of some \beamer-color.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|fg=|\meta{color}} sets the foreground color of
-    \meta{beamer-color name} to the given (normal)   \meta{color}. The
-    \meta{color} may also be a color expression like |red!50!black|,
-    see the manual of the \textsc{xcolor} package. If \meta{color}
-    is empty, the \meta{beamer-color name} ``has no special
-    foreground'' and when the color is used, the foreground
-    currently in force should not be changed.
-
-    Specifying a foreground this way will override any inherited
-    foreground color.
-  \item  \declare{|bg=|\meta{color}} does the same as the |fg|
-    option, but for the background.
-  \item \declare{|parent=|\meta{parent beamer-color(s)}} specifies
-    that \meta{beamer-color name} should inherit from the specified
-    \meta{parent beamer-color(s)}. Any foreground and/or background
-    color set by the parents will also be used when
-    \meta{beamer-color name} is used. If multiple parents specify
-    a foreground, the last one ``wins''; and likewise for the
-    backgrounds.
+  \item
+    \declare{|fg=|\meta{color}} sets the foreground color of \meta{beamer-color name} to the given (normal)   \meta{color}. The \meta{color} may also be a color expression like |red!50!black|, see the manual of the \textsc{xcolor} package. If \meta{color} is empty, the \meta{beamer-color name} ``has no special foreground'' and when the color is used, the foreground currently in force should not be changed.
+
+    Specifying a foreground this way will override any inherited foreground color.
+  \item
+    \declare{|bg=|\meta{color}} does the same as the |fg| option, but for the background.
+  \item
+    \declare{|parent=|\meta{parent beamer-color(s)}} specifies that \meta{beamer-color name} should inherit from the specified \meta{parent beamer-color(s)}. Any foreground and/or background color set by the parents will also be used when \meta{beamer-color name} is used. If multiple parents specify a foreground, the last one ``wins''; and likewise for the backgrounds.
 
     \example
 \begin{verbatim}
@@ -534,35 +305,28 @@ To set or to change a \beamer-color, you can use the command
 \end{beamercolorbox}
 \end{verbatim}
 
-    Note that a change of the foreground or background of a parent
-    changes the corresponding foreground or background of the child
-    (unless it is overruled).
+    Note that a change of the foreground or background of a parent changes the corresponding foreground or background of the child (unless it is overruled).
+
+    A \beamer-color cannot only have parents, but also grandparents and so on.
+  \item
+    \declare{|use=|\meta{another beamer-color}} is used to make sure that another \beamer-color is setup correctly before the foreground or background color specification are evaluated.
 
-    A \beamer-color cannot only have parents, but also grandparents
-    and so on.
-  \item \declare{|use=|\meta{another beamer-color}} is used to
-    make sure that another \beamer-color is setup correctly before the
-    foreground or background color specification are evaluated.
+    Suppose you wish the foreground of items to be a mixture of 50\% of the foreground of structural elements and 50\% of the normal foreground color. You could try
 
-    Suppose you wish the foreground of items to be a mixture
-    of 50\% of the foreground of structural elements and 50\% of the
-    normal foreground color. You could try
 \begin{verbatim}
 \setbeamercolor{item}{fg=structure.fg!50!normal text.fg}
 \end{verbatim}
-    However, this will not necessarily give the desired result: If
-    the \beamer-color |structure| changes, the (normal) color
-    |structure.fg| is not immediately updated. In order to ensure
-    that the normal color |structure.fg| is correct, use the
-    following:
+
+    However, this will not necessarily give the desired result: If the \beamer-color |structure| changes, the (normal) color |structure.fg| is not immediately updated. In order to ensure that the normal color |structure.fg| is correct, use the following:
+
 \begin{verbatim}
 \setbeamercolor{item}{use={structure,normal text},fg=structure.fg!50!normal text.fg}
 \end{verbatim}
-    This will guarantee that the colors |structure.fg| and
-    |normal text.fg| are setup correctly when the foreground of
-    |item| is computed.
+
+    This will guarantee that the colors |structure.fg| and |normal text.fg| are setup correctly when the foreground of |item| is computed.
 
     To show the difference, consider the following example:
+
 \begin{verbatim}
 \setbeamercolor{grandfather}{fg=red}
 \setbeamercolor{grandmother}{bg=white}
@@ -587,98 +351,45 @@ To set or to change a \beamer-color, you can use the command
 \end{command}
 
 
-
-  
 \subsection{The Color of Mathematical Text}
 
-By default, mathematical text does not have any special color---it
-just inherits the ``surrounding'' color. Some people prefer
-mathematical text to have some special color. Though I do not
-recommend this (I think mathematical text should \emph{not} stand out
-admit the normal text), \beamer\ makes it (reasonably) easy to change
-the color of mathematical text. Simply change the following colors:
+By default, mathematical text does not have any special color---it just inherits the ``surrounding'' color. Some people prefer mathematical text to have some special color. Though we do not recommend this (we believe mathematical text should \emph{not} stand out amid the normal text), \beamer\ makes it (reasonably) easy to change the color of mathematical text. Simply change the following colors:
 
 \begin{element}{math text}\no\yes\no
-  This color is the parent of |math text inlined| and
-  |math text displayed|. It is empty by default. See those colors for
-  details. 
+  This color is the parent of |math text inlined| and |math text displayed|. It is empty by default. See those colors for details.
 \end{element}
 
 \begin{element}{math text inlined}\no\yes\no
   \colorparents{math text}
-  If the foreground of this color is set, inlined mathematical text is
-  typeset using this color. This is done via some |\everymath| hackery
-  and may not work in all cases. If not, you'll have to try to find a
-  way around the problem. The background is currently
-  ignored. 
+  If the foreground of this color is set, inlined mathematical text is typeset using this color. This is done via some |\everymath| hackery and may not work in all cases. If not, you'll have to try to find a way around the problem. The background is currently ignored.
 \end{element}
 
 \begin{element}{math text displayed}\no\yes\no
   \colorparents{math text}
-  Like |math text inlined|, only for so-called ``displayed''
-  mathematical text. This is mathematical text between |\[| and |\]| or
-  between |$$| and |$$| or inside environments like |equation| or
-  |align|. The setup of this color is somewhat fragile, use at your
-  own risk. The background is currently
-  ignored.   
+  Like |math text inlined|, only for so-called ``displayed'' mathematical text. This is mathematical text between |\[| and |\]| or between |$$| and |$$| or inside environments like |equation| or |align|. The setup of this color is somewhat fragile, use at your own risk. The background is currently ignored.
 \end{element}
 
 \begin{element}{normal text in math text}\no\yes\no
-  If the foreground of this color is set, normal text inside
-  mathematical text (which is introduced using the |\text| command)
-  will be typeset using this color. The background is currently
-  ignored. 
+  If the foreground of this color is set, normal text inside mathematical text (which is introduced using the |\text| command) will be typeset using this color. The background is currently ignored.
 \end{element}
 
 
-
 \subsection{The Color Palettes}
 
-When one designs a color theme, one faces the following problem:
-Suppose we want the colors in the headline to gradually change from
-black to, say, blue. Whatever is at the very top of the headline
-should be black, what comes right below it should be dark blue, and at
-the bottom of the headline things should just be blue. Unfortunately,
-different outer themes will put different things at the top. One theme
-might put the author at the top, another theme might put the document
-title there. This makes it impossible to directly assign one of the
-three colors ``black'', ``dark blue,'' and ``blue'' to the different
-elements that are typically rendered in the headline. No matter how we
-assign them, things will look wrong for certain outer themes.
-
-To circumvent this problem, \beamer\ uses a layer of \emph{palette
-colors}. Color themes typically only change these palette colors. For
-example, a color theme might make the \beamer-color |palette primary|
-blue, make |palette secondary| a dark blue, and make |palette tertiary|
-black. Outer themes can now setup things such that whatever they show
-at the top of the headline inherits from |palette tertiary|, what comes
-below inherits from |palette secondary|, and whatever is at the bottom
-inherits from |palette tertiary|. This way, color themes can change the
-way even complicated outer themes look and they can do so
-consistently.
-
-Note that the user can still change the color of every element
-individually, simply by overriding the color(s) of the elements in the
-headline. In a sense, the palette colors are just a ``suggestion'' how
-things should be colored by an outer theme.
+When one designs a color theme, one faces the following problem: Suppose we want the colors in the headline to gradually change from black to, say, blue. Whatever is at the very top of the headline should be black, what comes right below it should be dark blue, and at the bottom of the headline things should just be blue. Unfortunately, different outer themes will put different things at the top. One theme might put the author at the top, another theme might put the document title there. This makes it impossible to directly assign one of the three colors ``black'', ``dark blue,'' and ``blue'' to the different elements that are typically rendered in the headline. No matter how we assign them, things will look wrong for certain outer themes.
 
-In detail, the following palette colors are used by outer themes.
+To circumvent this problem, \beamer\ uses a layer of \emph{palette colors}. Color themes typically only change these palette colors. For example, a color theme might make the \beamer-color |palette primary| blue, make |palette secondary| a dark blue, and make |palette tertiary| black. Outer themes can now setup things such that whatever they show at the top of the headline inherits from |palette primary|, what comes below inherits from |palette secondary|, and whatever is at the bottom inherits from |palette tertiary|. This way, color themes can change the way even complicated outer themes look and they can do so consistently.
 
+Note that the user can still change the color of every element individually, simply by overriding the color(s) of the elements in the headline. In a sense, the palette colors are just a ``suggestion'' how things should be colored by an outer theme.
+
+In detail, the following palette colors are used by outer themes.
 
 \begin{element}{palette primary}\no\yes\no
-  Outer themes (should) base the color of navigational elements and,
-  possibly, also of other elements, on the four palette colors. The
-  ``primary'' palette should be used for the most important
-  navigational elements, which are usually the ones that change most
-  often and hence require the most attention by the audience. The
-  ``secondary'' and ``tertiary'' are less important, the ``quaternary'' one
-  is least important.
-
-  By default, the palette colors do not have a background and the
-  foreground ranges from |structure.fg| to |black|.
-
-  For the sidebar, there is an extra set of palette colors, see
-  |palette sidebar primary|. 
+  Outer themes (should) base the color of navigational elements and, possibly, also of other elements, on the four palette colors. The ``primary'' palette should be used for the most important navigational elements, which are usually the ones that change most often and hence require the most attention by the audience. The ``secondary'' and ``tertiary'' are less important, the ``quaternary'' one is least important.
+
+  By default, the palette colors do not have a background and the foreground ranges from |structure.fg| to |black|.
+
+  For the sidebar, there is an extra set of palette colors, see |palette sidebar primary|.
 \end{element}
 
 \begin{element}{palette secondary}\no\yes\no
@@ -694,9 +405,7 @@ In detail, the following palette colors are used by outer themes.
 \end{element}
 
 \begin{element}{palette sidebar primary}\no\yes\no
-  Similar to |palette primary|, only outer themes (should) base the
-  colors of elements in the sidebar of the four sidebar palette
-  colors.
+  Similar to |palette primary|, only outer themes (should) base the colors of elements in the sidebar on the four sidebar palette colors.
 \end{element}
 
 \begin{element}{palette sidebar secondary}\no\yes\no
@@ -712,45 +421,28 @@ In detail, the following palette colors are used by outer themes.
 \end{element}
 
 
+\subsection{Miscellaneous Colors}
 
-\subsection{Miscellaneous  Colors}
-
-In this section some ``basic'' colors are listed that do not
-``belong'' to any special commands. 
+In this section some ``basic'' colors are listed that do not ``belong'' to any special commands.
 
 \begin{element}{normal text}\no\yes\yes
-  The color is used for normal text. At the beginning of
-  the document the foreground color is installed as
-  |\normalcolor|. The background of this color is used by the
-  default background canvas for the background of the
-  presentation, see Section~\ref{section-canvas}. The background is
-  also the default value of the normal color |bg|. 
-
-  Since the color is the ``root'' of all other \beamer-colors, both a
-  foreground and a background must be installed. In particular, to get
-  a transparent background canvas, make the background of the
-  \beamer-color |background canvas| empty, not the background of this
-  color.
-
-  The \beamer-font currently is not used. In particular, redefining this
-  font will not have any effect. This is likely to change in the future.
+  The color is used for normal text. At the beginning of the document the foreground color is installed as |\normalcolor|. The background of this color is used by the default background canvas for the background of the presentation, see Section~\ref{section-canvas}. The background is also the default value of the normal color |bg|.
+
+  Since the color is the ``root'' of all other \beamer-colors, both a foreground and a background must be installed. In particular, to get a transparent background canvas, make the background of the \beamer-color |background canvas| empty, not the background of this color.
+
+  The \beamer-font currently is not used. In particular, redefining this font will not have any effect. This is likely to change in the future.
 \end{element}
 
 \begin{element}{example text}\no\yes\yes
-  The color/font is used when text is typeset inside an |example|
-  block. 
+  The color/font is used when text is typeset inside an |example| block.
 \end{element}
 
 \begin{element}{titlelike}\no\yes\yes
-  This color/font is a more specialized form of the |structure|
-  color/font. It is the base for all elements that are ``like
-  titles.'' This includes the frame title and subtitle as well as the
-  document title and subtitle.
+  This color/font is a more specialized form of the |structure| color/font. It is the base for all elements that are ``like titles.'' This includes the frame title and subtitle as well as the document title and subtitle.
 \end{element}
 
 \begin{element}{separation line}\no\yes\no
-  The foreground of this color is used for separating lines. If the
-  foreground is empty, no separation line is drawn.
+  The foreground of this color is used for separating lines. If the foreground is empty, no separation line is drawn.
 \end{element}
 
 \begin{element}{upper separation line head}\no\yes\no
@@ -784,122 +476,62 @@ In this section some ``basic'' colors are listed that do not
 \end{element}
 
 
-
-
 \subsection{Transparency Effects}
 \label{section-transparent}
 
-By default, \emph{covered} items are not shown during a
-presentation. Thus if you write |\uncover<2>{Text.}|, the text
-is not shown on any but the second slide. On the other slide, the text
-is not simply printed using the background color -- it is not shown at
-all. This effect is most useful if your background does not have a
-uniform color.
-
-Sometimes however, you might prefer that covered items are not
-completely covered. Rather, you would like them to be shown already in
-a very dim or shaded way. This allows your audience to get a feeling
-for what is yet to come, without getting distracted by it. Also, you
-might wish text that is covered ``once more'' still to be visible to
-some degree.
-
-Ideally, there would be an option to make covered text
-``transparent.'' This would mean that when covered text is shown, it
-would instead be mixed with the background behind it. Unfortunately,
-|pgf| does not support real transparency yet. Instead, transparency is
-created by mixing the color of the object you want to show with the
-current background color (the color |bg|, which has hopefully been
-setup such that it is the average color of the background on which the
-object should be placed). To install this effect, you can use:
+By default, \emph{covered} items are not shown during a presentation. Thus if you write |\uncover<2>{Text.}|, the text is not shown on any but the second slide. On the other slides, the text is not simply printed using the background color -- it is not shown at all. This effect is most useful if your background does not have a uniform color.
+
+Sometimes however, you might prefer that covered items are not completely covered. Rather, you would like them to be shown already in a very dim or shaded way. This allows your audience to get a feeling for what is yet to come, without getting distracted by it. Also, you might wish text that is covered ``once more'' still to be visible to some degree.
+
+Ideally, there would be an option to make covered text ``transparent.'' This would mean that when covered text is shown, it would instead be mixed with the background behind it. Unfortunately, |pgf| does not support real transparency yet. Instead, transparency is created by mixing the color of the object you want to show with the current background color (the color |bg|, which has hopefully been setup such that it is the average color of the background on which the object should be placed). To install this effect, you can use:
+
 \begin{verbatim}
 \setbeamercovered{transparent}
 \end{verbatim}
-This command allows you to specify in a quite general way how a
-covered item should be rendered. You can even specify different ways
-of rendering the item depending on how long it will take before this
-item is shown or for how long it has already been covered once
-more. The transparency effect will automatically apply to all colors,
-\emph{except} for the colors in images. For images there is a
-workaround, see the documentation of the \pgfname\ package. 
+
+This command allows you to specify in a quite general way how a covered item should be rendered. You can even specify different ways of rendering the item depending on how long it will take before this item is shown or for how long it has already been covered once more. The transparency effect will automatically apply to all colors, \emph{except} for the colors in images. For images there is a workaround, see the documentation of the \pgfname\ package.
 
 \begin{command}{\setbeamercovered\marg{options}}
-  This command offers several different options, the most important of
-  which is |transparent|. All options are internally mapped to the two
-  options |still covered| and |again covered|.
+  This command offers several different options, the most important of which is |transparent|. All options are internally mapped to the two options |still covered| and |again covered|.
 
   In detail, the following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|invisible|} is the default and causes covered text
-    to ``completely disappear.
-  \item \declare{|transparent|}\opt{|=|\meta{opaqueness}} causes
-    covered text to be typset in a ``transparent'' way. By default,
-    this means that 85\% of the background color is mixed into all
-    colors or that the \meta{opaqueness} of the text is 15\%. You can
-    specify a different \meta{percentage}, where |0| means ``totally
-    transparent'' and |100| means ``totally opaque.''
-
-    Unfortunately, this value is kind of ``specific'' to every
-    projector. What looks good on your screen need not look good
-    during a presentation.
-  \item \declare{|dynamic|} Makes all covered text quite transparent,
-    but in a dynamic way. The longer it will take till the text is
-    uncovered, the stronger the transparency. 
-  \item \declare{|highly dynamic|} Has the same effect as |dynamic|,
-    but the effect is stronger.
-  \item \declare{|still covered=|\meta{not yet list}} specifies  how
-    to render covered items that have not yet been uncovered. The
-    \meta{not yet list} should be a list of |\opaqueness| commands,
-    see the description of that command, below.
+  \item
+    \declare{|invisible|} is the default and causes covered text to ``completely disappear''.
+  \item
+    \declare{|transparent|}\opt{|=|\meta{opaqueness}} causes covered text to be typset in a ``transparent'' way. By default, this means that 85\% of the background color is mixed into all colors or that the \meta{opaqueness} of the text is 15\%. You can specify a different \meta{percentage}, where |0| means ``totally transparent'' and |100| means ``totally opaque.''
+
+    Unfortunately, this value is kind of ``specific'' to every projector. What looks good on your screen need not look good during a presentation.
+  \item
+    \declare{|dynamic|} Makes all covered text quite transparent, but in a dynamic way. The longer it will take till the text is uncovered, the stronger the transparency.
+  \item
+    \declare{|highly dynamic|} Has the same effect as |dynamic|, but the effect is stronger.
+  \item
+    \declare{|still covered=|\meta{not yet list}} specifies how to render covered items that have not yet been uncovered. The \meta{not yet list} should be a list of |\opaqueness| commands, see the description of that command, below.
     \example
 \begin{verbatim}
 \setbeamercovered{%
   still covered={\opaqueness<1>{15}\opaqueness<2>{10}\opaqueness<3>{5}\opaqueness<4->{2}},
   again covered={\opaqueness<1->{15}}}
 \end{verbatim}
-  \item \declare{|again covered=|\meta{once more list}} specifies how
-    to render covered items that have once more been covered, that is,
-    that had been shown before but are now covered again.
+
+  \item
+    \declare{|again covered=|\meta{once more list}} specifies how to render covered items that have once more been covered, that is, that had been shown before but are now covered again.
   \end{itemize}
 \end{command}
 
-\begin{command}{\opaqueness\ssarg{overlay
-      specification}\marg{percentage of opaqueness}}
-  The \meta{overlay specification} specifies on which slides covered
-  text should have which \meta{percentage of opaqueness}. Unlike
-  other overlay specifications, this \meta{overlay specification} is a
-  ``relative'' overlay specification. For example, the specification
-  ``3'' here means ``things that will be uncovered three slides
-  ahead,'' respectively ``things that have once more been covered for
-  three slides.'' More precisely, if an item is uncovered for more
-  than one slide and then covered once more, only the ``first moment
-  of uncovering'' is used for the calculation of how long the item has
-  been covered once more.
-
-  An opaqueness of 100 is fully opaque and 0 is fully
-  transparent. Currently, since real transparency is not yet
-  implemented, this command causes all colors to get a mixing of
-  \meta{percentage of opaqueness} of the current
-  |bg|. At some future point this command might result in real
-  transparency. 
-
-  The alternate \pgfname\ extension used inside an opaque area is
-  \meta{percentage of opaqueness}|opaque|. In case of nested calls,
-  only the innermost opaqueness specification is used. 
+\begin{command}{\opaqueness\ssarg{overlay specification}\marg{percentage of opaqueness}}
+  The \meta{overlay specification} specifies on which slides covered text should have which \meta{percentage of opaqueness}. Unlike other overlay specifications, this \meta{overlay specification} is a ``relative'' overlay specification. For example, the specification ``3'' here means ``things that will be uncovered three slides ahead,'' respectively ``things that have once more been covered for three slides.'' More precisely, if an item is uncovered for more than one slide and then covered once more, only the ``first moment of uncovering'' is used for the calculation of how long the item has been covered once more.
+
+  An opaqueness of 100 is fully opaque and 0 is fully transparent. Currently, since real transparency is not yet implemented, this command causes all colors to get a mixing of \meta{percentage of opaqueness} of the current |bg|. At some future point this command might result in real transparency.
+
+  The alternate \pgfname\ extension used inside an opaque area is \meta{percentage of opaqueness}|opaque|. In case of nested calls, only the innermost opaqueness specification is used.
   \example
 \begin{verbatim}
 \setbeamercovered{still covered={\opaqueness<1->{15}},again covered={\opaqueness<1->{15}}}
 \pgfdeclareimage{book}{book}
 \pgfdeclareimage{book.!15opaque}{filenameforbooknearlytransparent}
 \end{verbatim}
-  Makes everything that is uncovered in two slides only 15 percent
-  opaque. 
-\end{command}
 
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+  Makes everything that is uncovered in two slides only 15 percent opaque.
+\end{command}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-compatibility.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-compatibility.tex
index 57a1bcfc97a..62a1b5eb2f7 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-compatibility.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-compatibility.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,93 +8,61 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-compatibility.tex,v 1.12 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \subsection{Compatibility with Other Packages and Classes}
 
-When using certain packages or classes together with the |beamer|
-class, extra options or precautions may be necessary.
+When using certain packages or classes together with the |beamer| class, extra options or precautions may be necessary.
 
 \begin{package}{{AlDraTex}}
-  Graphics created using AlDraTex must be treated like verbatim
-  text. The reason is that DraTex fiddles with catcodes and spaces
-  much like verbatim does. So, in order to insert a picture, either
-  add the |fragile| option to the frame or use the
-  |\defverbatim| command to create a box containing the picture.
+  Graphics created using AlDraTex must be treated like verbatim text. The reason is that DraTex fiddles with catcodes and spaces much like verbatim does. So, in order to insert a picture, either add the |fragile| option to the frame or use the |\defverbatim| command to create a box containing the picture.
 \end{package}
 
 \begin{package}{{alltt}}
-  Text in an |alltt| environment must be treated like verbatim
-  text. So add the |fragile| option to frames containing this
-  environment or use |\defverbatim|.
+  Text in an |alltt| environment must be treated like verbatim text. So add the |fragile| option to frames containing this environment or use |\defverbatim|.
 \end{package}
 
 \begin{package}{{amsthm}}
-  This package is automatically loaded since \beamer\ uses it for
-  typesetting theorems. If you do not wish it to be loaded, which can
-  be necessary especially in |article| mode if the package is
-  incompatible with the document class, you can use the class option
-  |noamsthm| to suppress its loading. See
-  Section~\ref{section-theorems} for more details.
+  This package is automatically loaded since \beamer\ uses it for typesetting theorems. If you do not wish it to be loaded, which can be necessary especially in |article| mode if the package is incompatible with the document class, you can use the class option |noamsthm| to suppress its loading. See Section~\ref{section-theorems} for more details.
 \end{package}
 
 \begin{package}{{babel}|[|\declare{|french|}|]|}
-  When using the |french| style, certain features that clash with the
-  functionality of the \beamer\ class will be turned off. For example,
-  enumerations are still produced the way the theme dictates, not the
-  way the |french| style does.
+  When using the |french| style, certain features that clash with the functionality of the \beamer\ class will be turned off. For example, enumerations are still produced the way the theme dictates, not the way the |french| style does.
 \end{package}
 
 \begin{package}{{babel}|[|\declare{|spanish|}|]|}
   \beamernote
-  When using the |spanish| style, certain features that clash with the
-  functionality of the \beamer\ class will be turned off. In particular,
-  the special behaviour of the pointed brackets |<| and |>| is
-  deactivated. 
+  When using the |spanish| style, certain features that clash with the functionality of the \beamer\ class will be turned off. In particular, the special behaviour of the pointed brackets |<| and |>| is deactivated.
 
   \articlenote
-  To make the characters |<| and |>| active in |article| mode, pass
-  the option |activeospeccharacters| to the package
-  |beamerbasearticle|. This will lead to
-  problems with overlay specifications.
+  To make the characters |<| and |>| active in |article| mode, pass the option |activeospeccharacters| to the package |beamerbasearticle|. This will lead to problems with overlay specifications.
 \end{package}
 
 \begin{package}{{color}}
   \beamernote
-  The |color| package is automatically loaded by |beamer.cls|. This
-  makes it impossible to pass options to |color| in the preamble of
-  your document in the normal manner. To pass a \meta{list of options}
-  to |color|, you can use the following class option:
+  The |color| package is automatically loaded by |beamer.cls|. This makes it impossible to pass options to |color| in the preamble of your document in the normal manner. To pass a \meta{list of options} to |color|, you can use the following class option:
 
   \begin{classoption}{color={\normalfont\meta{list of options}}}
-    Causes the \meta{list of options} to be passed on to the |color|
-    package. If the \meta{list of options} contains more than one
-    option you must enclose it in curly brackets.
+  Causes the \meta{list of options} to be passed on to the |color| package. If the \meta{list of options} contains more than one option you must enclose it in curly brackets.
   \end{classoption}
 
   \articlenote
-  The |color| package is not loaded automatically if
-  |beamerarticle| is loaded with the |noxcolor| option.
+  The |color| package is not loaded automatically if |beamerarticle| is loaded with the |noxcolor| option.
 \end{package}
 
 \begin{package}{{colortbl}}
   \beamernote
-  With newer versions of |xcolor.sty|, you need to pass the option
-  |table| to |xcolor.sty| if you wish to use |colortbl|. See the notes
-  on |xcolor| below, on how to do this.
+  With newer versions of |xcolor.sty|, you need to pass the option |table| to |xcolor.sty| if you wish to use |colortbl|. See the notes on |xcolor| below, on how to do this.
 \end{package}
 
 \begin{package}{{CJK}}
   \beamernote
-  When using the |CJK| package for using Asian fonts, you must use the
-  class option \declare{|CJK|}. See |beamerexample4.tex| for an
-  example. 
+  When using the |CJK| package for using Asian fonts, you must use the class option \declare{|CJK|}. See |beamerexample4.tex| for an example.
 \end{package}
 
 \begin{package}{{deluxetable}}
   \beamernote
-  The caption generation facilities of |deluxetable| are
-  deactivated. Instead, the caption template is used.
+  The caption generation facilities of |deluxetable| are deactivated. Instead, the caption template is used.
 \end{package}
 
 \begin{package}{{DraTex}}
@@ -102,53 +71,33 @@ class, extra options or precautions may be necessary.
 
 \begin{package}{{enumerate}}
   \articlenote
-  This package is loaded automatically in the |presentation| modes, but not
-  in the |article| mode. If you use its features, you have to load the
-  package ``by hand'' in the |article| mode.
+  This package is loaded automatically in the |presentation| modes, but not in the |article| mode. If you use its features, you have to load the package ``by hand'' in the |article| mode.
 \end{package}
 
 \begin{class}{{foils}}
-  If you wish to emulate the |foils| class using \beamer, please see
-  Section~\ref{section-foiltex}.
+  If you wish to emulate the |foils| class using \beamer, please see Section~\ref{section-foiltex}.
 \end{class}
 
-\begin{package}{{fontenc}|[|\declare{|T1|}|]|}
-  Use this option only with fonts that have outline fonts available in
-  the T1 encoding like Times or the |lmodern| fonts. In a standard
-  installation the standard Computer Modern fonts (the fonts Donald
-  Knuth originally designed and which are used by default) are
-  \emph{not} available in the T1 encoding. Using this  option with
-  them will result in very poor rendering of your presentation when
-  viewed with \pdf\ viewer applications like Acrobat or |xpdf|. To use
-  the Computer Modern fonts with the T1 encoding, use the package
-  |lmodern|.  See also Section~\ref{section-font-encoding}.
+\begin{package}{{fontenc}|[|\declare{|T1,EU1,EU2|}|]|}
+  Use the |T1| option \emph{only} with fonts that have outline fonts available in the T1 encoding like |times| or the |lmodern| fonts. In a standard installation standard Computer Modern fonts (the fonts Donald Knuth originally designed and which are used by default) are \emph{not} available in the T1 encoding. Using this option with them will result in very poor rendering of your presentation when viewed with \pdf\ viewer applications like Acrobat, |xpdf|, |evince| or |okular|. To use the Computer Modern fonts with the T1 encoding, use the package |lmodern|. See also Section~\ref{section-font-encoding}. This applies both to |latex|+|dvips| and |pdflatex|
+
+  Use the |EU1| option with |xelatex|, and |EU2| option with |lualatex|. Note that |xelatex| and |luatex| support OpenType fonts, and font encodings work very different compared to |pdflatex|. Again, see Section~\ref{section-font-encoding} for more information.
 \end{package}
 
 \begin{package}{{fourier}}
-  The package switches to a T1~encoding, but it does not redefine all
-  fonts such that outline fonts (non-bitmapped fonts) are used by
-  default. For example, the sans-serif text and the typewriter text
-  are not replaced. To use outline fonts for these, write
-  |\usepackage{lmodern}| \emph{before} including the |fourier|
-  package. 
+  The package switches to a T1~encoding, but it does not redefine all fonts such that outline fonts (non-bitmapped fonts) are used by default. For example, the sans-serif text and the typewriter text are not replaced. To use outline fonts for these, write |\usepackage{lmodern}| \emph{before} including the |fourier| package.
 \end{package}
 
 \begin{package}{{HA-prosper}}
-  You cannot use this package with \beamer. However, you might try to
-  use the package |beamerprosper| instead, see
-  Section~\ref{section-prosper}. 
+  You cannot use this package with \beamer. However, you might try to use the package |beamerprosper| instead, see Section~\ref{section-prosper}.
 \end{package}
 
 \begin{package}{{hyperref}}
   \beamernote
-  The |hyperref| package is automatically loaded by |beamer.cls| and
-  certain options are setup. In order pass additional options to
-  |hyperref| or to override options, you can use the following class
-  option: 
+  The |hyperref| package is automatically loaded by |beamer.cls| and certain options are set up. In order to pass additional options to |hyperref| or to override options, you can use the following class option:
 
   \begin{classoption}{hyperref={\normalfont\meta{list of options}}}
-    Causes the \meta{list of options} to be passed on to the |hyperref|
-    package.
+    Causes the \meta{list of options} to be passed on to the |hyperref| package.
 
     \example |\documentclass[hyperref={bookmarks=false}]{beamer}|
   \end{classoption}
@@ -156,69 +105,72 @@ class, extra options or precautions may be necessary.
   Alternatively, you can also use the |\hypersetup| command.
 
   \articlenote
-  In the |article| version, you must include |hyperref| manually if
-  you want to use it. It is not included automatically.
+  In the |article| version, you must include |hyperref| manually if you want to use it. You can do so by passing option |hyperref| to |beamerarticle|. It is not included automatically.
 \end{package}
 
-\begin{package}{{inputenc}|[|\declare{|utf8|}|]|}
+\begin{package}{{inputenc}|[|\declare{|utf8,utf8x|}|]|}
   \beamernote
-  When using Unicode, you may wish to use one of the following class
-  options: 
+  When using Unicode, you may wish to use \emph{some} of the following class options:
   \begin{classoption}{ucs}
-    Loads the package |ucs| and passes the correct Unicode options to
-    |hyperref|. Also, it preloads the Unicode code pages zero and
-    one.
+    Loads the package |ucs| and passes the correct Unicode options to |hyperref|. Also, it preloads the Unicode code pages zero and one.
+  \end{classoption}
+
+  \begin{classoption}{utf8x}
+    Same as the option |ucs|, but also sets the input encoding to |utf8x|. You could also use the option |ucs| and say |\usepackage[utf8x]{inputenc}| in the preamble. This also automatically loads |ucs| package in most \TeX\ systems.
   \end{classoption}
-  
+
+  If you use a Unicode character outside the first two code pages (which includes the Latin alphabet and the extended Latin alphabet) in a section or subsection heading, you have to use the command |\PreloadUnicodePage{|\meta{code page}|}| to give |ucs| a chance to preload these code pages. You will know that a character has not been preloaded, if you get a message like ``Please insert into preamble.'' The code page of a character is given by the unicode number of the character divided by 256.
+
   \begin{classoption}{utf8}
-    Same as the option |ucs|, but also sets the input encoding to
-    |utf8|. You could also use the option |ucs| and say
-    |\usepackage[utf8]{inputenc}| in the preamble.
+    This option sets the input encoding to |utf8|. It's designed to be used \emph{without} |ucs|. It's the same as saying |\usepackage[utf8]{inputenc}| in the preamble.
   \end{classoption}
 
-  If you use a Unicode character outside the first two code pages
-  (which includes the Latin alphabet and the extended Latin alphabet)
-  in a section or subsection heading, you have to use the command
-  |\PreloadUnicodePage{|\meta{code  page}|}| to give |ucs| a chance to
-  preload these code pages. You will know that a character has not
-  been preloaded, if you get a message like ``Please insert into
-  preamble.'' The code page of a character is given by the unicode
-  number of the character divided by 256.
+  Note that \emph{none} of these options apply to |lualatex| and |xelatex|, since both support Unicode natively without any extra packages. Most of the time using these options actually harms output quality, so be careful about what you use. If you want to have a document that allows compiling with multiple drivers, take a look at |iftex|, |ifxetex| and |ifluatex| packages.
+
+  \articlenote
+  Passing option |utf8| to |beamerarticle| has the same effect as saying |\usepackage[utf8]{inputenc}| in the preamble.
+
+  Again, take care if you use |lualatex| or |xelatex|.
 \end{package}
 
 \begin{package}{{listings}}
   \beamernote
-  Note that you must treat |lstlisting| environments exactly the same
-  way as you would treat |verbatim| environments. When using
-  |\defverbatim| that contains a colored |lstlisting|, use the
-  |colored| option of |\defverbatim|.
+  Note that you must treat |lstlisting| environments exactly the same way as you would treat |verbatim| environments. When using |\defverbatim| that contains a colored |lstlisting|, use the |colored| option of |\defverbatim|.
+  \example
+\begin{verbatim}
+\usepackage{lstlisting}
+
+\begin{document}
+\defverbatim[colored]\mycode{%
+  \begin{lstlisting}[frame=single, emph={cout}, emphstyle={\color{blue}}]
+    cout << "Hello world!";
+  \end{lstlisting}
+  }
+
+\begin{frame}
+  \mycode
+\end{frame}
+\end{document}
+\end{verbatim}
 \end{package}
 
 \begin{package}{{msc}}
   \beamernote
-  Since this packages uses |pstricks| internally, everything that
-  applies to pstricks also applies to |msc|.
+  Since this packages uses |pstricks| internally, everything that applies to pstricks also applies to |msc|.
 \end{package}
 
 \begin{package}{{musixtex}}
-  When using  MusiX\TeX\ to typeset musical scores, your document must
-  be compiled with |pdfelatex| or |elatex| instead of |pdflatex| or
-  |latex|.  
-
-  Inside  a |music| environment, the |\pause| is redefined to match
-  MusiX\TeX's definition (a rest during one quarter of a whole). You can
-  use the |\beamerpause| command  to create overlays in this
-  environment.  
+  When using MusiX\TeX\ to typeset musical scores, you have to have $\varepsilon$-\TeX extensions enabled. Most modern distributions enable that by default both in |pdflatex| and |latex|. However, if you have an older distribution, the document must be compiled with |pdfelatex| or |elatex| instead of |pdflatex| or |latex|.
+
+  Inside a |music| environment, the |\pause| is redefined to match MusiX\TeX's definition (a rest during one quarter of a whole). You can use the |\beamerpause| command to create overlays in this environment.
 \end{package}
 
 \begin{package}{{pdfpages}}
-  Commands like |\includepdf| only work \emph{outside} frames as they
-  produce pages ``by themselves.'' You may also wish to say
+  Commands like |\includepdf| only work \emph{outside} frames as they produce pages ``by themselves.'' You may also wish to say
 \begin{verbatim}
-\setbeamercolor{background canvas}{bg=} 
+\setbeamercolor{background canvas}{bg=}
 \end{verbatim}
-  when you use such a command since the background (even a white
-  background) will otherwise be printed over the image you try to include.
+  when you use such a command since the background (even a white background) will otherwise be printed over the image you try to include.
 
   \example
 \begin{verbatim}
@@ -228,7 +180,7 @@ class, extra options or precautions may be necessary.
 \end{frame}
 
 {
-  \setbeamercolor{background canvas}{bg=} 
+  \setbeamercolor{background canvas}{bg=}
   \includepdf{somepdfimages.pdf}
 }
 
@@ -241,72 +193,44 @@ class, extra options or precautions may be necessary.
 
 \begin{package}{{\normalfont\meta{professional font package}}}
   \beamernote
-  If you use a professional font package, \beamer's internal
-  redefinition of how variables are typeset may interfere with the
-  font package's superior way of typesetting them. In this case, you
-  should use the class option |professionalfont| to suppress any font
-  substitution. See Section~\ref{section-substition} for details.
+  If you use a professional font package, \beamer's internal redefinition of how variables are typeset may interfere with the font package's superior way of typesetting them. In this case, you should use the class option |professionalfont| to suppress any font substitution. See Section~\ref{section-substition} for details.
 \end{package}
 
 \begin{class}{{prosper}}
-  If you wish to (partly) emulate the |prosper| class using \beamer,
-  please see Section~\ref{section-prosper}.
+  If you wish to (partly) emulate the |prosper| class using \beamer, please see Section~\ref{section-prosper}.
 \end{class}
 
 \begin{package}{{pstricks}}
-  You should add the option |xcolor=pst| to make |xcolor| aware of the
-  fact that you are using |pstricks|.
+  You should add the option |xcolor=pst| to make |xcolor| aware of the fact that you are using |pstricks|.
 \end{package}
 
 \begin{class}{{seminar}}
-  If you wish to emulate the |seminar| class using \beamer, please see
-  Section~\ref{section-seminar}.
+  If you wish to emulate the |seminar| class using \beamer, please see Section~\ref{section-seminar}.
 \end{class}
 
 \begin{package}{{texpower}}
-  You cannot use this package with \beamer. However, you might try to
-  use the package |beamertexpower| instead, see
-  Section~\ref{section-texpower}.  
+  You cannot use this package with \beamer. However, you might try to use the package |beamertexpower| instead, see Section~\ref{section-texpower}.
 \end{package}
 
 \begin{package}{{textpos}}
   \beamernote
-  \beamer\ automatically installs a white background behind
-  everything, unless you install a different background
-  template. Because of this, you must use the |overlay| option when
-  using |textpos|, so that it will place boxes \emph{before}
-  everything. Alternatively, you can install an empty background
-  template, but this may result in an incorrect display in certain
-  situtations with older versions of the Acrobat Reader. 
+  \beamer\ automatically installs a white background behind everything, unless you install a different background template. Because of this, you must use the |overlay| option when using |textpos|, so that it will place boxes \emph{in front of} everything. Alternatively, you can install an empty background template, but this may result in an incorrect display in certain situtations with older versions of the Acrobat Reader.
 \end{package}
 
 \begin{package}{{ucs}}
-  See |\usepackage[utf8]{inputenc}|.
+  See |\usepackage[utf8,utf8x]{inputenc}|.
 \end{package}
 
-
 \begin{package}{{xcolor}}
   \beamernote
-  The |xcolor| package is automatically loaded by |beamer.cls|. The
-  same applies as to |color|.
+  The |xcolor| package is automatically loaded by |beamer.cls|. The same applies as to |color|.
 
   \begin{classoption}{xcolor={\normalfont\meta{list of options}}}
-    Causes the \meta{list of options} to be passed on to the |xcolor|
-    package.
+    Causes the \meta{list of options} to be passed on to the |xcolor| package.
   \end{classoption}
 
-  When using \beamer\ together with the |pstricks| package, be sure to
-  pass the |xcolor=pst| option to \beamer\ (and hence to |xcolor|).
+  When using \beamer\ together with the |pstricks| package, be sure to pass the |xcolor=pst| option to \beamer\ (and hence to |xcolor|).
 
   \articlenote
-  The |color| package is not loaded automatically if
-  |beamerarticle| is loaded with the |noxcolor| option.
+  The |color| package is not loaded automatically if |beamerarticle| is loaded with the |noxcolor| option.
 \end{package}
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
index 3e9315d7c49..c8aa9247a51 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-elements.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,36 +8,19 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-elements.tex,v 1.13 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Inner Themes, Outer Themes, and Templates}
-
 \label{section-elements}
 
-This section discusses the inner and outer themes that are
-available in \beamer. These themes install certain \emph{templates}
-for the different elements of a presentation. The template mechanism is 
-explained at the end of the section.
-
-Before we plunge into the details, let us agree on some terminology
-for this section. In \beamer, an \emph{element} is part of a
-presentation that is potentially typeset in some special way. Examples
-of elements are frame titles, the author's name, or the footnote
-sign. The appearance of every element is governed by a \emph{template}
-for this element. Appropriate templates are installed by inner and
-outer themes, where the \emph{inner} themes only install templates for
-elements that are typically ``inside the main text,'' while \emph{outer}
-themes install templates for elements ``around the main text.'' Thus,
-from the templates's point of view, there is no real difference
-between inner and outer themes. 
+This section discusses the inner and outer themes that are available in \beamer. These themes install certain \emph{templates} for the different elements of a presentation. The template mechanism is explained at the end of the section.
 
+Before we plunge into the details, let us agree on some terminology for this section. In \beamer, an \emph{element} is part of a presentation that is potentially typeset in some special way. Examples of elements are frame titles, the author's name, or the footnote sign. The appearance of every element is governed by a \emph{template} for this element. Appropriate templates are installed by inner and outer themes, where the \emph{inner} themes only install templates for elements that are typically ``inside the main text,'' while \emph{outer} themes install templates for elements ``around the main text.'' Thus, from the templates's point of view, there is no real difference between inner and outer themes.
 
 
 \subsection{Inner Themes}
 
-An inner theme installs templates that dictate how the following
-elements are typeset:
+An inner theme installs templates that dictate how the following elements are typeset:
 \begin{itemize}
 \item Title and part pages.
 \item Itemize environments.
@@ -49,47 +33,29 @@ elements are typeset:
 \item Bibliography entries.
 \end{itemize}
 
-
-In the following examples, the color themes |seahorse| and |rose| are
-used to show where and how background colors are
-honoured. Furthermore, background colors have been specified for all
-elements that honour them in the default theme. In the default color
-theme, all of the large rectangular areas are transparent.
+In the following examples, the color themes |seahorse| and |rose| are used to show where and how background colors are honoured. Furthermore, background colors have been specified for all elements that honour them in the default theme. In the default color theme, all of the large rectangular areas are transparent.
 
 \begin{innerthemeexample}{default}
-  The default element theme is quite sober. The only extravagance is
-  the fact that a little triangle is used in |itemize| environments
-  instead of the usual dot.
-
-  In some cases the theme will honour background color specifications
-  for elements. For example, if you set the background color for block
-  titles to green, block titles will have a green background. The
-  background specifications are currently honoured for the following
-  elements: 
+  The default element theme is quite sober. The only extravagance is the fact that a little triangle is used in |itemize| environments instead of the usual dot.
+
+  In some cases the theme will honour background color specifications for elements. For example, if you set the background color for block titles to green, block titles will have a green background. The background specifications are currently honoured for the following elements:
   \begin{itemize}
-  \item Title, author, institute, and date fields in the title
-    page.
+  \item Title, author, institute, and date fields in the title page.
   \item Block environments, both for the title and for the body.
   \end{itemize}
   This list may increase in the future.
 \end{innerthemeexample}
 
 \begin{innerthemeexample}{circles}
-  In this theme, |itemize| and |enumerate| items start with a small
-  circle. Likewise, entries in the table of contents start with
-  circles. 
+  In this theme, |itemize| and |enumerate| items start with a small circle. Likewise, entries in the table of contents start with circles.
 \end{innerthemeexample}
 
 \begin{innerthemeexample}{rectangles}
-  In this theme, |itemize| and |enumerate| items and table of contents
-  entries  start with small rectangles. 
+  In this theme, |itemize| and |enumerate| items and table of contents entries start with small rectangles.
 \end{innerthemeexample}
 
 \begin{innerthemeexample}[\oarg{options}]{rounded}
-  In this theme, |itemize| and |enumerate| items and table of contents
-  entries start with small balls. If a background is specified for
-  blocks, then the corners of the background rectangles will be
-  rounded off. The following \meta{options} may be given:
+  In this theme, |itemize| and |enumerate| items and table of contents entries start with small balls. If a background is specified for blocks, then the corners of the background rectangles will be rounded off. The following \meta{options} may be given:
 
   \begin{itemize}
   \item \declare{|shadow|} adds a shadow to all blocks.
@@ -97,270 +63,142 @@ theme, all of the large rectangular areas are transparent.
 \end{innerthemeexample}
 
 \begin{innerthemeexample}{inmargin}
-  The idea behind this theme is to have ``structuring'' information on
-  the left and ``normal'' information on the right. To this end,
-  blocks are redefined such that the block title is shown on the left
-  and the block body is shown on the right.
-
-  The code used to place text in the margin is a bit fragile. You may
-  often need to adjust the spacing ``by hand,'' so use at your own risk.
-
-  Itemize items are redefined such that they appear on the
-  left. However, only the position is changed by changing some spacing
-  parameters; the code used to draw the items is not changed
-  otherwise. Because of this, you can load another inner theme first
-  and then load this theme afterwards. 
-  
-  This theme is a ``dirty'' an inner theme since it messes with things
-  that an inner theme should not mess with. In particular, it changes
-  the width of the left sidebar to a large value. However, you can
-  still use it together with most outer themes.
-
-  Using columns inside this theme is problematic. Most of the time,
-  the result will not be what you expect.
-\end{innerthemeexample}
+  The idea behind this theme is to have ``structuring'' information on the left and ``normal'' information on the right. To this end, blocks are redefined such that the block title is shown on the left and the block body is shown on the right.
+
+  The code used to place text in the margin is a bit fragile. You may often need to adjust the spacing ``by hand,'' so use at your own risk.
 
+  Itemize items are redefined such that they appear on the left. However, only the position is changed by changing some spacing parameters; the code used to draw the items is not changed otherwise. Because of this, you can load another inner theme first and then load this theme afterwards.
 
+  This theme is a ``dirty'' inner theme since it messes with things that an inner theme should not mess with. In particular, it changes the width of the left sidebar to a large value. However, you can still use it together with most outer themes.
+
+  Using columns inside this theme is problematic. Most of the time, the result will not be what you expect.
+\end{innerthemeexample}
 
 
 \subsection{Outer Themes}
 
-An outer theme dictates (roughly) the overall layout of frames. It
-specifies where any navigational elements should go (like a mini table
-of contents or navigational mini frames) and what they should look
-like. Typically, an outer theme specifies how the following elements
-are rendered: 
+An outer theme dictates (roughly) the overall layout of frames. It specifies where any navigational elements should go (like a mini table of contents or navigational mini frames) and what they should look like. Typically, an outer theme specifies how the following elements are rendered:
 \begin{itemize}
 \item The head- and footline.
 \item The sidebars.
 \item The logo.
-\item The frame title.  
+\item The frame title.
 \end{itemize}
 
-An outer theme will not specify how things like |itemize| environments
-should be rendered---that is the job of an inner theme.
-
-In the following examples the color theme |seahorse| is
-used. Since the default color theme leaves most backgrounds empty,
-most of the outer themes look too unstructured with the default
-color theme. 
+An outer theme will not specify how things like |itemize| environments should be rendered---that is the job of an inner theme.
 
+In the following examples the color theme |seahorse| is used. Since the default color theme leaves most backgrounds empty, most of the outer themes look too unstructured with the default color theme.
 
 \begin{outerthemeexample}{default}
-  The default layout theme is the most sober and minimalistic theme
-  around. It will flush left the frame title and it will not install
-  any head- or footlines. However, even this theme honours the
-  background color specified for the frame title. If a color is
-  specified, a bar occupying the whole page width is put behind the
-  frame title. A background color of the frame subtitle is ignored.
+  The default layout theme is the most sober and minimalistic theme around. It will flush left the frame title and it will not install any head- or footlines. However, even this theme honours the background color specified for the frame title. If a color is specified, a bar occupying the whole page width is put behind the frame title. A background color of the frame subtitle is ignored.
 \end{outerthemeexample}
 
 \begin{outerthemeexample}{infolines}
-  This theme installs a headline showing the current section and the
-  current subsection. It installs a footline showing the author's
-  name, the institution, the presentation's title, the current date,
-  and a frame count. This theme uses only little space.
-
-  The colors used in the headline and footline are drawn from
-  |palette primary|, |palette secondary|, and |primary tertiary| (see
-  Section~\ref{section-colors} for details on how to change these).
+  This theme installs a headline showing the current section and the current subsection. It installs a footline showing the author's name, the institution, the presentation's title, the current date, and a frame count. This theme uses only little space.
+
+  The colors used in the headline and footline are drawn from |palette primary|, |palette secondary|, and |primary tertiary| (see Section~\ref{section-colors} for details on how to change these).
 \end{outerthemeexample}
 
 \begin{outerthemeexample}[\oarg{options}]{miniframes}
-  This theme installs a headline in which a horizontal navigational
-  bar is shown. This bar contains one entry for each section of the
-  presentation. Below each section entry, small circles are shown that
-  represent the different frames in the section. The frames are
-  arranged subsection-wise, that is, there is a line of frames for
-  each subsection. If the class  option |compress| is given, the
-  frames will instead be arranged in a single row for each
-  section. The navigation bars draws its color from
-  |section in head/foot|.
-
-  Below the navigation bar, a line is put showing the title of the
-  current subsection. The color is drawn from |subsection in head/foot|.
-
-  At the bottom, two lines are put that contain information such as
-  the author's name, the institution, or the paper's title. What is
-  shown exactly is influenced by the \meta{options} given. The colors
-  are drawn from the appropriate \beamer-colors like
-  |author in head/foot|.
-
-  At the top and bottom of both the head- and footline and between the
-  navigation bar and the subsection name, separation lines are drawn
-  \emph{if} the background color of |separation line| is set. This
-  separation line will have a height of 3pt. You can get even more
-  fine-grained control over the colors of the separation lines by
-  setting appropriate colors like |lower separation line head|.
+  This theme installs a headline in which a horizontal navigational bar is shown. This bar contains one entry for each section of the presentation. Below each section entry, small circles are shown that represent the different frames in the section. The frames are arranged subsection-wise, that is, there is a line of frames for each subsection. If the class option |compress| is given, the frames will instead be arranged in a single row for each section. The navigation bars draws its color from |section in head/foot|.
+
+  Below the navigation bar, a line is put showing the title of the current subsection. The color is drawn from |subsection in head/foot|.
+
+  At the bottom, two lines are put that contain information such as the author's name, the institution, or the paper's title. What is shown exactly is influenced by the \meta{options} given. The colors are drawn from the appropriate \beamer-colors like |author in head/foot|.
+
+  At the top and bottom of both the head- and footline and between the navigation bar and the subsection name, separation lines are drawn \emph{if} the background color of |separation line| is set. This separation line will have a height of 3pt. You can get even more fine-grained control over the colors of the separation lines by setting appropriate colors like |lower separation line head|.
 
   The following \meta{options} can be given:
   \begin{itemize}
-  \item \declare{|footline=empty|} suppressed the footline (default).
-  \item \declare{|footline=authorinstitute|} shows the author's name
-    and the institute in the footline.
-  \item \declare{|footline=authortitle|} shows the author's name
-    and the title in the footline.
-  \item \declare{|footline=institutetitle|} shows the institute
-    and the title in the footline.
-  \item \declare{|footline=authorinstitutetitle|} shows the author's
-    name, the institute, and the title in the footline.
-  \item \declare{|subsection=|\meta{true or false}} shows or suppresses
-    line showing the subsection in the headline. It is shown by
-    default.
-  \end{itemize}  
+  \item \declare{|footline=empty|} suppresses the footline (default).
+  \item \declare{|footline=authorinstitute|} shows the author's name and the institute in the footline.
+  \item \declare{|footline=authortitle|} shows the author's name and the title in the footline.
+  \item \declare{|footline=institutetitle|} shows the institute and the title in the footline.
+  \item \declare{|footline=authorinstitutetitle|} shows the author's name, the institute, and the title in the footline.
+  \item \declare{|subsection=|\meta{true or false}} shows or suppresses line showing the subsection in the headline. It is shown by default.
+  \end{itemize}
 \end{outerthemeexample}
 
 \begin{outerthemeexample}[\oarg{options}]{smoothbars}
-  This theme behaves very much like the |miniframes| theme, at least
-  with respect to the headline. There, the only difference is the
-  smooth transitions are installed between the background colors of
-  the navigation bar, the (optional) bar for the subsection name, and
-  the background of the frame title. No footline is created. You can
-  get the footlines of the |miniframes| theme by first loading the
-  theme and then loading the |smoothbars| theme.
+  This theme behaves very much like the |miniframes| theme, at least with respect to the headline. There, the only difference is the smooth transitions are installed between the background colors of the navigation bar, the (optional) bar for the subsection name, and the background of the frame title. No footline is created. You can get the footlines of the |miniframes| theme by first loading the theme and then loading the |smoothbars| theme.
 
   The following \meta{options} can be given:
   \begin{itemize}
-  \item \declare{|subsection=|\meta{true or false}} shows or suppresses
-    line showing the subsection in the headline. It is shown by
-    default.
-  \end{itemize}  
+  \item \declare{|subsection=|\meta{true or false}} shows or suppresses line showing the subsection in the headline. It is shown by default.
+  \end{itemize}
 \end{outerthemeexample}
 
 \begin{outerthemeexample}[\oarg{options}]{sidebar}
-  In this layout, a sidebar is shown that contains a small table of
-  contents with the current section, subsection, or subsection hilighted. The
-  frame title is vertically centered in a rectangular area at the top
-  that always occupies the same amount of space in all
-  frames. Finally, the logo is shown in the ``corner'' resulting from
-  the sidebar and the frame title rectangle.
-
-  There are several ways of modifying the layout using the
-  \meta{options}. If you set the width of the sidebar to 0pt, it is
-  not shown, giving you a layout in which the frame title does not
-  ``wobble'' since it always occupies the same amount of space on all
-  slides. Conversely, if you set the height of the frame title
-  rectangle to 0pt, the rectangular area is not used and the frame
-  title is inserted normally (occupying as much space as needed on
-  each slide).
-
-  The background color of the sidebar is taken from |sidebar|, the
-  background color of the frame title from |frametitle|, and the
-  background color of the logo corner from |logo|.
-
-  The colors of the entries in the table of contents are drawn from
-  the \beamer-color |section in sidebar| and |section in sidebar current| as well as the
-  corresponding \beamer-colors for subsections. If an entry does not
-  fit on a single line it is automatically ``linebroken.'' 
+  In this layout, a sidebar is shown that contains a small table of contents with the current section, subsection, or subsection highlighted. The frame title is vertically centered in a rectangular area at the top that always occupies the same amount of space in all frames. Finally, the logo is shown in the ``corner'' resulting from the sidebar and the frame title rectangle.
+
+  There are several ways of modifying the layout using the \meta{options}. If you set the width of the sidebar to 0pt, it is not shown, giving you a layout in which the frame title does not ``wobble'' since it always occupies the same amount of space on all slides. Conversely, if you set the height of the frame title rectangle to 0pt, the rectangular area is not used and the frame title is inserted normally (occupying as much space as needed on each slide).
+
+  The background color of the sidebar is taken from |sidebar|, the background color of the frame title from |frametitle|, and the background color of the logo corner from |logo|.
+
+  The colors of the entries in the table of contents are drawn from the \beamer-color |section in sidebar| and |section in sidebar current| as well as the corresponding \beamer-colors for subsections. If an entry does not fit on a single line it is automatically ``linebroken.''
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|height=|\meta{dimension}} specifies the height of the
-    frame title rectangle. If it is set to 0pt, no frame title
-    rectangle is created. Instead, the frame title is inserted
-    normally into the frame. The default is 2.5 base line heights of
-    the frame title font. Thus, there is about enough space for a
-    two-line frame title plus a one-line subtitle.
+    \declare{|height=|\meta{dimension}} specifies the height of the frame title rectangle. If it is set to 0pt, no frame title rectangle is created. Instead, the frame title is inserted normally into the frame. The default is 2.5 base line heights of the frame title font. Thus, there is about enough space for a two-line frame title plus a one-line subtitle.
   \item
-    \declare{|hideothersubsections|} causes all subsections except
-    those of the current section to be suppressed in the table of
-    contents. This is useful if you have lots of subsections.
+    \declare{|hideothersubsections|} causes all subsections except those of the current section to be suppressed in the table of contents. This is useful if you have lots of subsections.
   \item
-    \declare{|hideallsubsections|} causes all subsections to be
-    suppressed in the table of contents.
+    \declare{|hideallsubsections|} causes all subsections to be suppressed in the table of contents.
   \item
-    \declare{|left|} puts the sidebar on the left side. Note that in a
-    left-to-right reading culture this is the side people look first. Note
-    also that this table of contents is usually \emph{not} the most
-    important part of the frame, so you do not necessarily want people
-    to look at it first. Nevertheless, it is the default.
+    \declare{|left|} puts the sidebar on the left side. Note that in a left-to-right reading culture this is the side people look first. Note also that this table of contents is usually \emph{not} the most important part of the frame, so you do not necessarily want people to look at it first. Nevertheless, it is the default.
   \item
     \declare{|right|} puts the sidebar of the right side.
   \item
-    \declare{|width=|\meta{dimension}} specifies the width of the
-    sidebar. If it is set to 0pt, it is completely suppressed. The
-    default is 2.5 base line heights of the frame title font.
+    \declare{|width=|\meta{dimension}} specifies the width of the sidebar. If it is set to 0pt, it is completely suppressed. The default is 2.5 base line heights of the frame title font.
   \end{itemize}
 \end{outerthemeexample}
 
 \begin{outerthemeexample}{split}
-  This theme installs a headline in which, on the left, the sections
-  of the talk are shown and, on the right, the subsections of the
-  current section. If the class option |compress| has been given,
-  the sections and subsections will be put in one line; normally there
-  is one line per section or subsection.
+  This theme installs a headline in which, on the left, the sections of the talk are shown and, on the right, the subsections of the current section. If the class option |compress| has been given, the sections and subsections will be put in one line; normally there is one line per section or subsection.
 
-  The footline shows the author on the left and the talk's title on
-  the right.
+  The footline shows the author on the left and the talk's title on the right.
 
   The colors are taken from |palette primary| and |palette fourth|.
 \end{outerthemeexample}
 
 \begin{outerthemeexample}{shadow}
-  This layout theme extends the |split| theme by putting a horizontal
-  shading behind the frame title and adding a little ``shadow'' at the
-  bottom of the headline.
+  This layout theme extends the |split| theme by putting a horizontal shading behind the frame title and adding a little ``shadow'' at the bottom of the headline.
 \end{outerthemeexample}
 
 \begin{outerthemeexample}[\oarg{options}]{tree}
-  In this layout, the headline contains three lines that show the
-  title of the current talk, the current section in this talk, and the
-  current subsection in the section. The colors are drawn from
-  |title in head/foot|, |section in head/foot|, and
-  |subsection in head/foot|.
-
-  In addition, separation lines of height 3pt are shown above and
-  below the three lines \emph{if} the background of |separation line|
-  is set. More fine-grained control of the colors of these lines can
-  be gained by setting |upper separation line head| and
-  |lower separation line head|.
+  In this layout, the headline contains three lines that show the title of the current talk, the current section in this talk, and the current subsection in the section. The colors are drawn from |title in head/foot|, |section in head/foot|, and |subsection in head/foot|.
+
+  In addition, separation lines of height 3pt are shown above and below the three lines \emph{if} the background of |separation line| is set. More fine-grained control of the colors of these lines can be gained by setting |upper separation line head| and |lower separation line head|.
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|hooks|} causes little ``hooks'' to be drawn in front of
-    the section and subsection entries. These are supposed to increase
-    the tree-like appearance. 
+    \declare{|hooks|} causes little ``hooks'' to be drawn in front of the section and subsection entries. These are supposed to increase the tree-like appearance.
   \end{itemize}
 \end{outerthemeexample}
 
 \begin{outerthemeexample}{smoothtree}
-  This layout is similar to the |tree| layout. The main difference is
-  that the background colors change smoothly.
+  This layout is similar to the |tree| layout. The main difference is that the background colors change smoothly.
 \end{outerthemeexample}
 
 
-
-
-
 \subsection{Changing the Templates Used for Different Elements of a Presentation}
-
 \label{section-templates}
 
 This section explains how \beamer's template management works.
 
-
-
 \subsubsection{Overview of Beamer's Template Management}
 
-If you only wish to modify the appearance of a single or few elements,
-you do not need to create a whole new inner or outer theme. Instead,
-you can modify the appropriate template. 
+If you only wish to modify the appearance of a single or few elements, you do not need to create a whole new inner or outer theme. Instead, you can modify the appropriate template.
 
-A template specifies how an element of a presentation is typeset. For 
-example, the |frametitle| template dictates where the frame title is
-put, which font is used, and so on.
+A template specifies how an element of a presentation is typeset. For example, the |frametitle| template dictates where the frame title is put, which font is used, and so on.
 
-As the name suggests, you specify a template by writing the exact
-\LaTeX\ code you would also use when typesetting a single frame title
-by hand. Only, instead of the actual title, you use the command
-|\insertframetitle|.
+As the name suggests, you specify a template by writing the exact \LaTeX\ code you would also use when typesetting a single frame title by hand. Only, instead of the actual title, you use the command |\insertframetitle|.
 
 \example
-Suppose we would like to have the frame title typeset in
-red, centered, and boldface. If we were to typeset a single frame
-title by hand, it might be done like this:
+Suppose we would like to have the frame title typeset in red, centered, and boldface. If we were to typeset a single frame title by hand, it might be done like this:
+
 \begin{verbatim}
 \begin{frame}
   \begin{centering}
@@ -373,8 +211,8 @@ title by hand, it might be done like this:
 \end{frame}
 \end{verbatim}
 
-In order to typeset the frame title in this way on all slides, in the
-simplest case we can change the frame title template as follows:
+In order to typeset the frame title in this way on all slides, in the simplest case we can change the frame title template as follows:
+
 \begin{verbatim}
 \setbeamertemplate{frametitle}
 {
@@ -385,7 +223,6 @@ simplest case we can change the frame title template as follows:
   \end{centering}
 }
 \end{verbatim}
-
 We can then use the following code to get the desired effect:
 \begin{verbatim}
 \begin{frame}
@@ -394,19 +231,11 @@ We can then use the following code to get the desired effect:
   Blah, blah.
 \end{frame}
 \end{verbatim}
-When rendering the frame, \beamer\ will use the code of the
-frame title template to typeset the frame title and it will replace
-every occurrence of |\insertframetitle| by the current frame
-title.
-
-We can take this example a step further. It would be nicer if we did
-not have to ``hardwire'' the color of the frametitle, but if this
-color could be specified independently of the code for the
-template. This way, a color theme could change this color. Since this
-a problem that is common to most templates, \beamer\ will
-automatically setup the \beamer-color |frametitle| when the template
-|frametitle| is used. Thus, we can remove the |\color{red}| command if
-we set the \beamer-color |frametitle| to red at some point.
+
+When rendering the frame, \beamer\ will use the code of the frame title template to typeset the frame title and it will replace every occurrence of |\insertframetitle| by the current frame title.
+
+We can take this example a step further. It would be nicer if we did not have to ``hardwire'' the color of the frametitle, but if this color could be specified independently of the code for the template. This way, a color theme could change this color. Since this is a problem that is common to most templates, \beamer\ will automatically setup the \beamer-color |frametitle| when the template |frametitle| is used. Thus, we can remove the |\color{red}| command if we set the \beamer-color |frametitle| to red at some point.
+
 \begin{verbatim}
 \setbeamercolor{frametitle}{fg=red}
 \setbeamertemplate{frametitle}
@@ -417,9 +246,9 @@ we set the \beamer-color |frametitle| to red at some point.
   \end{centering}
 }
 \end{verbatim}
-Next, we can also make the font ``themable.'' Just like the color, the
-\beamer-font |frametitle| is installed before the |frametitle|
-template is typeset. Thus, we should rewrite the code as follows:
+
+Next, we can also make the font ``themable.'' Just like the color, the \beamer-font |frametitle| is installed before the |frametitle| template is typeset. Thus, we should rewrite the code as follows:
+
 \begin{verbatim}
 \setbeamercolor{frametitle}{fg=red}
 \setbeamerfont{frametitle}{series=\bfseries}
@@ -430,68 +259,33 @@ template is typeset. Thus, we should rewrite the code as follows:
   \end{centering}
 }
 \end{verbatim}
-Users, themes, or whoever can now easily change the color or font of
-the frametitle without having to mess with the code used to typeset
-it.
+
+Users, themes, or whoever can now easily change the color or font of the frametitle without having to mess with the code used to typeset it.
 
 \articlenote
-In |article| mode, most of the template mechanism is switched off and
-has no effect. However, a few templates are also available. If this is
-the case, it is specially indicated.
+In |article| mode, most of the template mechanism is switched off and has no effect. However, a few templates are also available. If this is the case, it is specially indicated.
 \smallskip
 
-Here are a few hints that might be helpful when you wish to set a
-template: 
+Here are a few hints that might be helpful when you wish to set a template:
 \begin{itemize}
 \item
-  Usually, you might wish to copy code from an existing template. The
-  code often takes care of some things that you may not yet have
-  thought about. The default inner and outer themes might be useful 
-  starting points. Also, the file |beamerbaseauxtemplates.sty|
-  contains interesting ``auxilliary'' templates.
+  Usually, you might wish to copy code from an existing template. The code often takes care of some things that you may not yet have thought about. The default inner and outer themes might be useful starting points. Also, the file |beamerbaseauxtemplates.sty| contains interesting ``auxilliary'' templates.
 \item
-  When copying code from another template and when inserting this code
-  in the preamble of your document (not in another style file), you may
-  have to ``switch on'' the at-character (|@|). To do so, add the
-  command |\makeatletter| before the |\setbeamertemplate| command and the
-  command |\makeatother| afterward.
+  When copying code from another template and when inserting this code in the preamble of your document (not in another style file), you may have to ``switch on'' the at-character (|@|). To do so, add the command |\makeatletter| before the |\setbeamertemplate| command and the command |\makeatother| afterward.
 \item
-  Most templates having to do with the frame components (headlines,
-  sidebars, etc.)\ can only be changed in the preamble. Other
-  templates can be changed during the document.
+  Most templates having to do with the frame components (headlines, sidebars, etc.)\ can only be changed in the preamble. Other templates can be changed during the document.
 \item
-  The height of the headline and footline templates is calculated
-  automatically. This is done by typesetting the templates and then
-  ``having a look'' at their heights. This recalculation is done right
-  at the beginning of the document, \emph{after} all packages have
-  been loaded and even \emph{after} these have executed their
-  |\AtBeginDocument| initialization. 
+  The height of the headline and footline templates is calculated automatically. This is done by typesetting the templates and then ``having a look'' at their heights. This recalculation is done right at the beginning of the document, \emph{after} all packages have been loaded and even \emph{after} these have executed their |\AtBeginDocument| initialization.
 \item
-  Getting the boxes right inside any template is often a bit of a
-  hassle. You may wish to consult the \TeX\ book for the glorious
-  details on ``Making Boxes.'' If your headline is simple, you might
-  also try putting everything into a |pgfpicture| environment, which
-  makes the placement easier.
+  Getting the boxes right inside any template is often a bit of a hassle. You may wish to consult the \TeX\ book for the glorious details on ``Making Boxes.'' If your headline is simple, you might also try putting everything into a |pgfpicture| environment, which makes the placement easier.
 \end{itemize}
 
-
-
-
 \subsubsection{Using Beamer's Templates}
 
-As a user of the \beamer\ class you typically do not ``use'' or
-``invoke'' templates yourself, directly. For example, the frame title
-template is automatically invoked by \beamer\ somewhere deep inside
-the frame typesetting process. The same is true of most other
-templates. However, if, for whatever reason, you wish to invoke a
-template yourself, you can use the following command.
+As a user of the \beamer\ class you typically do not ``use'' or ``invoke'' templates yourself, directly. For example, the frame title template is automatically invoked by \beamer\ somewhere deep inside the frame typesetting process. The same is true of most other templates. However, if, for whatever reason, you wish to invoke a template yourself, you can use the following command.
 
 \begin{command}{\usebeamertemplate\opt{|***|}\marg{element name}}
-  If none of the stars is given, the text of the \meta{element name}
-  is directly inserted at the current position. This text should
-  previously have been specified using the |\setbeamertemplate|
-  command. No text is inserted if this command has not been called
-  before.
+  If none of the stars is given, the text of the \meta{element name} is directly inserted at the current position. This text should previously have been specified using the |\setbeamertemplate| command. No text is inserted if this command has not been called before.
   \example
 \begin{verbatim}
 \setbeamertemplate{my template}{correct}
@@ -499,44 +293,19 @@ template yourself, you can use the following command.
 Your answer is \usebeamertemplate{my template}.
 \end{verbatim}
 
-  If you add one star, three things happen. First, the template is put
-  inside a \TeX-group, thereby limiting most side effects of commands
-  used inside the template. Second, inside this group the
-  \beamer-color named \meta{element name} is used and the foreground
-  color is selected. Third, the \beamer-font \meta{element name} is
-  also used. This one-starred version is usually the best version to
-  use.
-
-  If you add a second star, nearly the same happens as with only one
-  star. However, in addition, the color is used with the command
-  |\setbeamercolor*|. This causes the colors to be reset to the normal
-  text color if no special foreground or background is specified by
-  the \beamer-color \meta{element name}. Thus, in this twice-starred
-  version, the color used for the template is guaranteed to be
-  independent of the color that was currently in use when the template
-  is used.
-
-  Finally, adding a third star will also cause a star to be added to
-  the |\setbeamerfont*| command. This causes the font used for the
-  template also to be reset to normal text, unless the \beamer-font
-  \meta{element name} specifies things differently. This three-star
-  version is the ``most protected'' version available.
+  If you add one star, three things happen. First, the template is put inside a \TeX-group, thereby limiting most side effects of commands used inside the template. Second, inside this group the \beamer-color named \meta{element name} is used and the foreground color is selected. Third, the \beamer-font \meta{element name} is also used. This one-starred version is usually the best version to use.
+
+  If you add a second star, nearly the same happens as with only one star. However, in addition, the color is used with the command |\setbeamercolor*|. This causes the colors to be reset to the normal text color if no special foreground or background is specified by the \beamer-color \meta{element name}. Thus, in this twice-starred version, the color used for the template is guaranteed to be independent of the color that was currently in use when the template is used.
+
+  Finally, adding a third star will also cause a star to be added to the |\setbeamerfont*| command. This causes the font used for the template also to be reset to normal text, unless the \beamer-font \meta{element name} specifies things differently. This three-star version is the ``most protected'' version available.
 \end{command}
 
-\begin{command}{\ifbeamertemplateempty\marg{beamer template
-      name}\marg{executed if empty}\marg{executed otherwise}}
-  This command checks whether a template is defined and set to a    
-  non-empty text. If the text is empty or the template is not
-  defined at all, \meta{executed if empty} is executed. Otherwise,
-  \meta{executed otherwise} is executed. 
+\begin{command}{\ifbeamertemplateempty\marg{beamer template name}\marg{executed if empty}\marg{executed otherwise}}
+  This command checks whether a template is defined and set to a non-empty text. If the text is empty or the template is not defined at all, \meta{executed if empty} is executed. Otherwise, \meta{executed otherwise} is executed.
 \end{command}
 
 \begin{command}{\expandbeamertemplate\marg{beamer template name}}
-  This command does the same as |\usebeamertemplate|\marg{beamer
-    template name}. The difference is that this command performs a
-  direct expansion and does not scan for a star. This is important
-  inside, for example, an |\edef|. If you don't know the difference
-  between |\def| and |\edef|, you won't need this command.
+  This command does the same as |\usebeamertemplate|\marg{beamer template name}. The difference is that this command performs a direct expansion and does not scan for a star. This is important inside, for example, an |\edef|. If you don't know the difference between |\def| and |\edef|, you won't need this command.
 \end{command}
 
 \subsubsection{Setting Beamer's Templates}
@@ -544,11 +313,7 @@ Your answer is \usebeamertemplate{my template}.
 To set  a \beamer-template, you can use the following command:
 
 \begin{command}{\setbeamertemplate\marg{element name}\oarg{predefined option}\meta{args}}
-  In the simplest case, if no \meta{predefined option} is given, the
-  \meta{args} must be a single argument and the text of the template
-  \meta{element name} is setup to be this text. Upon later invocation
-  of the template by the command |\usebeamertemplate| this text is
-  used. 
+  In the simplest case, if no \meta{predefined option} is given, the \meta{args} must be a single argument and the text of the template \meta{element name} is setup to be this text. Upon later invocation of the template by the command |\usebeamertemplate| this text is used.
 
   \example
 \begin{verbatim}
@@ -557,50 +322,33 @@ To set  a \beamer-template, you can use the following command:
 Your answer is \usebeamertemplate*{answer}.
 \end{verbatim}
 
-  If you specify a \meta{predefined option}, this command behaves
-  slightly differently. In this case, someone has used the command
-  |\defbeamertemplate| to predefined a template for you. By giving the
-  name of this predefined template as the optional parameter
-  \meta{predefined option}, you cause the template \meta{element name}
-  to be set to this template.
+  If you specify a \meta{predefined option}, this command behaves slightly differently. In this case, someone has used the command |\defbeamertemplate| to predefine a template for you. By giving the name of this predefined template as the optional parameter \meta{predefined option}, you cause the template \meta{element name} to be set to this template.
 
-  \example |\setbeamertemplate{bibliography item}[book]| causes the
-  bibliography items to become little book icons. This command cause a
-  subsequent call of |\usebeamertemplate{bibliography item}| to insert
-  the predefined code for inserting a book.
+  \example
+  |\setbeamertemplate{bibliography item}[book]| causes the bibliography items to become little book icons. This command causes a subsequent call of |\usebeamertemplate{bibliography item}| to insert the predefined code for inserting a book.
 
-  Some predefined template options take parameters themselves. In such
-  a case, the parameters are given as \meta{args}.
+  Some predefined template options take parameters themselves. In such a case, the parameters are given as \meta{args}.
 
   \example
-  The \meta{predefined option} |grid| for the template |background|
-  takes an optional argument:
+  The \meta{predefined option} |grid| for the template |background| takes an optional argument:
 \begin{verbatim}
 \setbeamertemplate{background}[grid][step=1cm]
 \end{verbatim}
-  In the example, the second argument in square brackets is the
-  optional argument.
-
-  In the descriptions of elements, if there are possible
-  \meta{predefined option}, the description shows how the
-  \meta{predefined option} can be used together with its arguments,
-  but the |\setbeamertemplate{xxxx}| is omitted. Thus, the above
-  example would be documented in the description of the |background|
-  element like this:
+
+  In the example, the second argument in square brackets is the optional argument.
+
+  In the descriptions of elements, if there are possible \meta{predefined option}, the description shows how the \meta{predefined option} can be used together with its arguments, but the |\setbeamertemplate{xxxx}| is omitted. Thus, the above example would be documented in the description of the |background| element like this:
   \begin{itemize}
-    \itemoption{grid}{\oarg{step options}} causes a light grid to be
-    \dots
+    \itemoption{grid}{\oarg{step options}} causes a light grid to be \dots
   \end{itemize}
 \end{command}
 
-\begin{command}{\addtobeamertemplate\marg{element
-      name}\marg{pre-text}\marg{post-text}}
-  This command adds the \meta{pre-text} before the text that is
-  currently installed as the template \meta{element name} and the
-  \meta{post-text} after it. This allows you a limited form of
-  modification of existing templates.
+\begin{command}{\addtobeamertemplate\marg{element name}\marg{pre-text}\marg{post-text}}
+  This command adds the \meta{pre-text} before the text that is currently installed as the template \meta{element name} and the \meta{post-text} after it. This allows you a limited form of modification of existing templates.
+
+  \example
+  The following commands have the same effect:
 
-  \example The following commands have the same effect:
 \begin{verbatim}
 \setbeamertemplate{my template}{Hello world!}
 
@@ -608,37 +356,23 @@ Your answer is \usebeamertemplate*{answer}.
 \addtobeamertemplate{my template}{Hello }{!}
 \end{verbatim}
 
-  If a new template is installed, any additions will be deleted. On
-  the other hand, you can repeatedly use this command to add multiple
-  things. 
+  If a new template is installed, any additions will be deleted. On the other hand, you can repeatedly use this command to add multiple things.
 \end{command}
 
-\begin{command}{\defbeamertemplate\sarg{mode specification}\opt{|*|}%
-    \marg{element name}\marg{predefined option}\\
-    \oarg{argument number}\oarg{default optional argument}\marg{predefined
-      text}\\
-    \opt{|[action]|\marg{action command}}}
-  This command installs a \emph{predefined option} for the template
-  \meta{element name}. Once this command has been used, users can
-  access the predefined template using the |\setbeamertemplate|
-  command.
+\begin{command}{\defbeamertemplate\sarg{mode specification}\opt{|*|}\marg{element name}\marg{predefined option}\\ \oarg{argument number}\oarg{default optional argument}\marg{predefined text}\\ \opt{|[action]|\marg{action command}}}
+  This command installs a \emph{predefined option} for the template \meta{element name}. Once this command has been used, users can access the predefined template using the |\setbeamertemplate| command.
 
   \example
   |\defbeamertemplate{itemize item}{double arrow}{$\Rightarrow$}|
 
-  After the above command has been invoked, the following two commands
-  will have the same effect:
+  After the above command has been invoked, the following two commands will have the same effect:
+
 \begin{verbatim}
 \setbeamertemplate{itemize item}{$\Rightarrow$}
 \setbeamertemplate{itemize item}[double arrow]
 \end{verbatim}
 
-  Sometimes, a predefined template needs to get an argument when it is
-  installed. Suppose, for example, we want to define a predefined
-  template that draws a square as the itemize item and we want to make
-  this size of this square configurable. In this case, we can specify
-  the \meta{argument number} of the predefined option the same way one
-  does for the |\newcommand| command:
+  Sometimes, a predefined template needs to get an argument when it is installed. Suppose, for example, we want to define a predefined template that draws a square as the itemize item and we want to make this size of this square configurable. In this case, we can specify the \meta{argument number} of the predefined option the same way one does for the |\newcommand| command:
 
 \begin{verbatim}
 \defbeamertemplate{itemize item}{square}[1]{\hrule width #1 height #1}
@@ -647,10 +381,7 @@ Your answer is \usebeamertemplate*{answer}.
 \setbeamertemplate{itemize item}[square]{3pt}
 \setbeamertemplate{itemize item}{\hrule width 3pt height 3pt}
 \end{verbatim}
-
-  As for the |\newcommand| command, you can also specify a
-  \meta{default optional argument}:
-  
+  As for the |\newcommand| command, you can also specify a \meta{default optional argument}:
 \begin{verbatim}
 \defbeamertemplate{itemize item}{square}[1][1ex]{\hrule width #1 height #1}
 
@@ -663,21 +394,9 @@ Your answer is \usebeamertemplate*{answer}.
 \setbeamertemplate{itemize item}{\hrule width 1ex height 1ex}
 \end{verbatim}
 
-  The starred version of the command installs the predefined template
-  option, but then immediately calls |\setbeamertemplate| for this
-  option. This is useful for the default templates. If there are any
-  arguments necessary, these are set to |\relax|.
-
-  In certain cases, if a predefined template option is chosen, you do
-  not only wish the template text to be installed, but certain extra
-  ``actions'' must also be taken once. For example, a shading must be
-  defined that should not be redefined every time the shading is used
-  later on. To implement such ``actions,'' you can use the optional
-  argument \meta{action} following the keyword |[action]|. Thus, after
-  the normal use of the |\defbeamertemplate| you add the text
-  |[action]| and then any commands that should be executed once when
-  the \meta{predefined option} is selected by the |\setbeamertemplate|
-  command.
+  The starred version of the command installs the predefined template option, but then immediately calls |\setbeamertemplate| for this option. This is useful for the default templates. If there are any arguments necessary, these are set to |\relax|.
+
+  In certain cases, if a predefined template option is chosen, you do not only wish the template text to be installed, but certain extra ``actions'' must also be taken once. For example, a shading must be defined that should not be redefined every time the shading is used later on. To implement such ``actions,'' you can use the optional argument \meta{action} following the keyword |[action]|. Thus, after the normal use of the |\defbeamertemplate| you add the text |[action]| and then any commands that should be executed once when the \meta{predefined option} is selected by the |\setbeamertemplate| command.
 
   \example
 \begin{verbatim}
@@ -697,67 +416,37 @@ Your answer is \usebeamertemplate*{answer}.
 %% \usebeamertemplate{background canvas} will yield
 %% ``\pgfuseshading{myshading}''.
 \end{verbatim}
-      
+
   \articlenote
-  Normally, this command has no effect in |article| mode. However, if
-  a \meta{mode specification} is given, this command is applied for
-  the specified modes. Thus, this command behaves like the |\\|
-  command, which also gets the implicit mode specification
-  |<presentation>| if no other specification is given.
+  Normally, this command has no effect in |article| mode. However, if a \meta{mode specification} is given, this command is applied for the specified modes. Thus, this command behaves like the |\\| command, which also gets the implicit mode specification |<presentation>| if no other specification is given.
 
-  \example |\defbeamertemplate{my template}{default}{something}| has no effect
-  in |article| mode.
+  \example
+  |\defbeamertemplate{my template}{default}{something}| has no effect in |article| mode.
 
-  \example |\defbeamertemplate<article>{my template}{default}{something}| has
-  no effect in |presentation| modes, but has an effect in |article|
-  mode.
+  \example
+  |\defbeamertemplate<article>{my template}{default}{something}| has no effect in |presentation| modes, but has an effect in |article| mode.
 
-  \example |\defbeamertemplate<all>{my template}{default}{something}| applies
-  to all modes.  
+  \example
+  |\defbeamertemplate<all>{my template}{default}{something}| applies to all modes.
 \end{command}
 
-It is often useful to have access to the same template option via
-different names. For this, you can use the following command to create
-aliases:
-\begin{command}{\defbeamertemplatealias\marg{element name}\marg{new
-      predefined option name}\marg{existing predefined option  name}}
-  Causes the two predefined options to have the same effect.  
+It is often useful to have access to the same template option via different names. For this, you can use the following command to create aliases:
+\begin{command}{\defbeamertemplatealias\marg{element name}\marg{new predefined option name}\marg{existing predefined option name}}
+  Causes the two predefined options to have the same effect.
 \end{command}
 
-There is no inheritance relation among templates as there is for
-colors and fonts. This is due to the fact the templates for one
-element seldom make sense for another. However, sometimes certain
-elements ``behave similarly'' and one would like a
-|\setbeamertemplate| to apply to a whole set of templates via
-inheritance. For example, one might want that
-|\setbeamertemplate{items}[circle]| causes all items to use the
-|circle| option, though the effects for the |itemize item| as opposed
-to the |itemize subsubitem| as opposed to |enumerate item| must be
-slightly different.
-
-The \beamer-template mechanism implements a simple form of inheritance
-via \emph{parent templates}. In element descriptions, parent templates
-are indicated via a check mark in parentheses.
-
-\begin{command}{\defbeamertemplateparent\marg{parent template
-name}\oarg{predefined option name}\marg{child template
-list}\\
-\oarg{argument number}\oarg{default optional
-argument}\marg{arguments for children}}
-  The effect of this command is that whenever someone calls
-  |\setbeamertemplate{|\meta{parent template name}|}{|\meta{args}|}|,
-  the command |\setbeamertemplate{|\meta{child template
-      name}|}{|\meta{args}|}| is called for each \meta{child
-    template name} in the \meta{child template list}.
-
-  The \meta{arguments for children} come into play if the
-  |\setbeamertemplate| command is called with a predefined option name
-  (not necessarily the same as the \meta{predefined option name},
-  we'll come to that). If |\setbeamertemplate| is called with some
-  predefined option name, the children are called with the
-  \meta{arguments for children} instead. Let's look at two examples:
-  
-  \example The following is the typical, simple usage:
+There is no inheritance relation among templates as there is for colors and fonts. This is due to the fact the templates for one element seldom make sense for another. However, sometimes certain elements ``behave similarly'' and one would like a |\setbeamertemplate| to apply to a whole set of templates via inheritance. For example, one might want that |\setbeamertemplate{items}[circle]| causes all items to use the |circle| option, though the effects for the |itemize item| as opposed to the |itemize subsubitem| as opposed to |enumerate item| must be slightly different.
+
+The \beamer-template mechanism implements a simple form of inheritance via \emph{parent templates}. In element descriptions, parent templates are indicated via a check mark in parentheses.
+
+\begin{command}{\defbeamertemplateparent\marg{parent template name}\oarg{predefined option name}\marg{child template list}\\ \oarg{argument number}\oarg{default optional argument}\marg{arguments for children}}
+  The effect of this command is that whenever someone calls |\setbeamertemplate{|\meta{parent template name}|}{|\meta{args}|}|, the command |\setbeamertemplate{|\meta{child template name}|}{|\meta{args}|}| is called for each \meta{child template name} in the \meta{child template list}.
+
+  The \meta{arguments for children} come into play if the |\setbeamertemplate| command is called with a predefined option name (not necessarily the same as the \meta{predefined option name}, we'll come to that). If |\setbeamertemplate| is called with some predefined option name, the children are called with the \meta{arguments for children} instead. Let's look at two examples:
+
+  \example
+  The following is the typical, simple usage:
+
 \begin{verbatim}
 \defbeamertemplateparent{itemize items}{itemize item,itemize subitem,itemize subsubitem}
 {}
@@ -770,8 +459,9 @@ argument}\marg{arguments for children}}
 \setbeamertemplate{itemize subsubitem}[circle]
 \end{verbatim}
 
-  \example In the following case, an argument is passed to the
-  children:
+  \example
+  In the following case, an argument is passed to the children:
+
 \begin{verbatim}
 \defbeamertemplateparent{sections/subsections in toc shaded}
 {section in toc shaded,subsection in toc shaded}[1][20]
@@ -791,44 +481,7 @@ argument}\marg{arguments for children}}
 \setbeamertemplate{subsection in toc shaded}[default][20]
 \end{verbatim}
 
-  In detail, the following happens: When |\setbeamertemplate| is
-  encountered for a parent template, \beamer\ first checks whether a
-  predefined option follows. If not, a single argument is read and
-  |\setbeamertemplate| is called for all children for this
-  template. If there is a predefined template option set, \beamer\
-  evaluates the \meta{argument for children}. It may contain
-  parameters like |#1| or |#2|. These parameters are filled with the
-  arguments that follow the call of |\setbeamertemplate| for the
-  parent template. The number of arguments must be the number given
-  as \meta{argument number}. An optional argument can also be
-  specified in the usual way. Once the \meta{arguments for the
-  children} have been computed, |\setbeamertemplate| is called for all
-  children for the predefined template and with the computed
-  arguments.
-
-  You may wonder what happens when certain predefined options take a
-  certain number of arguments, but another predefined option takes a
-  different number of arguments. In this case, the above-described
-  mechanism cannot differentiate between the predefined options and it
-  is unclear which or even how many arguments should be contained in
-  \meta{arguments for children}. For this reason, you can give the
-  optional argument \meta{predefined option name} when calling
-  |\defbeamertemplateparent|. If this optional argument is specified,
-  the parenthood of the template applies only to this particular
-  \meta{predefined option name}. Thus, if someone calls
-  |\setbeamertemplate| for this \meta{predefined option name}, the
-  given \meta{argument for children} is used. For other predefined
-  option names a possibly different definition is used. You can
-  imaging that leaving out the optional \meta{predefined option name}
-  means ``this \meta{argument for children} applies to all predefined
-  option names that have not been specially defined differently.''     
-\end{command}
-
+  In detail, the following happens: When |\setbeamertemplate| is encountered for a parent template, \beamer\ first checks whether a predefined option follows. If not, a single argument is read and |\setbeamertemplate| is called for all children for this template. If there is a predefined template option set, \beamer\ evaluates the \meta{argument for children}. It may contain parameters like |#1| or |#2|. These parameters are filled with the arguments that follow the call of |\setbeamertemplate| for the parent template. The number of arguments must be the number given as \meta{argument number}. An optional argument can also be specified in the usual way. Once the \meta{arguments for the children} have been computed, |\setbeamertemplate| is called for all children for the predefined template and with the computed arguments.
 
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+  You may wonder what happens when certain predefined options take a certain number of arguments, but another predefined option takes a different number of arguments. In this case, the above-described mechanism cannot differentiate between the predefined options and it is unclear which or even how many arguments should be contained in \meta{arguments for children}. For this reason, you can give the optional argument \meta{predefined option name} when calling |\defbeamertemplateparent|. If this optional argument is specified, the parenthood of the template applies only to this particular \meta{predefined option name}. Thus, if someone calls |\setbeamertemplate| for this \meta{predefined option name}, the given \meta{argument for children} is used. For other predefined option names a possibly different definition is used. You can imaging that leaving out the optional \meta{predefined option name} means ``this \meta{argument for children} applies to all predefined option names that have not been specially defined differently.''
+\end{command}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-emulation.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-emulation.tex
index e7dab7d774d..f4c6c6df321 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-emulation.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-emulation.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,124 +8,59 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-emulation.tex,v 1.9 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
+\section[How To Import Presentations Based on Other Packages and Classes]{How To Import Presentations Based on\\ Other Packages and Classes}
 
-\section[How To Import Presentations Based on Other Packages and Classes]
-{How To Import Presentations Based on\\ Other Packages and Classes}
+The \beamer\ class comes with a number of emulation layers for classes or packages that do not support \beamer\ directly. For example, the package |beamerseminar| maps some (not all) commands of the \seminar\ class to appropriate \beamer\ commands. This way, individual slides or whole sets of slides that have been prepared for a presentation using \seminar\ can be used inside \beamer, provided they are reasonably simple.
 
-The \beamer\ class comes with a number of emulation layers for classes
-or packages that do not support \beamer\ directly. For example, the
-package |beamerseminar| maps some (not all) commands of the \seminar\ 
-class to appropriate \beamer\ commands. This way, individual slides or
-whole sets of slides that have been prepared for a presentation using
-\seminar\ can be used inside \beamer, provided they are reasonably
-simple.
+None of the emulation layers is a perfect substitute for the original (emulations seldom are) and it is not intended that they ever will be. If you want/need/prefer the features of another class, use that class for preparing your presentations. The intention of these layers is just to help speed up creating \beamer\ presentations that use parts of old presentations. You can simply copy these parts in verbatim, without having to worry about the subtle differences in syntax.
 
-None of the emulation layers is a perfect substitute for the original
-(emulations seldom are) and it is not intended that they ever will
-be. If you want/need/prefer the features of another class, use that
-class for preparing your presentations. The intension of these layers
-is just to help speed up creating \beamer\ presentations that use
-parts of old presentations. You can simply copy these parts in
-verbatim, without having to worry about the subtle differences in
-syntax. 
+A useful effect of using an emulation layer is that you get access to all the features of \beamer\ while using the syntax of another class. For example, you can use the |article| mode to create a nice article version of a \prosper\ talk.
 
-A useful effect of using an emulation layer is that you get access to
-all the features of \beamer\ while using the syntax of another
-class. For example, you can use the |article| mode to create a
-nice article version of a \prosper\ talk.
 
-
-
-\subsection{Prosper and HA-Prosper}
+\subsection{Prosper, HA-Prosper and Powerdot}
 \label{section-prosper}
 
-The package |beamerprosper| maps the commands of the \prosper\
-package, developed by Fr\'ed\'eric Goualard, to \beamer\
-commands. Also, some commands of the \textsc{ha}-\prosper\ package,
-developed by Hendri Adriaens, are mapped to \beamer\ commands. 
-\emph{These mappings cannot perfectly emulate all of Prosper!} Rather,
-these mappings are intended as an aid when porting parts of
-presentations created using \prosper\ to \beamer. \emph{No styles are
-  implemented that mimick Prosper styles.} Rather, the normal \beamer\
-themes must be used (although, one could implement \beamer\ themes
-that mimicks existing \prosper\ styles; I have not done that and do
-not intend to).
-
-The workflow for creating a \beamer\ presentation that uses \prosper\
-code is the following: 
+The package |beamerprosper| maps the commands of the \prosper\ package, developed by Fr\'ed\'eric Goualard, to \beamer\ commands. Also, some commands of the \textsc{ha}-\prosper\ and \textsc{powerdot} packages, developed by Hendri Adriaens, are mapped to \beamer\ commands. \emph{These mappings cannot perfectly emulate all of Prosper!} Rather, these mappings are intended as an aid when porting parts of presentations created using \prosper\ to \beamer. \emph{No styles are implemented that mimick Prosper styles.} Rather, the normal \beamer\ themes must be used (although, one could implement \beamer\ themes that mimicks existing \prosper\ styles; we have not done that and do not intend to).
+
+The workflow for creating a \beamer\ presentation that uses \prosper\ code is the following:
 \begin{enumerate}
 \item
-  Use the document class |beamer|, not |prosper|. Most options
-  passed to |prosper| do not apply to |beamer| and should be omitted.
+  Use the document class |beamer|, not |prosper|. Most options passed to |prosper| do not apply to |beamer| and should be omitted.
 \item
   Add a |\usepackage{beamerprosper}| to start the emulation.
 \item
-  If you add slides relying on \textsc{ha}-\prosper, you may wish to
-  add the option |framesassubsections| to |beamerprosper|, though I do
-  not recommend it (use the normal |\subsection| command instead; it
-  gives you more fine-grained control).
-\item
-  If you also copy the title commands, it may be necessary to adjust
-  the content of commands like |\title| 
-  or |\author|. Note that in \prosper\ the |\email| command is given
-  outside the |\author| command, whereas in \beamer\ and also in
-  \textsc{ha}-\prosper\ it is given inside.
-\item
-  When copying slides containing the command |\includegraphics|, you
-  will almost surely have to adjust its usage. If you use pdf\LaTeX\
-  to typeset the presentation, than you cannot include PostScript
-  file. You should convert them to |.pdf| or to |.png| and adjust any
-  usage of |\includegraphics| accordingly.
-\item
-  When starting to change things, you can use all of \beamer's
-  commands and even mix them with \prosper\ commands.
+  If you add slides relying on \textsc{ha}-\prosper, you may wish to add the option |framesassubsections| to |beamerprosper|, though we do not recommend it (use the normal |\subsection| command instead; it gives you more fine-grained control).
+\item
+  If you also copy the title commands, it may be necessary to adjust the content of commands like |\title| or |\author|. Note that in \prosper\ the |\email| command is given outside the |\author| command, whereas in \beamer\ and also in \textsc{ha}-\prosper\ it is given inside.
+\item
+  When copying slides containing the command |\includegraphics|, you will almost surely have to adjust its usage. If you use pdf\LaTeX\ to typeset the presentation, than you cannot include PostScript files. You should convert them to |.pdf| or to |.png| and adjust any usage of |\includegraphics| accordingly.
+\item
+  When starting to change things, you can use all of \beamer's commands and even mix them with \prosper\ commands.
 \end{enumerate}
 
 An example can be found in the file |beamerexample-prosper.tex|.
 
-There are, unfortunately, quite a few places where you may run into
-problems:
+There are, unfortunately, quite a few places where you may run into problems:
 \begin{itemize}
 \item
-  In \beamer, the command |\PDForPS| will do exactly what the name
-  suggests: insert the first argument when run by |pdflatex|, insert
-  the second argument when run by |latex|. However, in \prosper, the
-  code inserted for the \pdf\ case is actually PostScript code, which
-  is only later converted to \pdf\ by some external program. You will
-  need to adjust this PostScript code such that it works with
-  |pdflatex| (which is not always possible).
-\item
-  If you used fine-grained spacing commands, like adding a little
-  horizontal skip   here and a big negative vertical skip there, the
-  typesetting of the text may be poor. It may be a good idea to just
-  remove these spacing commands.
-\item
-  If you use |pstricks| commands, you will either have to stick to
-  using |latex| and |dvips| or will have to work around them using,
-  for example, |pgf|. Porting lots of |pstricks| code is bound to be
-  difficult, if you wish to switch over to |pdflatex|, so be warned.
-\item
-  If the file cannot be compiled because some \prosper\ command is not
-  implemented, you will have to delete this command and try to mimick
-  its behaviour using some \beamer\ command.
+  In \beamer, the command |\PDForPS| will do exactly what the name suggests: insert the first argument when run by |pdflatex|, insert the second argument when run by |latex|. However, in \prosper, the code inserted for the \pdf\ case is actually PostScript code, which is only later converted to \pdf\ by some external program. You will need to adjust this PostScript code such that it works with |pdflatex| (which is not always possible).
+\item
+  If you used fine-grained spacing commands, like adding a little horizontal skip   here and a big negative vertical skip there, the typesetting of the text may be poor. It may be a good idea to just remove these spacing commands.
+\item
+  If you use |pstricks| commands, you will either have to stick to using |latex| and |dvips| or will have to work around them using, for example, |pgf|. Porting lots of |pstricks| code is bound to be difficult, if you wish to switch over to |pdflatex|, so be warned. You can read more about that in Section~\ref{section-graphics} that talks about graphics.
+\item
+  If the file cannot be compiled because some \prosper\ command is not implemented, you will have to delete this command and try to mimick its behaviour using some \beamer\ command.
 \end{itemize}
 
-
 \begin{package}{{beamerprosper}}
-  Include this package in a |beamer| presentation to get access to
-  \prosper\ commands. Use |beamer| as the document class, not
-  |prosper|. Most of the options passed to the class |prosper| make no
-  sense in |beamer|, so just delete them.
+  Include this package in a |beamer| presentation to get access to \prosper\ commands. Use |beamer| as the document class, not |prosper|. Most of the options passed to the class |prosper| make no sense in |beamer|, so just delete them.
 
   This package takes the following options:
   \begin{itemize}
   \item
-    \declare{|framesassubsections|} causes each frame to create its
-    own subsection with the frame title as subsection name. This
-    behaviour mimicks \textsc{ha}-\textsc{prosper}'s behaviour. In a
-    long talk this will create way too many subsections. 
+    \declare{|framesassubsections|} causes each frame to create its own subsection with the frame title as subsection name. This behaviour mimicks \textsc{ha}-\textsc{prosper}'s behaviour. In a long talk this will create way too many subsections.
   \end{itemize}
 
   \articlenote
@@ -180,28 +116,17 @@ My notes for these slides.
 \end{notes}
 \end{document}
 \end{verbatim}
-  
-  You can run, for example, pdf\LaTeX\ on the file to get a \beamer\
-  presentation with overlays. Adding the |notes| option will also show
-  the note. Certain commands, like |\LeftFoot|, are ignored. You can
-  change the theme using the usual commands. You can also use all
-  normal \beamer\ commands and concepts, like overlay-specifications,
-  in the file. You can also create an |article| version by using the
-  class |article| and including the package |beamerarticle|.
+  You can run, for example, pdf\LaTeX\ on the file to get a \beamer\ presentation with overlays. Adding the |notes| option will also show the note. Certain commands, like |\LeftFoot|, are ignored. You can change the theme using the usual commands. You can also use all normal \beamer\ commands and concepts, like overlay-specifications, in the file. You can also create an |article| version by using the class |article| and including the package |beamerarticle|.
 \end{package}
 
-In the following, the effect of \prosper\ commands in \beamer\ are
-listed.
+In the following, the effects of \prosper\ commands in \beamer\ are listed.
 
 \begin{command}{\email\marg{text}}
-  Simply typesets its argument in typewriter text. Should hence be
-  given \emph{inside} the |\author| command.
+  Simply typesets its argument in typewriter text. Should hence be given \emph{inside} the |\author| command.
 \end{command}
 
 \begin{command}{\institution\marg{text}}
-  This command is mapped to \beamer's |\institute|
-  command if given \emph{outside} the |\author| command, otherwise it
-  typesets its argument in a smaller font.
+  This command is mapped to \beamer's |\institute| command if given \emph{outside} the |\author| command, otherwise it typesets its argument in a smaller font.
 \end{command}
 
 \begin{command}{\Logo\opt{|(|\meta{x}|,|\meta{y}|)|}\marg{logo text}}
@@ -209,37 +134,29 @@ listed.
 \end{command}
 
 \begin{environment}{{slides}\oarg{options}\marg{frame title}}
-  Inserts a frame with the |fragile=singleslide| option set. The
-  \meta{frame title} will be enclosed in a |\frametitle| command.
+  Inserts a frame with the |fragile=singleslide| option set. The \meta{frame title} will be enclosed in a |\frametitle| command.
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|trans=|\meta{prosper transition}} installs the specified
-    \meta{prosper transition} as the transition effect when showing
-    the slide.
+    \declare{|trans=|\meta{prosper transition}} installs the specified \meta{prosper transition} as the transition effect when showing the slide.
   \item
-    \declare{\meta{prosper transition}} has the same effect as
-    |trans=|\meta{prosper transition}.
+    \declare{\meta{prosper transition}} has the same effect as |trans=|\meta{prosper transition}.
   \item
-    \declare{|toc=|\meta{entry}} overrides the subsection table of
-    contents entry created by this slide by \meta{entry}. Note that a
-    subsection entry is created for a slide only if the
-    |framesassubsections| options is specified.
+    \declare{|toc=|\meta{entry}} overrides the subsection table of contents entry created by this slide by \meta{entry}. Note that a subsection entry is created for a slide only if the |framesassubsections| options is specified.
   \item
     \declare{|template|=\meta{text}} is ignored.
   \end{itemize}
 
-  \example The following two texts have the same effect:
+  \example
+  The following two texts have the same effect:
 
 \begin{verbatim}
 \begin{slide}[trans=Glitter,toc=short]{A Title}
   Hi!
 \end{slide}
 \end{verbatim}
-
   and
-
 \begin{verbatim}
 \subsection{short} % omitted, if framesassubsections is not specified
 \begin{frame}[fragile=singleslide]
@@ -250,15 +167,12 @@ listed.
 \end{verbatim}
 \end{environment}
 
-
 \begin{command}{\overlays\marg{number}\marg{slide environment}}
-  This will put the \meta{slide environment} into a frame that does
-  not have the |fragile| option and which can hence contain
-  overlayed text. The \meta{number} is ignored since the number of
-  necessary overlays is computed automatically by \beamer.
+  This will put the \meta{slide environment} into a frame that does not have the |fragile| option and which can hence contain overlayed text. The \meta{number} is ignored since the number of necessary overlays is computed automatically by \beamer.
+
+  \example
+  The following code fragments have the same effect:
 
-  \example The following code fragments have the same effect:
-  
 \begin{verbatim}
 \overlays{2}{
 \begin{slide}{A Title}
@@ -268,9 +182,7 @@ listed.
   \end{itemstep}
 \end{slide}}
 \end{verbatim}
-
   and
-
 \begin{verbatim}
 \subsection{A Title} % omitted, if framesassubsections is not specified
 \begin{frame}
@@ -283,7 +195,6 @@ listed.
 \end{verbatim}
 \end{command}
 
-
 \begin{command}{\fromSlide\marg{slide number}\marg{text}}
   This is mapped to |\uncover<|\meta{slide number}|->{|\meta{text}|}|.
 \end{command}
@@ -333,8 +244,7 @@ listed.
 \end{command}
 
 \begin{command}{\PDFtransition\marg{prosper transition}}
-  Maps the \meta{prosper transition} to an appropriate |\transxxxx|
-  command.
+  Maps the \meta{prosper transition} to an appropriate |\transxxxx| command.
 \end{command}
 
 \begin{environment}{{Itemize}}
@@ -354,62 +264,40 @@ listed.
 \end{command}
 
 \begin{command}{\prosperpart\oarg{options}\marg{text}}
-  This command has the same effect as \prosper's |\part|
-  command. \beamer's normal |\part| command retains its normal
-  semantics. Thus, you might wish to replace all occurrences of |\part|
-  by |\prosperpart|.
+  This command has the same effect as \prosper's |\part| command. \beamer's normal |\part| command retains its normal semantics. Thus, you might wish to replace all occurrences of |\part| by |\prosperpart|.
 \end{command}
 
-
 \begin{command}{\tsection\opt{|*|}\marg{section name}}
-  Creates a section named \meta{section name}. The star, if present,
-  is ignored.
+  Creates a section named \meta{section name}. The star, if present, is ignored.
 \end{command}
 
 \begin{command}{\tsectionandpart\opt{|*|}\marg{part text}}
-  Mapped to a |\section| command followed by a |\prosperpart|
-  command.
+  Mapped to a |\section| command followed by a |\prosperpart| command.
 
   \articlenote
   In |article| mode, no part page is added.
 \end{command}
 
-\begin{command}{\dualslide\oarg{x}\oarg{y}\oarg{z}\marg{options}\marg{left
-      column}\marg{right column}}
-  This command is mapped to a |columns| environment. The \meta{left
-    column} text is shown in the left column, the \meta{right column}
-  text is shown in the right column. The options \meta{x}, \meta{y},
-  and \meta{z} are ignored. Also, all \emph{options} are ignored,
-  except for \declare{|lcolwidth=|} and \declare{|rcolwidth=|}. These
-  set the width of the left or right column, respectively.
+\begin{command}{\dualslide\oarg{x}\oarg{y}\oarg{z}\marg{options}\marg{left column}\marg{right column}}
+  This command is mapped to a |columns| environment. The \meta{left column} text is shown in the left column, the \meta{right column} text is shown in the right column. The options \meta{x}, \meta{y}, and \meta{z} are ignored. Also, all \meta{options} are ignored, except for \declare{|lcolwidth=|} and \declare{|rcolwidth=|}. These set the width of the left or right column, respectively.
 \end{command}
 
 \begin{command}{\PDForPS\marg{PostScript text}\marg{PDF text}}
-  Inserts either the \meta{PostScript text} or the \meta{PDF text},
-  depending on whether |latex| or |pdflatex| is used. When porting,
-  the \meta{PDF text} will most likely be \emph{incorrect}, since in
-  \prosper\ the \meta{PDF text} is actually PostScript text that is
-  later transformed to \pdf\ by some external program.
+  Inserts either the \meta{PostScript text} or the \meta{PDF text}, depending on whether |latex| or |pdflatex| is used. When porting, the \meta{PDF text} will most likely be \emph{incorrect}, since in \prosper\ the \meta{PDF text} is actually PostScript text that is later transformed to \pdf\ by some external program.
 
-  If the \meta{PDF text} contains an |\includegraphics| command (which
-  is its usual use), you should change the name of the graphic file
-  that is included to a name ending |.pdf|, |.png|, or
-  |.jpg|. Typically, you will have to convert your graphic to this
-  format.
+  If the \meta{PDF text} contains an |\includegraphics| command (which is its usual use), you should change the name of the graphic file that is included to a name ending |.pdf|, |.png|, or |.jpg|. Typically, you will have to convert your graphic to this format.
 \end{command}
 
 \begin{command}{\onlyInPDF\meta{PDF text}}
-  The \meta{PDF text} is only included if |pdflatex| is used. The same
-  as for the command |\PDForPS| applies here.
+  The \meta{PDF text} is only included if |pdflatex| is used. The same as for the command |\PDForPS| applies here.
 \end{command}
 
 \begin{command}{\onlyInPS\meta{PS text}}
-  The \meta{PS text} is only included if |latex| is used. 
+  The \meta{PS text} is only included if |latex| is used.
 \end{command}
 
 \begin{environment}{{notes}\marg{title}}
-  Mapped to |\note{\textbf{|\meta{title}|}|\meta{environment contents}|}|
-  (more or less). 
+  Mapped to |\note{\textbf{|\meta{title}|}|\meta{environment contents}|}| (more or less).
 \end{environment}
 
 The following commands are parsed by \beamer, but have no effect:
@@ -428,107 +316,59 @@ The following commands are parsed by \beamer, but have no effect:
 \end{itemize}
 
 
-
-
 \subsection{Seminar}
 \label{section-seminar}
 
-The package |beamerseminar| maps a subset of the commands of the \seminar\
-package to \beamer. As for \prosper, the emulation cannot be
-perfect. For example, no portrait slides are supported, no
-automatic page breaking, the framing of slides is not
-emulated. Unfortunately, for all frames (|slide| environments) that
-contain overlays, you have to put the environment into a |frame|
-environment ``by hand'' and must remove all occurrences of |\newslide|
-inside the environment by closing the slide and opening a new one (and
-then putting these into |frame| environments).
+The package |beamerseminar| maps a subset of the commands of the \seminar\ package to \beamer. As for \prosper, the emulation cannot be perfect. For example, no portrait slides are supported, no automatic page breaking, the framing of slides is not emulated. Unfortunately, for all frames (|slide| environments) that contain overlays, you have to put the environment into a |frame| environment ``by hand'' and must remove all occurrences of |\newslide| inside the environment by closing the slide and opening a new one (and then putting these into |frame| environments).
 
 The workflow for the migration is the following:
 \begin{enumerate}
 \item
-  Use the document class |beamer|, not |seminar|. Most options
-  passed to |seminar| do not apply to |beamer| and should be
-  omitted.
+  Use the document class |beamer|, not |seminar|. Most options passed to |seminar| do not apply to |beamer| and should be omitted.
 \item
-  If you copy parts of a presentation that is mixed with normal text,
-  add the |ignorenonframetext| option and place \emph{every} |slide|
-  environment inside a |frame| since \beamer\ will not recognize the 
-  |\begin{slide}| as the beginning of a frame.
+  If you copy parts of a presentation that is mixed with normal text, add the |ignorenonframetext| option and place \emph{every} |slide| environment inside a |frame| since \beamer\ will not recognize the |\begin{slide}| as the beginning of a frame.
 \item
-  Add a |\usepackage{beamerseminar}| to start the emulation. Add the
-  option |accumulate| if you wish to create a presentation to be held
-  with a video projector.
+  Add a |\usepackage{beamerseminar}| to start the emulation. Add the option |accumulate| if you wish to create a presentation to be held with a video projector.
 \item
   Possibly add commands to install themes and templates.
 \item
-  The should be not commands in the preamble having to do with
-  page and slide styles. They do not apply to |beamer|.
+  There should not be commands in the preamble having to do with page and slide styles. They do not apply to |beamer|.
 \item
-  If a |\newslide| command is used in a |slide| (or similarly
-  |slide*|) environment that contains an overlay, you must replace it
-  by a closing |\end{slide}| and an opening |\begin{slide}|. 
+  If a |\newslide| command is used in a |slide| (or similarly |slide*|) environment that contains an overlay, you must replace it by a closing |\end{slide}| and an opening |\begin{slide}|.
 \item
-  Next, for each |slide| or |slide*| environment that contains an
-  overlay, you must place a |frame| environment around it. You can
-  remove the |slide| environment (and hence effectively replace it by
-  |frame|), unless you use the |accumulate| option. 
+  Next, for each |slide| or |slide*| environment that contains an overlay, you must place a |frame| environment around it. You can remove the |slide| environment (and hence effectively replace it by |frame|), unless you use the |accumulate| option.
 \item
-  If you use |\section| or |\subsection| commands inside slides, you
-  will have to move them \emph{outside} the frames. It may then be
-  necessary to add a |\frametitle| command to the slide.
+  If you use |\section| or |\subsection| commands inside slides, you will have to move them \emph{outside} the frames. It may then be necessary to add a |\frametitle| command to the slide.
 \item
-  If you use pdf\LaTeX\ to typeset the presentation, you cannot
-  include PostScript files. You should convert them to |.pdf| or to
-  |.png| and adjust any usage of |\includegraphics| accordingly.
+  If you use pdf\LaTeX\ to typeset the presentation, you cannot include PostScript files. You should convert them to |.pdf| or to |.png| and adjust any usage of |\includegraphics| accordingly.
 \item
-  When starting to change things, you can use all of \beamer's
-  commands and even mix them with \seminar\ commands.
+  When starting to change things, you can use all of \beamer's commands and even mix them with \seminar\ commands.
 \end{enumerate}
 
 An example can be found in the file |beamerexample-seminar.tex|.
 
-There are, unfortunately, numerous places where you may run into
-problems:
+There are, unfortunately, numerous places where you may run into problems:
 \begin{itemize}
 \item
-  The whole |note| management of |seminar| is so different from
-  |beamer|'s, that you will have to edit notes ``by hand.'' In
-  particular, commands like |\ifslidesonly| and |\ifslide| may not do
-  exactly what you expect.
+  The whole |note| management of |seminar| is so different from |beamer|'s, that you will have to edit notes ``by hand.'' In particular, commands like |\ifslidesonly| and |\ifslide| may not do exactly what you expect.
 \item
-  If you use |pstricks| commands, you will either have to stick to
-  using |latex| and |dvips| or will have to work around them using,
-  for example, |pgf|. Porting lots of |pstricks| code is bound to be
-  difficult, if you wish to switch over to |pdflatex|, so be warned.
+  If you use |pstricks| commands, you will either have to stick to using |latex| and |dvips| or will have to work around them using, for example, |pgf|. Porting lots of |pstricks| code is bound to be difficult, if you wish to switch over to |pdflatex|, so be warned.
 \item
-  If the file cannot be compiled because some \seminar\ command is not
-  implemented, you will have to delete this command and try to mimick
-  its behaviour using some \beamer\ command.
+  If the file cannot be compiled because some \seminar\ command is not implemented, you will have to delete this command and try to mimick its behaviour using some \beamer\ command.
 \end{itemize}
 
 \begin{package}{{beamerseminar}}
-  Include this package in a |beamer| presentation to get access to
-  \seminar\ commands. Use |beamer| as the document class, not
-  |seminar|. Most of the options passed to the class |seminar| make no
-  sense in |beamer|, so just delete them.
+  Include this package in a |beamer| presentation to get access to \seminar\ commands. Use |beamer| as the document class, not |seminar|. Most of the options passed to the class |seminar| make no sense in |beamer|, so just delete them.
 
   This package takes the following options:
   \begin{itemize}
   \item
-    \declare{|accumulate|} causes overlays to be accumulated. The
-    original behaviour of the \seminar\ package is that in each
-    overlay only the really ``new'' part of the overlay is shown. This
-    makes sense, if you really print out the overlays on
-    transparencies and then really stack overlays on top of each
-    other. For a presentation with a video projector, you rather
-    want to present an ``accumulated'' version of the overlays. This
-    is what this option does: When the new material of the $i$th
-    overlay is shown, the material of all previous overlays is also
-    shown. 
+    \declare{|accumulate|} causes overlays to be accumulated. The original behaviour of the \seminar\ package is that in each overlay only the really ``new'' part of the overlay is shown. This makes sense, if you really print out the overlays on transparencies and then really stack overlays on top of each other. For a presentation with a video projector, you rather want to present an ``accumulated'' version of the overlays. This is what this option does: When the new material of the $i$-th overlay is shown, the material of all previous overlays is also shown.
   \end{itemize}
 
   \example
   The following example is an extract of |beamerexample-seminar.tex|:
+
 \begin{verbatim}
 \documentclass[ignorenonframetext]{beamer}
 \usepackage[accumulated]{beamerseminar}
@@ -564,24 +404,13 @@ article version.
 \end{frame}
 \end{document}
 \end{verbatim}
-
-  You can use all normal \beamer\ commands and concepts, like
-  overlay-specifications, in the file. You can also create an
-  |article| version by using the class |article| and
-  including the package |beamerarticle|. 
+  You can use all normal \beamer\ commands and concepts, like overlay-specifications, in the file. You can also create an |article| version by using the class |article| and including the package |beamerarticle|.
 \end{package}
 
-In the following, the effect of \seminar\ commands in \beamer\ are
-listed.
+In the following, the effects of \seminar\ commands in \beamer\ are listed.
 
 \begin{command}{\overlay\marg{number}}
-  Shows the material till the end of the current \TeX\ group only on
-  overlay numbered $\hbox{\meta{number}}+1$ or, if the |accumulate|
-  option is given, from that overlay on. Usages of this command may be
-  nested (as in \seminar). If an |\overlay| command is given inside
-  another, it temporarily ``overrules'' the outer one as demonstrated
-  in the following example, where it is assumed that the |accumulate|
-  option is given.
+  Shows the material till the end of the current \TeX\ group only on overlay numbered $\hbox{\meta{number}}+1$ or, if the |accumulate| option is given, from that overlay on. Usages of this command may be nested (as in \seminar). If an |\overlay| command is given inside another, it temporarily ``overrules'' the outer one as demonstrated in the following example, where it is assumed that the |accumulate| option is given.
 
   \example
 \begin{verbatim}
@@ -600,19 +429,12 @@ listed.
 \end{verbatim}
 \end{command}
 
-
 \begin{environment}{{slide}\opt{|*|}}
-  Mainly installs an |\overlay{0}| around the \meta{environment
-    contents}. If the |accumulate| option is given, this has no
-  effect, but otherwise it will cause the main text of the slide to be
-  shown \emph{only} on the first slide. This is useful if you really
-  wish to physically place slides on top of each other.
+  Mainly installs an |\overlay{0}| around the \meta{environment contents}. If the |accumulate| option is given, this has no effect, but otherwise it will cause the main text of the slide to be shown \emph{only} on the first slide. This is useful if you really wish to physically place slides on top of each other.
 
   The starred version does the same as the nonstarred one.
 
-  If this command is not issued inside a |\frame|, it sets up a frame
-  with the |fragile=singleframe| option set. Thus, this frame will
-  contain only a single slide.
+  If this command is not issued inside a |\frame|, it sets up a frame with the |fragile=singleframe| option set. Thus, this frame will contain only a single slide.
 
   \example
 \begin{verbatim}
@@ -662,24 +484,12 @@ The following commands are parsed by \beamer, but have no effect:
 \end{itemize}
 
 
-
 \subsection{Foil\TeX}
 \label{section-foiltex}
 
-The package |beamerfoils| maps a subset of the commands of the \foils\
-package to \beamer. Since this package defines only few non-standard
-\TeX\ commands and since \beamer\ implements all the standard
-commands, the emulation layer is pretty simple. 
-
-A copyright notice: The Foil\TeX\ package has a restricted
-license. For this reason, no example from the \foils\ package is
-included in the \beamer\ class. The emulation itself does not use the
-code of the \foils\ package (rather, it just maps \foils\ commands to
-\beamer\ commands). For this reason, my understanding is that the
-\emph{emulation} offered by the \beamer\ class is ``free'' and legally
-so. IBM has a copyright on the \foils\ class, not on the effect the
-commands of this class have. (At least, that's my understanding of
-things.) 
+The package |beamerfoils| maps a subset of the commands of the \foils\ package to \beamer. Since this package defines only few non-standard \TeX\ commands and since \beamer\ implements all the standard commands, the emulation layer is pretty simple.
+
+A copyright notice: The Foil\TeX\ package has a restricted license. For this reason, no example from the \foils\ package is included in the \beamer\ class. The emulation itself does not use the code of the \foils\ package (rather, it just maps \foils\ commands to \beamer\ commands). For this reason, our understanding is that the \emph{emulation} offered by the \beamer\ class is ``free'' and legally so. IBM has a copyright on the \foils\ class, not on the effect the commands of this class have. (At least, that's our understanding of things.)
 
 The workflow for the migration is the following:
 \begin{enumerate}
@@ -690,40 +500,25 @@ The workflow for the migration is the following:
 \item
   Possibly add commands to install themes and templates.
 \item
-  If the command |\foilhead| is used inside a |\frame| command or
-  |frame| environment, it behaves like |\frametitle|. If it used
-  outside a frame, it will start a new frame (with the
-  |allowframebreaks| option, thus no overlays are allowed). This frame
-  will persist till the next occurrence of |\foilhead| or of the new
-  command |\endfoil|. Note that a |\frame| command will \emph{not} end
-  a frame started using |\foilhead|. 
-\item
-  If you rely on automatic frame creation based on |\foilhead|, you
-  will need to insert an |\endfoil| before the end of the document to
-  end the last frame.
-\item
-  If you use pdf\LaTeX\ to typeset the presentation, than you cannot
-  include PostScript files. You should convert them to |.pdf| or to
-  |.png| and adjust any usage of |\includegraphics| accordingly.
-\item
-  Sizes of objects are different in \beamer, since the scaling is done
-  by the viewer, not by the class. Thus a framebox of size 6 inches
-  will be way too big in a \beamer\ presentation. You will have to
-  manually adjust explicit dimension occurring in a foil\TeX\ presentation.
+  If the command |\foilhead| is used inside a |\frame| command or |frame| environment, it behaves like |\frametitle|. If it used outside a frame, it will start a new frame (with the |allowframebreaks| option, thus no overlays are allowed). This frame will persist till the next occurrence of |\foilhead| or of the new command |\endfoil|. Note that a |\frame| command will \emph{not} end a frame started using |\foilhead|.
+\item
+  If you rely on automatic frame creation based on |\foilhead|, you will need to insert an |\endfoil| before the end of the document to end the last frame.
+\item
+  If you use pdf\LaTeX\ to typeset the presentation, than you cannot include PostScript files. You should convert them to |.pdf| or to |.png| and adjust any usage of |\includegraphics| accordingly.
+\item
+  Sizes of objects are different in \beamer, since the scaling is done by the viewer, not by the class. Thus a framebox of size 6 inches will be way too big in a \beamer\ presentation. You will have to manually adjust explicit dimension occurring in a foil\TeX\ presentation.
 \end{enumerate}
 
 \begin{package}{{beamerfoils}}
-  Include this package in a |beamer| presentation to get access to
-  \foils\ commands. Use |beamer| as the document class, not
-  |foils|.
+  Include this package in a |beamer| presentation to get access to \foils\ commands. Use |beamer| as the document class, not |foils|.
+
+  \example
+  In the following example, frames are automatically created. The |\endfoil| at the end is needed to close the last frame.
 
-  \example In the following example, frames are automatically
-  created. The |\endfoil| at the end is needed to close the last
-  frame. 
 \begin{verbatim}
 \documentclass{beamer}
 \usepackage{beamerfoils}
-  
+
 \begin{document}
 
 \maketitle
@@ -732,7 +527,7 @@ The workflow for the migration is the following:
 
 This is on the first frame.
 \pagebreak
-This is on the second frame, which is a continuation of the first. 
+This is on the second frame, which is a continuation of the first.
 
 \foilhead{Third Frame}
 
@@ -741,13 +536,14 @@ This is on the third frame.
 \endfoil
 \end{document}
 \end{verbatim}
-  
-  \example In this example, frames are manually inserted. No
-  |\endfoil| is needed.
+
+  \example
+  In this example, frames are manually inserted. No |\endfoil| is needed.
+
 \begin{verbatim}
 \documentclass{beamer}
 \usepackage{beamerfoils}
-  
+
 \begin{document}
 
 \frame{\maketitle}
@@ -765,13 +561,10 @@ This is on the second frame.
 \end{verbatim}
 \end{package}
 
-
-In the following, the effect of \foils\ commands in \beamer\ are
-listed.
+In the following, the effects of \foils\ commands in \beamer\ are listed.
 
 \begin{command}{\MyLogo\marg{logo text}}
-  This is mapped to |\logo|, though the logo is internally stored,
-  such that it can be switched on and off using |\LogoOn| and |\LogoOff|.
+  This is mapped to |\logo|, though the logo is internally stored, such that it can be switched on and off using |\LogoOn| and |\LogoOff|.
 \end{command}
 
 \begin{command}{\LogoOn}
@@ -783,12 +576,7 @@ listed.
 \end{command}
 
 \begin{command}{\foilhead\oarg{dimension}\marg{frame title}}
-  If used inside a |\frame| command or |frame| environment, this is
-  mapped to |\frametitle{|\meta{frame title}|}|. If used outside any
-  frames, a new frame is started with the option
-  |allowframebreaks|. If a frame was previously started using this
-  command, it will be closed before the next frame is started. The
-  \meta{dimension} is ignored. 
+  If used inside a |\frame| command or |frame| environment, this is mapped to |\frametitle{|\meta{frame title}|}|. If used outside any frames, a new frame is started with the option |allowframebreaks|. If a frame was previously started using this command, it will be closed before the next frame is started. The \meta{dimension} is ignored.
 \end{command}
 
 \begin{command}{\rotatefoilhead\oarg{dimension}\marg{frame title}}
@@ -796,15 +584,11 @@ listed.
 \end{command}
 
 \begin{command}{\endfoil}
-  This is a command that is \emph{not} available in \foils. In
-  \beamer, it can be used to end a frame that has automatically been
-  opened using |\foildhead|. This command must be given before the end
-  of the document if the last frame was opened using |\foildhead|.  
+  This is a command that is \emph{not} available in \foils. In \beamer, it can be used to end a frame that has automatically been opened using |\foildhead|. This command must be given before the end of the document if the last frame was opened using |\foildhead|.
 \end{command}
 
 \begin{environment}{{boldequation}\opt{|*|}}
-  This is mapped to the |equation| or the |equation*| environment,
-  with |\boldmath| switched on.
+  This is mapped to the |equation| or the |equation*| environment, with |\boldmath| switched on.
 \end{environment}
 
 \begin{command}{\FoilTeX}
@@ -824,12 +608,12 @@ The following additional theorem-like environments are predefined:
 \item |Theorem*|,
 \item |Lemma*|,
 \item |Corollary*|,
-\item |Proposition*|,
+\item |Proposition*|, and
 \item |Definition*|.
 \end{itemize}
-For example, the first is defined using |\newtheorem*{Theorem*}{Theorem}|. 
+For example, the first is defined using |\newtheorem*{Theorem*}{Theorem}|.
 
-The following commands are parsed by \beamer, but have not effect:
+The following commands are parsed by \beamer, but have no effect:
 \begin{itemize}
 \item |\leftheader|,
 \item |\rightheader|,
@@ -840,94 +624,53 @@ The following commands are parsed by \beamer, but have not effect:
 \end{itemize}
 
 
-
 \subsection{\TeX Power}
 \label{section-texpower}
 
-The package |beamertexpower| maps a subset of the commands of the
-\texpower\ package, due to Stephan Lehmke, to \beamer. This subset is
-currently rather small, so a lot of adaptions may be necessary. Note
-that \texpower\ is not a full class by itself, but a package that
-needs another class, like |seminar| or |prosper| to do the actually
-typesetting. It may thus be necessary to additionally load an
-emulation layer for these also. Indeed, it \emph{might} be possible to
-directly use \texpower\ inside \beamer, but I have not tried
-that. Perhaps this will be possible in the future.
-
-Currently, the package |beamertexpower| mostly just maps the
-|\stepwise| and related commands to appropriate \beamer\ commands. The
-|\pause| command need not be mapped since it is directly implemented
-by \beamer\ anyway.
+The package |beamertexpower| maps a subset of the commands of the \texpower\ package, due to Stephan Lehmke, to \beamer. This subset is currently rather small, so a lot of adaptions may be necessary. Note that \texpower\ is not a full class by itself, but a package that needs another class, like |seminar| or |prosper| to do the actual typesetting. It may thus be necessary to additionally load an emulation layer for these also. Indeed, it \emph{might} be possible to directly use \texpower\ inside \beamer, but we have not tried that. Perhaps this will be possible in the future.
+
+Currently, the package |beamertexpower| mostly just maps the |\stepwise| and related commands to appropriate \beamer\ commands. The |\pause| command need not be mapped since it is directly implemented by \beamer\ anyway.
 
 The workflow for the migration is the following:
 \begin{enumerate}
 \item
-  Replace the document class by |beamer|. If the document class is
-  |seminar| or |prosper|, you can use the above emulation layers, that
-  is, you can include the files |beamerseminar| or |beamerprosper| to
-  emulate the class.
+  Replace the document class by |beamer|. If the document class is |seminar| or |prosper|, you can use the above emulation layers, that is, you can include the files |beamerseminar| or |beamerprosper| to emulate the class.
 
-  All notes on what to do for the emulation of \seminar\ or \prosper\
-  also apply here.
+  All notes on what to do for the emulation of \seminar\ or \prosper\ also apply here.
 \item
-  Additionally, add |\usepackage{beamertexpower}| to start the
-  emulation.
+  Additionally, add |\usepackage{beamertexpower}| to start the emulation.
 \end{enumerate}
 
-
 \begin{package}{{beamertexpower}}
-  Include this package in a |beamer| presentation to get access to the
-  \texpower\ commands having to do with the |\stepwise| command.
+  Include this package in a |beamer| presentation to get access to the \texpower\ commands having to do with the |\stepwise| command.
 \end{package}
 
-A note on the |\pause| command: Both \beamer\ and \texpower\ implement
-this command and they have the same semantics; so there is no need to
-map this command to anything different in |beamertexpower|. However, a
-difference is that |\pause| can be used almost anywhere in \beamer,
-whereas is may only be used in non-nested situations in \texpower. Since
-\beamer\ is only more flexible than \texpower\ here, this will not
-cause problems when porting.
+A note on the |\pause| command: Both \beamer\ and \texpower\ implement this command and they have the same semantics; so there is no need to map this command to anything different in |beamertexpower|. However, a difference is that |\pause| can be used almost anywhere in \beamer, whereas it may only be used in non-nested situations in \texpower. Since \beamer\ is only more flexible than \texpower\ here, this will not cause problems when porting.
 
-In the following, the effect of \texpower\ commands in \beamer\ are
-listed.
+In the following, the effect of \texpower\ commands in \beamer\ are listed.
 
 \begin{command}{\stepwise\marg{text}}
-  As in \TeX Power, this initiates text in which commands like |\step|
-  or |\switch| may be given. Text contained in a |\step| command will
-  be enclosed in an |\only| command with the overlay specification
-  |<+(1)->|. This means that the text of the first |\step| is inserted
-  from the second slide onward, the text of the second |\step| is
-  inserted from the third slide onward, and so on.
+  As in \texpower, this initiates text in which commands like |\step| or |\switch| may be given. Text contained in a |\step| command will be enclosed in an |\only| command with the overlay specification |<+(1)->|. This means that the text of the first |\step| is inserted from the second slide onward, the text of the second |\step| is inserted from the third slide onward, and so on.
 \end{command}
 
 \begin{command}{\parstepwise\marg{text}}
-  Same as |\stepwise|, only |\uncover| is used instead of |\only| when
-  mapping the |\step| command.
+  Same as |\stepwise|, only |\uncover| is used instead of |\only| when mapping the |\step| command.
 \end{command}
 
 \begin{command}{\liststepwise\marg{text}}
-  Same as |\stepwise|, only an invisible horizontal line is inserted
-  before the \meta{text}. This is presumable useful for solving some
-  problems related to vertical spacing in \texpower. 
+  Same as |\stepwise|, only an invisible horizontal line is inserted before the \meta{text}. This is presumably useful for solving some problems related to vertical spacing in \texpower.
 \end{command}
 
 \begin{command}{\step\marg{text}}
-  This is either mapped to |\only<+(1)->|\meta{text} or to
-  |\uncover<+(1)->|\meta{text}, depending on whether this command is
-  used inside a |\stepwise| environment or inside a |\parstepwise|
-  environment. 
+  This is either mapped to |\only<+(1)->|\meta{text} or to |\uncover<+(1)->|\meta{text}, depending on whether this command is used inside a |\stepwise| environment or inside a |\parstepwise| environment.
 \end{command}
 
 \begin{command}{\steponce\marg{text}}
-  This is either mapped to |\only<+(1)>|\meta{text} or to
-  |\uncover<+(1)>|\meta{text}, depending on whether this command is
-  used inside a |\stepwise| environment or inside a |\parstepwise|
-  environment. 
+  This is either mapped to |\only<+(1)>|\meta{text} or to |\uncover<+(1)>|\meta{text}, depending on whether this command is used inside a |\stepwise| environment or inside a |\parstepwise| environment.
 \end{command}
 
 \begin{command}{\switch\marg{alternate text}\marg{text}}
-  This is mapped to |\alt<+(1)->{|\meta{text}|}{|\meta{alternate
-      text}|}|. Note that the arguments are swapped.
+  This is mapped to |\alt<+(1)->{|\meta{text}|}{|\meta{alternate text}|}|. Note that the arguments are swapped.
 \end{command}
 
 \begin{command}{\bstep\marg{text}}
@@ -935,8 +678,7 @@ listed.
 \end{command}
 
 \begin{command}{\dstep}
-  This just advances the counter |beamerpauses| by one. It has no
-  other effect.
+  This just advances the counter |beamerpauses| by one. It has no other effect.
 \end{command}
 
 \begin{command}{\vstep}
@@ -944,10 +686,7 @@ listed.
 \end{command}
 
 \begin{command}{\restep\marg{text}}
-  Same as |\step|, but the \meta{text} is shown one the same slide as
-  the previous |\step| command. This is implemented by first
-  decreasing the countern  |beamerpauses| by one before calling
-  |\step|. 
+  Same as |\step|, but the \meta{text} is shown one the same slide as the previous |\step| command. This is implemented by first decreasing the countern  |beamerpauses| by one before calling |\step|.
 \end{command}
 
 \begin{command}{\reswitch\marg{alternate text}\meta{text}}
@@ -967,15 +706,11 @@ listed.
 \end{command}
 
 \begin{command}{\boxedsteps}
-  Temporarily (for the current \TeX\ group) changes the effect of
-  |\step| to issue an |\uncover|, even if used inside a |\stepwise|
-  environment. 
+  Temporarily (for the current \TeX\ group) changes the effect of |\step| to issue an |\uncover|, even if used inside a |\stepwise| environment.
 \end{command}
 
 \begin{command}{\nonboxedsteps}
-  Temporarily (for the current \TeX\ group) changes the effect of
-  |\step| to issue an |\only|, even if used inside a |\parstepwise|
-  environment. 
+  Temporarily (for the current \TeX\ group) changes the effect of |\step| to issue an |\only|, even if used inside a |\parstepwise| environment.
 \end{command}
 
 \begin{command}{\code\marg{text}}
@@ -985,11 +720,3 @@ listed.
 \begin{command}{\codeswitch}
   Switches to a boldface typewriter font.
 \end{command}
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-fonts.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-fonts.tex
index bd635982001..647dfe3c5bc 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-fonts.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-fonts.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,238 +8,114 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-fonts.tex,v 1.13 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Fonts}
-
 \label{section-fonts}
 
-The first subsection introduces the predefined font
-themes that come with \beamer\ and which make it easy to change the
-fonts used in a presentation. The next subsection describes further
-special commands for changing some basic attributes of the fonts used in a 
-presentation. The last subsection explains how you can get a much more
-fine-grained control over the fonts used for every individual element
-of a presentation. 
-
-
-
+The first subsection introduces the predefined font themes that come with \beamer\ and which make it easy to change the fonts used in a presentation. The next subsection describes further special commands for changing some basic attributes of the fonts used in a presentation. The last subsection explains how you can get a much more fine-grained control over the fonts used for every individual element of a presentation.
 
 
 \subsection{Font Themes}
 
-\beamer\ comes with a set of font themes. When you use such a theme,
-certain fonts are changed as described below. You can use several font
-themes in concert. For historical reasons, you cannot change all
-aspects of the fonts used using font themes---in same cases special
-commands and options are needed, which are described in the next
-subsection.
+\beamer\ comes with a set of font themes. When you use such a theme, certain fonts are changed as described below. You can use several font themes in concert. For historical reasons, you cannot change all aspects of the fonts used using font themes---in some cases special commands and options are needed, which are described in the next subsection.
 
-The following font themes only change certain font attributes, they do
-not choose special font families (although that would also be possible
-and themes doing just that might be added in the future). Currently,
-to change the font family, you need to load special packages as
-explained in the next subsection.
+The following font themes only change certain font attributes, they do not choose special font families (although that would also be possible and themes doing just that might be added in the future). Currently, to change the font family, you need to load special packages as explained in the next subsection.
 
 
 \begin{fontthemeexample}{default}
-  The default font theme installs a sans serif font for all text of
-  the presentation. The default theme installs different font sizes
-  for things like titles or head- and footlines, but does not use
-  boldface or italics for ``hilighting.'' To change some or all text
-  to a serif font, use the |serif| theme.
-
-  Note: The command |\mathrm| will always produce upright (not
-  slanted), serif text and the command |\mathsf| will always produce
-  upright, sans-serif text. The command |\mathbf| will produce
-  upright, bold-face, sans-serif or serif text, depending on whether
-  |mathsans| or |mathserif| is used.
-
-  To produce an upright, sans-serif or serif text, depending on
-  whether |mathsans| or |mathserif| is used, you can use for instance
-  the command |\operatorname| from the |amsmath| package. Using this
-  command instead of |\mathrm| or |\mathsf| directly will
-  automatically adjust  upright mathematical text if you switch from
-  sans-serif to serif or back.
+  The default font theme installs a sans serif font for all text of the presentation. The default theme installs different font sizes for things like titles or head- and footlines, but does not use boldface or italics for ``highlighting.'' To change some or all text to a serif font, use the |serif| theme.
+
+  Note: The command |\mathrm| will always produce upright (not slanted), serif text and the command |\mathsf| will always produce upright, sans-serif text. The command |\mathbf| will produce upright, bold-face, sans-serif or serif text, depending on whether |mathsans| or |mathserif| is used.
+
+  To produce an upright, sans-serif or serif text, depending on whether |mathsans| or |mathserif| is used, you can use for instance the command |\operatorname| from the |amsmath| package. Using this command instead of |\mathrm| or |\mathsf| directly will automatically adjust upright mathematical text if you switch from sans-serif to serif or back.
 \end{fontthemeexample}
 
 \begin{fontthemeexample*}{professionalfonts}
-  This font theme does not really change any fonts. Rather, it
-  \emph{suppresses} certain internal replacements performed by
-  \beamer. If you use ``professional fonts'' (fonts that you buy and
-  that come with a complete set of every symbol in all modes), you do
-  not want \beamer\ to meddle with the fonts you use.  \beamer\
-  normally replaces certain character glyphs in mathematical text by
-  more appropriate versions. For example, \beamer\ will normally
-  replace glyphs such that the italic characters from the main font
-  are used for variables in mathematical text. If your professional
-  font package takes care of this already, \beamer's meddling should
-  be switched off. Note that \beamer's substitution is automatically
-  turned off if one of the following packages is loaded: |mathtime|,
-  |mathpmnt|, |lucidabr|, |mtpro|, and |hvmath|. If your favorite
-  professional font package is not among these, use the
-  |professionalfont| option (and write me an email, so that the
-  package can be added). 
+  This font theme does not really change any fonts. Rather, it \emph{suppresses} certain internal replacements performed by \beamer. If you use ``professional fonts'' (fonts that you buy and that come with a complete set of every symbol in all modes), you do not want \beamer\ to meddle with the fonts you use. \beamer\ normally replaces certain character glyphs in mathematical text by more appropriate versions. For example, \beamer\ will normally replace glyphs such that the italic characters from the main font are used for variables in mathematical text. If your professional font package takes care of this already, \beamer's meddling should be switched off. Note that \beamer's substitution is automatically turned off if one of the following packages is loaded: |arevmath|, |hvmath|, |lucidabr|, |lucimatx|, |mathpmnt|, |mathpple|, |mathtime|, |mtpro|, and |mtpro2|. If your favorite professional font package is not among these, use the |professionalfont| option (and write us an email, so that the package can be added).
 \end{fontthemeexample*}
 
-
-
 \begin{fontthemeexample}[\oarg{options}]{serif}
-  This theme causes all text to be typeset using the default serif font
-  (except if you specify certain \meta{options}). You might wish to
-  consult Section~\ref{section-guidelines-serif} on whether you should
-  use serif fonts.
+  This theme causes all text to be typeset using the default serif font (except if you specify certain \meta{options}). You might wish to consult Section~\ref{section-guidelines-serif} on whether you should use serif fonts.
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
     \declare{|stillsansserifmath|}
-    causes mathematical text still to be typeset using sans
-    serif. This option only makes sense if you also use the
-    |stillsansseriftext| option since sans serif math inside serif
-    text look silly. 
+    causes mathematical text still to be typeset using sans serif. This option only makes sense if you also use the |stillsansseriftext| option since sans serif math inside serif text looks silly.
   \item
     \declare{|stillsansserifsmall|}
-    will cause ``small'' text to be still typeset using sans
-    serif. This refers to the text in the headline, footline, and
-    sidebars.  Using this options is often advisable since small text
-    is often easier to read in sans serif.
+    will cause ``small'' text to be still typeset using sans serif. This refers to the text in the headline, footline, and sidebars. Using this options is often advisable since small text is often easier to read in sans serif.
   \item
     \declare{|stillsansseriflarge|}
-    will cause ``large'' text like the presentation title or the frame
-    title to be still typeset using sans serif. Sans serif titles with
-    serif text are a popular combination in typography.
+    will cause ``large'' text like the presentation title or the frame title to be still typeset using sans serif. Sans serif titles with serif text are a popular combination in typography.
   \item
     \declare{|stillsansseriftext|}
-    will cause normal text (none of the above three) to be still
-    typeset using sans serif. If you use this option, you should most
-    likely also use the first two. However, by not using
-    |stillsansseriflarge|, you get a serif (possibly italic) title
-    over a sans serif text. This can be an interesting visual
-    effect. Naturally, ``interesting typographic effect'' can mean
-    ``terrible typographic effect'' if you choose the wrong fonts
-    combinations or sizes. You'll need some typographic experience to
-    judge this correctly. If in doubt, try asking someone who should
-    now. 
+    will cause normal text (none of the above three) to be still typeset using sans serif. If you use this option, you should most likely also use the first two. However, by not using |stillsansseriflarge|, you get a serif (possibly italic) title over a sans serif text. This can be an interesting visual effect. Naturally, ``interesting typographic effect'' can mean ``terrible typographic effect'' if you choose the wrong fonts combinations or sizes. You'll need some typographic experience to judge this correctly. If in doubt, try asking someone who should know.
   \item
     \declare{|onlymath|}
-    is a short-cut for selecting all of the above options except for
-    the first. Thus, using this option causes only mathematical text
-    to by typeset using a serif font. Recall that, by default,
-    mathematical formulas are also typeset using sans-serif
-    letters. In most cases, this is visually the most pleasing and
-    easily readable way of typesetting mathematical formulas if the
-    surrounding text is typeset using sans serif. However,
-    in mathematical texts the font used to render, say, a variable is
-    sometimes used to differentiate between different meanings of this
-    variable. In such case, it may be necessary to typeset
-    mathematical text using serif letters. Also, if you have a lot of
-    mathematical text, the audience may be quicker to ``parse'' it if
-    it is typeset the way people usually read mathematical text: in a
-    serif font. 
+    is a short-cut for selecting all of the above options except for the first. Thus, using this option causes only mathematical text to by typeset using a serif font. Recall that, by default, mathematical formulas are also typeset using sans-serif letters. In most cases, this is visually the most pleasing and easily readable way of typesetting mathematical formulas if the surrounding text is typeset using sans serif. However, in mathematical texts the font used to render, say, a variable is sometimes used to differentiate between different meanings of this variable. In such case, it may be necessary to typeset mathematical text using serif letters. Also, if you have a lot of mathematical text, the audience may be quicker to ``parse'' it if it is typeset the way people usually read mathematical text: in a serif font.
   \end{itemize}
 \end{fontthemeexample}
 
-
-
 \begin{fontthemeexample}[\oarg{options}]{structurebold}
-  This font theme will cause titles and text in the headlines,
-  footlines, and sidebars to be typeset in a bold font.
+  This font theme will cause titles and text in the headlines, footlines, and sidebars to be typeset in a bold font.
 
   The following \meta{options} may be given:
   \begin{itemize}
   \item
     \declare{|onlysmall|}
-    will cause only ``small'' text to be typeset in bold. More
-    precisely, only the text in the headline, footline, and sidebars
-    is changed to be typeset in bold. Large titles are not affected.
+    will cause only ``small'' text to be typeset in bold. More precisely, only the text in the headline, footline, and sidebars is changed to be typeset in bold. Large titles are not affected.
   \item
     \declare{|onlylarge|}
-    will cause only ``large'' text to be typeset in bold. These are
-    the main title, frame titles, and section entries in the table of
-    contents.     
+    will cause only ``large'' text to be typeset in bold. These are the main title, frame titles, and section entries in the table of contents.
   \end{itemize}
 
-  As pointed out in Section~\ref{section-sizes}, you should use this
-  theme (possibly with the |onlysmall| option) if your font is not
-  scaled down properly or for light-on-dark text.
+  As pointed out in Section~\ref{section-sizes}, you should use this theme (possibly with the |onlysmall| option) if your font is not scaled down properly or for light-on-dark text.
 
-  The normal themes do not install this theme by default, while the
-  old compatibility themes do. Since you can reload the theme once it
-  has been loaded, you cannot use this theme with the old
-  compatibility themes to set also titles to a bold font. 
+  The normal themes do not install this theme by default, while the old compatibility themes do. Since you can reload the theme once it has been loaded, you cannot use this theme with the old compatibility themes to set also titles to a bold font.
 \end{fontthemeexample}
 
 \begin{fontthemeexample}[\oarg{options}]{structureitalicserif}
-  This theme is similarly as the |structurebold| font theme, but where
-  |structurebold| makes text bold, this theme typesets it in italics and
-  in the standard serif font. The same \meta{options} as for the
-  |structurebold| theme are supported. See
-  Section~\ref{section-italics} for the pros and cons 
-  of using italics.  
+  This theme is similarly as the |structurebold| font theme, but where |structurebold| makes text bold, this theme typesets it in italics and in the standard serif font. The same \meta{options} as for the |structurebold| theme are supported. See Section~\ref{section-italics} for the pros and cons of using italics.
 \end{fontthemeexample}
 
 \begin{fontthemeexample}[\oarg{options}]{structuresmallcapsserif}
-  Again, this theme does exactly the same as the |structurebold| font theme,
-  only this time text is set using small caps and a serif
-    font. The same \meta{options} as for the |structurebold| theme are
-  supported. See Section~\ref{section-smallcaps} for the pros and cons
-  of using small caps.  
+  Again, this theme does exactly the same as the |structurebold| font theme, only this time text is set using small caps and a serif font. The same \meta{options} as for the |structurebold| theme are supported. See Section~\ref{section-smallcaps} for the pros and cons of using small caps.
 \end{fontthemeexample}
 
 
+\subsection{Font Changes Made Without Using Font Themes}
 
-
-
-
-\subsection{Font Changes Made Without Using Font Themes} 
-
-While most font decisions can be made using font themes, for
-historical reasons some changes can only be made using class
-options or by loading special packages. These options are explained in
-the following. Possibly, these options will be replaced by themes in
-the future.
-
+While most font decisions can be made using font themes, for historical reasons some changes can only be made using class options or by loading special packages. These options are explained in the following. Possibly, these options will be replaced by themes in the future.
 
 \subsubsection{Choosing a Font Size for Normal Text}
 
-As pointed out in Section~\ref{section-sizes}, measuring the default
-font size in points is not really a good idea for
-presentations. Nevertheless, \beamer\ does just that, setting the
-default font size to 11pt as usual. This may seem ridiculously small, but 
-the actual size of each frame is just 128mm times 96mm and the viewer
-application enlarges the font. By specifying a default font size
-smaller than 11pt you can put more onto each slide, by specifying a
-larger font size you can fit on less.
+As pointed out in Section~\ref{section-sizes}, measuring the default font size in points is not really a good idea for presentations. Nevertheless, \beamer\ does just that, setting the default font size to 11pt as usual. This may seem ridiculously small, but the actual size of each frame size is by default just 128mm by 96mm and the viewer application enlarges the font. By specifying a default font size smaller than 11pt you can put more onto each slide, by specifying a larger font size you can fit on less.
 
 To specify the font size, you can use the following class options:
 
 \begin{classoption}{8pt}
-  This is way too small. Requires that the package |extsize|
-  is installed.
+  This is way too small. Requires that the package |extsize| is installed.
 \end{classoption}
 
 \begin{classoption}{9pt}
-  This is also too small. Requires that the package |extsize|
-  is installed.
+  This is also too small. Requires that the package |extsize| is installed.
 \end{classoption}
 
 \begin{classoption}{10pt}
-  If you really need to fit much onto each frame, use this
-  option. Works without |extsize|.
+  If you really need to fit more onto each frame, use this option. Works without |extsize|.
 \end{classoption}
 
 \begin{classoption}{smaller}
-  Same as the |10pt| option.
-\end{classoption}
+  Same as the |10pt| option. \end{classoption}
 
 \begin{classoption}{11pt}
   The default font size. You need not specify this option.
 \end{classoption}
 
 \begin{classoption}{12pt}
-  Makes all fonts a little bigger, which makes the text more
-  readable. The downside is that less fits onto each frame.
+  Makes all fonts a little bigger, which makes the text more readable. The downside is that less fits onto each frame.
 \end{classoption}
 
 \begin{classoption}{bigger}
@@ -250,83 +127,45 @@ To specify the font size, you can use the following class options:
 \end{classoption}
 
 \begin{classoption}{17pt}
-  This is about the default size of PowerPoint. Requires |extsize| to
-  be installed. 
+  This is about the default size of PowerPoint and OpenOffice.org Impress. Requires |extsize| to be installed.
 \end{classoption}
 
 \begin{classoption}{20pt}
   This is really huge. Requires |extsize| to be installed.
 \end{classoption}
 
-
-
 \subsubsection{Choosing a Font Family}
 
 \label{section-substition}
 
-By default, \beamer\ uses the Computer Modern fonts. To change this,
-you can use one of the prepared packages of \LaTeX's font
-mechanism. For example, to change to Times/Helvetica, simply add 
+By default, \beamer\ uses the Computer Modern fonts. To change this, you can use one of the prepared packages of \LaTeX's font mechanism. For example, to change to Times/Helvetica, simply add
 \begin{verbatim}
 \usepackage{mathptmx}
 \usepackage{helvet}
 \end{verbatim}
-in your preamble. Note that if you do not use the |serif| font theme,
-Helvetica (not Times) will be selected as the text font.
-
-There may be many other fonts available on your
-installation. Typically, at least some of the following packages
-should be available: |avant|, |bookman|, |chancery|, |charter|,
-|euler|, |helvet|, |mathtime|, |mathptm|, |mathptmx|, |newcent|,
-|palatino|, |pifont|, |utopia|.
+in your preamble. Note that if you do not use the |serif| font theme, Helvetica (not Times) will be selected as the text font.
 
+There may be many other fonts available on your installation. Typically, at least some of the following packages should be available: |arev|, |avant|, |bookman|, |chancery|, |charter|, |euler|, |helvet|, |lmodern|, |mathtime|, |mathptm|, |mathptmx|, |newcent|, |palatino|, |pifont|, |utopia|.
 
 \subsubsection{Choosing a Font Encodings}
 \label{section-font-encoding}
 
-The same font can come in different encodings, which are (very roughly
-spoken) the ways the characters of a text are mapped to glyphs (the
-actual shape of a particular character in a particular font at a
-particular size). In \TeX\ two encodings are often used with Latin
-characters: the T1~encoding and the OT1~encoding (old T1~encoding).
-
-Conceptually, the newer T1~encoding is preferable over the old
-OT1~encoding. For example, hyphenation of words containing umlauts
-(like the famous German word Fr\"aulein) will work only if you use the
-T1~encoding. Unfortunately, the EC fonts, that is, the T1-encoded
-Computer Modern fonts, are distributed on small installations just as
-MetaFont sources and only have bitmap renditions of each glyph. For
-this reason, using the T1-encoded EC fonts on such small installations
-will produce \pdf\ files that render poorly.
-
-MiK\TeX\ (for Windows platforms) and \texttt{teTeX} for
-\textsc{unix}\slash Linux can be installed with different levels of 
-completeness. Concerning the Computer Modern fonts, the following
-packages can be installed: |cm-super| fonts, |lmodern| (Latin Modern)
-fonts, and |lgc| fonts, the latter containing the Latin, Greek, and
-Cyrillic alphabets. Concerning other fonts,  the |txfonts| and
-|pxfonts| are two extended sets of the Times and the Palatino
-PostScript fonts, both packages containing extended sets of
-mathematical glyphs. Most other standard PostScript fonts are also
-available in T1~encoding.
-
-Among the packages that make available the Computer Modern fonts in the
-T1~encoding, the package |lmodern| may be suggested. If you use
-|lmodern|, several extra fonts become available (like a sans-serif
-boldface math) and extra symbols (like proper guillemots).
-
-To select the T1 encoding, use \verb|\usepackage[T1]{fontenc}|. Thus, if you
-have the LM~fonts installed, you could write
+The same font can come in different encodings, which are (very roughly spoken) the ways the characters of a text are mapped to glyphs (the actual shape of a particular character in a particular font at a particular size). In \TeX\ two encodings are often used with Latin characters: the T1~encoding and the OT1~encoding (old T1~encoding).
+
+Conceptually, the newer T1~encoding is preferable over the old OT1~encoding. For example, hyphenation of words containing umlauts (like the famous German word Fr\"aulein) will work only if you use the T1~encoding. Unfortunately, the EC fonts, that is, the T1-encoded Computer Modern fonts, are distributed on small installations just as MetaFont sources and only have bitmap renditions of each glyph. For this reason, using the T1-encoded EC fonts on such small installations will produce \pdf\ files that render poorly.
+
+\TeX\ Live (cross-platform; replaced older \texttt{teTeX} for \textsc{unix}\slash Linux) and MiK\TeX\ (for Windows platforms) can be installed with different levels of completeness. Concerning the Computer Modern fonts, the following packages can be installed: |cm-super| fonts, |lmodern| (Latin Modern) fonts, and |lgc| fonts, the latter containing the Latin, Greek, and Cyrillic alphabets. Concerning other fonts, the |txfonts| and |pxfonts| are two extended sets of the Times and the Palatino PostScript fonts, both packages containing extended sets of mathematical glyphs. Most other standard PostScript fonts are also available in T1~encoding.
+
+Among the packages that make available the Computer Modern fonts in the T1~encoding, the package |lmodern| may be suggested. If you use |lmodern|, several extra fonts become available (like a sans-serif boldface math) and extra symbols (like proper guillemots).
+
+To select the T1 encoding, use \verb|\usepackage[T1]{fontenc}|. Thus, if you have the LM~fonts installed, you could write
 \begin{verbatim}
-\usepackage{lmodern}
 \usepackage[T1]{fontenc}
+\usepackage{lmodern}
 \end{verbatim}
-to get beautiful outline fonts and correct hyphenation. Note, however, that
-certain older versions of the LM~bundle did not include correct glyphs
-for ligatures like ``fi,'' which may cause trouble. Double check
-that all ligatures are displayed correctly and, if not, update.
-
+to get beautiful outline fonts and correct hyphenation. Note, however, that certain older versions of the LM~bundle did not include correct glyphs for ligatures like ``fi,'' which may cause trouble. Double check that all ligatures are displayed correctly and, if not, update your installation.
 
+Everything mentioned above applies to |pdflatex| and |latex|+|dvips|. Unlike those engines, |xelatex| and |lualatex| support OpenType fonts, and that means that you can use system fonts in your documents relatively easy. Details will eventually be documented in this manual, but, for now, you can take a look at the documentation for |fontspec| package which supports both engines. Also, note that when you use |lualatex| or |xelatex| with EU2 or EU1 encoding, respectively, by default you get OpenType Latin Modern fonts.
 
 
 \subsection{Changing the Fonts Used for Different Elements of a Presentation}
@@ -335,62 +174,26 @@ This section explains how \beamer's font management works.
 
 \subsubsection{Overview of Beamer's Font Management}
 
-\beamer's font mechanism is somewhat similar to \beamer's color
-mechanism, but not quite the same. As for colors, every \beamer\
-element, like the frame titles, the document title, the footnotes, and
-so on has a certain \beamer-font. As for colors, on the one hand you
-can specify the font of each element individually; on the other hand
-fonts also use inheritance, thereby making it easy to globally change
-the fonts used for, say, ``titlelike things'' or for ``itemizelike
-things.''
+\beamer's font mechanism is somewhat similar to \beamer's color mechanism, but not quite the same. As for colors, every \beamer\ element, like the frame titles, the document title, the footnotes, and so on has a certain \beamer-font. As for colors, on the one hand you can specify the font of each element individually; on the other hand fonts also use inheritance, thereby making it easy to globally change the fonts used for, say, ``titlelike things'' or for ``itemizelike things.''
 
-While a \beamer-color has a certain foreground and a certain
-background, either of which may be empty, a \beamer-font has a size, a
-shape, a series, and a family, each of which may be empty. The
-inheritance relation among \beamer-fonts is not necessarily the same
-as between \beamer-colors, though I have tried to match them whenever
-possible. 
+While a \beamer-color has a certain foreground and a certain background, either of which may be empty, a \beamer-font has a size, a shape, a series, and a family, each of which may be empty. The inheritance relation among \beamer-fonts is not necessarily the same as between \beamer-colors, though we have tried to match them whenever possible.
 
-Multiple inheritance plays a more important rule for
-fonts than it does for colors. A font might inherit the attributes of
-two different fonts. If one of them specifies that the font should be,
-say, boldface and the other specifies that the font should be, say,
-large, then the child font will be both large and bold. 
+Multiple inheritance plays a more important rule for fonts than it does for colors. A font might inherit the attributes of two different fonts. If one of them specifies that the font should be, say, boldface and the other specifies that the font should be, say, large, then the child font will be both large and bold.
 
-As for fonts, the description of the font used for an element is given
-after the description of the element. 
+As for fonts, the description of the font used for an element is given after the description of the element.
 
 
 \subsubsection{Using Beamer's Fonts}
 
-To use a \beamer-font, you can use the command
-|\usebeamerfont|. Inside the templates for elements, this command will
-(typically) have already been called for you, so you will only
-seldomly have to use this command. 
+To use a \beamer-font, you can use the command |\usebeamerfont|. Inside the templates for elements, this command will (typically) have already been called for you, so you will only seldomly have to use this command.
 
 \begin{command}{\usebeamerfont\opt{|*|}\marg{beamer-font name}}
-  This command changes the current font to the font specified by the
-  \meta{beamer-font name}. The \meta{beamer-font name} can be a
-  not-too-fancyful text and may contain spaces. Typical examples are
-  |frametitle| or |section in toc| or |My Font 1|. \beamer-fonts can
-  have (and should) have the same name as \beamer-templates and
-  \beamer-colors.
+  This command changes the current font to the font specified by the \meta{beamer-font name}. The \meta{beamer-font name} can be a not-too-fancyful text and may contain spaces. Typical examples are |frametitle| or |section in toc| or |My Font 1|. \beamer-fonts can have (and should) have the same name as \beamer-templates and \beamer-colors.
 
   \example |\usebeamerfont{frametitle}|
+  In the unstarred version of this command, the font is changed according to the attributes specified in the \meta{beamer-font name}, but unspecified attributes remain unchanged. For example, if the font specifies that the font should be ``bold,'' but specifies nothing else, and if the current font is large, then |\usebeamerfont| causes the current font to become large and bold.
 
-  In the unstarred version of this command, the font is changed
-  according to the attributes specified in the \meta{beamer-font
-  name}, but unspecified attributes remain unchanged. For example, if
-  the font specifies that the font should be ``bold,'' but specifies
-  nothing else, and if the current font is large, then
-  |\usebeamerfont| causes the the current font to become large and
-  bold.
-
-  In the starred version of this command, the font is first reset
-  before the font's attributes are applied. Thus, in the above example
-  of a \beamer-font having only the attribute ``boldface'' set, saying
-  |\usebeamerfont*| will \emph{always} cause the current font to
-  become a normal-size, normal-shape, bold, default-family font.
+  In the starred version of this command, the font is first reset before the font's attributes are applied. Thus, in the above example of a \beamer-font having only the attribute ``boldface'' set, saying |\usebeamerfont*| will \emph{always} cause the current font to become a normal-size, normal-shape, bold, default-family font.
 \end{command}
 
 
@@ -399,13 +202,8 @@ seldomly have to use this command.
 As for \beamer-colors, there exists a central command for setting and
 changing \beamer-fonts.
 
-\begin{command}{\setbeamerfont\opt{|*|}\marg{beamer-font
-      name}\marg{attributes}}
-  This command sets or resets certain attributes of the \beamer-font
-  \meta{beamer-font name}. In the unstarred version, this command just
-  adds those attributes that have not been mentioned in a previous
-  call and overwrites those that have been mentioned. Thus, the
-  following two command blocks have the same effect:
+\begin{command}{\setbeamerfont\opt{|*|}\marg{beamer-font name}\marg{attributes}}
+  This command sets or resets certain attributes of the \beamer-font \meta{beamer-font name}. In the unstarred version, this command just adds those attributes that have not been mentioned in a previous call and overwrites those that have been mentioned. Thus, the following two command blocks have the same effect:
 
   \example
 \begin{verbatim}
@@ -415,65 +213,21 @@ changing \beamer-fonts.
 \setbeamerfont{frametitle}{size=\large,series=\bfseries}
 \end{verbatim}
 
-  In the starred version, the font attributes are first completely
-  reset, that is, set to be empty.
+  In the starred version, the font attributes are first completely reset, that is, set to be empty.
 
   The following \meta{attributes} may be given:
   \begin{itemize}
-  \item \declare{|size=|\meta{size command}} sets the size
-    attribute of the \beamer font. The \meta{size command} should be a
-    normal \LaTeX-command used for setting the font size or it should
-    be empty. Useful commands include |\tiny|, |\scriptsize|,
-    |\footnotesize|, |\small|, |\normalsize|, |\large|, |\Large|,
-    |\huge|, and |\Huge|. \beamer\ also introduces the two font sizes
-    |\Tiny| and |\TINY| for \emph{really} small text. But you should
-    know \emph{exactly} what you are doing if you use them. You have
-    been warned.
-
-    Note that there is a different between
-    specifying and empty command and specifying |\normalsize|: Making
-    the size attribute ``empty'' means that the font size should not
-    be changed when this font is used, while specifying |\normalsize|
-    means that the size should be set to the normal size whenever this
-    font is used.
-  \item \declare{|size*=|\marg{size in pt}\marg{baselineskip}} sets
-    the size attribute of   the font to the given \meta{size in pt}
-    and the baseline skip to the given value. Note that, depending on
-    what  kind of font you use, not  all font sizes may be
-    available. Also,  certain font sizes are much less desirable than
-    other ones; the standard commands take care of choosing
-    appropriate sizes for you. Do not use this options unless you have
-    a good reason. This command has the same effect as
-    |size={\fontsize|\marg{size in pt}\marg{baselineskip}|}|.  
-  \item \declare{|shape=|\meta{shape command}} sets the shape
-    attribute of the font. The command should be command like
-    |\itshape|, |\slshape|, |\scshape|, or |\upshape|.
-  \item \declare{|shape*=|\marg{shape attribute abbreviation}} sets
-    the shape attribute of the font using the \LaTeX's abbreviations
-    for attributes. This command has the same effect as
-    |shape={\fontshape|\marg{shape attributes abbreviation}|}|.  
-  \item \declare{|series=|\meta{series command}} sets the ``series''
-    attribute of the font. The command should be command like
-    |\bfseries|.
-  \item \declare{|series*=|\marg{series attribute abbreviation}} has
-    the same effect as |series={\fontseries|\marg{series attributes
-        abbreviation}|}|.
-  \item \declare{|family=|\meta{family command}} sets the font family
-    attribute. The command should be a \LaTeX-font command like
-    |\rmfamily| or |\sffamily|. 
-  \item \declare{|family*=|\marg{family name}} sets the font family
-    attribute to the given \meta{family name}. The command has the
-    same effect as |family={\fontfamily|\marg{family name}|}|. The
-    \meta{family name} is, normally, a somewhat cryptic abbreviation
-    of a font family name that installed somewhere on the system. For
-    example, the \meta{family name} for Times happens to be
-    |ptm|. No one can remember these names, so its perfectly normal if
-    you have to look them up laboriously.
-  \item \declare{|parent=|\marg{parent list}} specifies a list of
-    parent fonts. When the \beamer-font is used, the parents are used
-    first. Thus, any font attributes set by one of the parents is
-    inherited by the \beamer-font, except if this attribute is
-    overwritten by the font.
+  \item \declare{|size=|\meta{size command}} sets the size attribute of the \beamer\ font. The \meta{size command} should be a normal \LaTeX-command used for setting the font size or it should be empty. Useful commands include |\tiny|, |\scriptsize|, |\footnotesize|, |\small|, |\normalsize|, |\large|, |\Large|, |\huge|, and |\Huge|. \beamer\ also introduces the two font sizes |\Tiny| and |\TINY| for \emph{really} small text. But you should know \emph{exactly} what you are doing if you use them. You have been warned.
+
+    Note that there is a different between specifying an empty command and specifying |\normalsize|: Making the size attribute ``empty'' means that the font size should not be changed when this font is used, while specifying |\normalsize| means that the size should be set to the normal size whenever this font is used.
+  \item \declare{|size*=|\marg{size in pt}\marg{baselineskip}} sets the size attribute of the font to the given \meta{size in pt} and the baseline skip to the given value. Note that, depending on what kind of font you use, not all font sizes may be available. Also, certain font sizes are much less desirable than other ones; the standard commands take care of choosing appropriate sizes for you. Do not use this option unless you have a good reason. This command has the same effect as |size={\fontsize|\marg{size in pt}\marg{baselineskip}|}|.
+  \item \declare{|shape=|\meta{shape command}} sets the shape attribute of the font. The command should be a command like |\itshape|, |\slshape|, |\scshape|, or |\upshape|.
+  \item \declare{|shape*=|\marg{shape attribute abbreviation}} sets the shape attribute of the font using the \LaTeX's abbreviations for attributes. This command has the same effect as |shape={\fontshape|\marg{shape attributes abbreviation}|}|.
+  \item \declare{|series=|\meta{series command}} sets the ``series'' attribute of the font. The command should be a command like |\bfseries|.
+  \item \declare{|series*=|\marg{series attribute abbreviation}} has the same effect as |series={\fontseries|\marg{series attributes abbreviation}|}|.
+  \item \declare{|family=|\meta{family command}} sets the font family attribute. The command should be a \LaTeX-font command like |\rmfamily| or |\sffamily|.
+  \item \declare{|family*=|\marg{family name}} sets the font family attribute to the given \meta{family name}. The command has the same effect as |family={\fontfamily|\marg{family name}|}|. The \meta{family name} is, normally, a somewhat cryptic abbreviation of a font family name that installed somewhere on the system. For example, the \meta{family name} for Times happens to be |ptm|. No one can remember these names, so it's perfectly normal if you have to look them up laboriously.
+  \item \declare{|parent=|\marg{parent list}} specifies a list of parent fonts. When the \beamer-font is used, the parents are used first. Thus, any font attributes set by one of the parents is inherited by the \beamer-font, except if this attribute is overwritten by the font.
   \end{itemize}
 
   \example
@@ -496,11 +250,3 @@ This text is only bold, but not large.
 This text is small and bold.
 \end{verbatim}
 \end{command}
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
index 7575287dca7..1e1dfe2f440 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-frames.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,48 +8,23 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-frames.tex,v 1.30 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Creating Frames}
-
 \label{section-frames}
 
+
 \subsection{The Frame Environment}
 
-A presentation consists of a series of frames. Each frame consists of
-a series of slides. You create a frame using the command
-|\frame| or the environment |frame|, which do the same. The command
-takes one parameter, namely the contents of the frame. All of the
-text that is not tagged by overlay specifications is shown on all
-slides of the frame. (Overlay specifications are explained
-in more detail in later sections. For the moment, let's just say
-that an overlay specification is a list of numbers or number ranges in
-pointed brackets that is put after certain commands as in
-|\uncover<1,2>{Text}|.) If a frame contains commands that have an
-overlay specification, the frame will contain multiple slides;
-otherwise it contains only one slide.
-
-\begin{environment}{{frame}\sarg{overlay specification}%
-    \opt{|[<|\meta{default overlay specification}|>]|}\oarg{options}\opt{\marg{title}\marg{subtitle}}}
-  The \meta{overlay specification} dictates which slides of a frame are
-  to be shown. If left out, the number is calculated automatically.
-  The \meta{environment contents} can be normal \LaTeX\ text, but may not contain
-  |\verb| commands or |verbatim| environments or any environment that
-  changes the character codes, unless the |fragile| options
-  is given.
-
-  The optional \meta{title} is detected by an opening brace, that is,
-  if the first thing in the frame is an opening brace then it is
-  assumed that a frame title follows. Likewise, the optional
-  \meta{subtitle} is detected the same way, that is, by an opening
-  brace following the \meta{title}. The title and subtitle can also be
-  given using the |\frametitle| and |\framesubtitle| commands.
- 
-  The normal \LaTeX\ command |\frame| is available \emph{inside}
-  frames with its usual meaning. Both outside and inside frames it is
-  always available as {\color{red!75!black}|\framelatex|}. 
- 
+A presentation consists of a series of frames. Each frame consists of a series of slides. You create a frame using the command |\frame| or the environment |frame|, which do the same. The command takes one parameter, namely the contents of the frame. All of the text that is not tagged by overlay specifications is shown on all slides of the frame. (Overlay specifications are explained in more detail in later sections. For the moment, let's just say that an overlay specification is a list of numbers or number ranges in pointed brackets that is put after certain commands as in |\uncover<1,2>{Text}|.) If a frame contains commands that have an overlay specification, the frame will contain multiple slides; otherwise it contains only one slide.
+
+\begin{environment}{{frame}\sarg{overlay specification}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{options}\opt{\marg{title}\marg{subtitle}}}
+  The \meta{overlay specification} dictates which slides of a frame are to be shown. If left out, the number is calculated automatically. The \meta{environment contents} can be normal \LaTeX\ text, but may not contain |\verb| commands or |verbatim| environments or any environment that changes the character codes, unless the |fragile| option is given.
+
+  The optional \meta{title} is detected by an opening brace, that is, if the first thing in the frame is an opening brace then it is assumed that a frame title follows. Likewise, the optional \meta{subtitle} is detected the same way, that is, by an opening brace following the \meta{title}. The title and subtitle can also be given using the |\frametitle| and |\framesubtitle| commands.
+
+  The normal \LaTeX\ command |\frame| is available \emph{inside} frames with its usual meaning. Both outside and inside frames it is always available as {\color{red!75!black}|\framelatex|}.
+
   \example
 \begin{verbatim}
 \begin{frame}{A title}
@@ -60,7 +36,7 @@ otherwise it contains only one slide.
   Some content.
 \end{frame}
 \end{verbatim}
-  
+
   \example
 \begin{verbatim}
 \begin{frame}<beamer>{Outline}  % frame is only shown in beamer mode
@@ -68,39 +44,15 @@ otherwise it contains only one slide.
 \end{frame}
 \end{verbatim}
 
-  Normally, the complete \meta{environment contents} is put on a slide. If
-  the text does not fit on a slide, being too high, it will be
-  squeezed as much as possible, a warning will be issued, and the text
-  just extends unpleasantly over the bottom. You can use the option
-  |allowframebreaks| to cause the \meta{frame text} to be split among several
-  slides, though you cannot use overlays then. See the explanation of
-  the |allowframebreaks| option for details. 
-  
-  The \meta{default overlay specification} is an optional argument
-  that is ``detected'' according to the following rule: If the first
-  optional argument in square brackets starts with a |<|, then this
-  argument is a \meta{default overlay specification}, otherwise it is
-  a normal \meta{options} argument. Thus |\begin{frame}[<+->][plain]| would
-  be legal, but also |\begin{frame}[plain]|.
-
-  The effect of the \meta{default overlay specification} is the
-  following: Every command or environment \emph{inside the frame} that
-  accepts an action specification, see
-  Section~\ref{section-action-specifications}, (this includes the
-  |\item| command, the |actionenv| environment, |\action|, and all
-  block environments) and that is not followed by 
-  an overlay specification gets the \meta{default overlay
-    specification} as its specification. By providing an incremental
-  specification like |<+->|, see Section~\ref{section-incremental},
-  this will essentially cause all blocks and all enumerations to be
-  uncovered piece-wise (blocks internally employ action
-  specifications).
-  
-  \example In this frame, the theorem is shown from the first slide
-  on, the proof from the second slide on, with the first two itemize
-  points shown one after the other; the last itemize point is shown
-  together with the first one. In total, this frame will contain four
-  slides.
+  Normally, the complete \meta{environment contents} is put on a slide. If the text does not fit on a slide, being too high, it will be squeezed as much as possible, a warning will be issued, and the text just extends unpleasantly over the bottom. You can use the option |allowframebreaks| to cause the \meta{frame text} to be split among several slides, though you cannot use overlays then. See the explanation of the |allowframebreaks| option for details.
+
+  The \meta{default overlay specification} is an optional argument that is ``detected'' according to the following rule: If the first optional argument in square brackets starts with a |<|, then this argument is a \meta{default overlay specification}, otherwise it is a normal \meta{options} argument. Thus |\begin{frame}[<+->][plain]| would be legal, but also |\begin{frame}[plain]|.
+
+  The effect of the \meta{default overlay specification} is the following: Every command or environment \emph{inside the frame} that accepts an action specification, see Section~\ref{section-action-specifications}, (this includes the |\item| command, the |actionenv| environment, |\action|, and all block environments) and that is not followed by an overlay specification gets the \meta{default overlay specification} as its specification. By providing an incremental specification like |<+->|, see Section~\ref{section-incremental}, this will essentially cause all blocks and all enumerations to be uncovered piece-wise (blocks internally employ action specifications).
+
+  \example
+  In this frame, the theorem is shown from the first slide on, the proof from the second slide on, with the first two itemize points shown one after the other; the last itemize point is shown together with the first one. In total, this frame will contain four slides.
+
 \begin{verbatim}
 \begin{frame}[<+->]
   \begin{theorem}
@@ -115,101 +67,51 @@ otherwise it contains only one slide.
   \end{proof}
 \end{frame}
 \end{verbatim}
- 
+
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|allowdisplaybreaks|}\opt{|=|\meta{break
-    desirability}} causes the AMS\TeX\ command
-    |\allowdisplaybreaks|\penalty0|[|\meta{break desirability}|]| to be issued
-    for the current frame. The \meta{break desirability} can be a
-    value between 0 (meaning formulas may never be broken) and 4 (the
-    default, meaning that formulas can be broken anywhere without any
-    penalty). The option is just a convenience and makes sense only
-    together with the |allowsframebreaks| option.  
+    \declare{|allowdisplaybreaks|}\opt{|=|\meta{break desirability}} causes the AMS\TeX\ command |\allowdisplaybreaks|\penalty0|[|\meta{break desirability}|]| to be issued for the current frame. The \meta{break desirability} can be a value between 0 (meaning formulas may never be broken) and 4 (the default, meaning that formulas can be broken anywhere without any penalty). The option is just a convenience and makes sense only together with the |allowsframebreaks| option.
   \item
-    \declare{|allowframebreaks|}\opt{|=|\meta{fraction}}. When this option is
-    given, the frame will be automatically broken up into several
-    frames if the text does not fit on a single slide. In detail, when this
-    option is given, the following things happen:
+    \declare{|allowframebreaks|}\opt{|=|\meta{fraction}}. When this option is given, the frame will be automatically broken up into several frames if the text does not fit on a single slide. In detail, when this option is given, the following things happen:
     \begin{enumerate}
     \item
       Overlays are not supported.
     \item
-      Any notes for the frame created using the |\note| command will
-      be inserted after the first page of the frame.
+      Any notes for the frame created using the |\note| command will be inserted after the first page of the frame.
     \item
-      Any footnotes for the frame will be inserted on the last page of
-      the frame.
+      Any footnotes for the frame will be inserted on the last page of the frame.
     \item
-      If there is a frame title, each of the pages will have this
-      frame title, with a special note added indicating which page of
-      the frame that page is. By default, this special note is a
-      Roman number. However, this can be changed using the following
-      template.
+      If there is a frame title, each of the pages will have this frame title, with a special note added indicating which page of the frame that page is. By default, this special note is a Roman number. However, this can be changed using the following template.
       \begin{element}{frametitle continuation}\yes\yes\yes
-        The text of this template is inserted at the end of every
-        title of a frame with the |allowframebreaks| option set.
+        The text of this template is inserted at the end of every title of a frame with the |allowframebreaks| option set.
         \begin{templateoptions}
           \itemoption{default}{}
-          Installs a Roman number as the template. The number
-          indicates the current page of the frame.
-          
+          Installs a Roman number as the template. The number indicates the current page of the frame.
+
           \itemoption{roman}{}
           Alias for the default.
-          
+
           \itemoption{from second}{\oarg{text}}
-          Installs a template that inserts \meta{text} from the second
-          page of a frame on. By default, the text inserted is
-          |\insertcontinuationtext|,  which  in turn is |(cont.)| by
-          default. 
+          Installs a template that inserts \meta{text} from the second page of a frame on. By default, the text inserted is |\insertcontinuationtext|,  which  in turn is |(cont.)| by default.
         \end{templateoptions}
         The following inserts are available:
         \begin{templateinserts}
           \iteminsert{\insertcontinuationcount}
           inserts the current page of the frame as an arabic number.
           \iteminsert{\insertcontinuationcountroman}
-          inserts the current page of the frame as an (uppercase)
-          Roman number.
+          inserts the current page of the frame as an (uppercase) Roman number.
           \iteminsert{\insertcontinuationtext}
-          just inserts the text |(cont.)| or, possibly, a translation
-          thereof (like |(Forts.)| in German). 
+          just inserts the text |(cont.)| or, possibly, a translation thereof (like |(Forts.)| in German).
         \end{templateinserts}
       \end{element}
     \end{enumerate}
-    If a frame needs to be broken into several pages, the material on
-    all but the last page fills only 95\% of each page by
-    default. Thus, there will be some space left at the top and/or
-    bottom, depending on the vertical placement option for the
-    frame. This yields a better visual result than a 100\% filling,
-    which typically looks crowded. However, you can change this
-    percentage using the optional argument \meta{fraction}, where 1
-    means 100\% and 0.5 means 50\%. This percentage includes
-    the frame title. Thus, in order to split a frame ``roughly in
-    half,'' you should give 0.6 as \meta{fraction}.
-
-    Most of the fine details of normal \TeX\ page breaking also apply
-    to this option. For example, when you wish equations to be broken
-    automatically, be sure to use the |\allowdisplaybreaks|
-    command. You can insert |\break|, |\nobreak|, and |\penalty|
-    commands to control where breaks should occur. The commands 
-    |\pagebreak| and |\nopagebreak| also work, including their
-    options. Since you typically do not want page breaks for the frame
-    to apply also to the |article| mode, you can add a mode
-    specification like |<presentation>| to make these commands apply
-    only to the presentation modes. The command
-    \declare{|\string\framebreak|} is a shorthand for
-    |\pagebreak<presentation>| and \declare{|\string\noframebreak|} is
-    a shorthand for |\nopagebreak<presentation>|.
-
-    The use of this  option \emph{evil}. In a (good) presentation you
-    prepare each slide carefully and think twice before putting something
-    on a certain slide rather than on some different slide. Using the
-    |allowframebreaks| option invites the creation of horrible, endless
-    presentations that resemble more a ``paper projected on the wall''
-    than a presentation. Nevertheless, the option does have its
-    uses. Most noticeably, it can be convenient for automatically
-    splitting bibliographies or long equations.
+
+    If a frame needs to be broken into several pages, the material on all but the last page fills only 95\% of each page by default. Thus, there will be some space left at the top and/or bottom, depending on the vertical placement option for the frame. This yields a better visual result than a 100\% filling, which typically looks crowded. However, you can change this percentage using the optional argument \meta{fraction}, where 1 means 100\% and 0.5 means 50\%. This percentage includes the frame title. Thus, in order to split a frame ``roughly in half,'' you should give 0.6 as \meta{fraction}.
+
+    Most of the fine details of normal \TeX\ page breaking also apply to this option. For example, when you wish equations to be broken automatically, be sure to use the |\allowdisplaybreaks| command. You can insert |\break|, |\nobreak|, and |\penalty| commands to control where breaks should occur. The commands |\pagebreak| and |\nopagebreak| also work, including their options. Since you typically do not want page breaks for the frame to apply also to the |article| mode, you can add a mode specification like |<presentation>| to make these commands apply only to the presentation modes. The command \declare{|\string\framebreak|} is a shorthand for |\pagebreak<presentation>| and \declare{|\string\noframebreak|} is a shorthand for |\nopagebreak<presentation>|.
+
+    The use of this option \emph{evil}. In a (good) presentation you prepare each slide carefully and think twice before putting something on a certain slide rather than on some different slide. Using the |allowframebreaks| option invites the creation of horrible, endless presentations that resemble more a ``paper projected on the wall'' than a presentation. Nevertheless, the option does have its uses. Most noticeably, it can be convenient for automatically splitting bibliographies or long equations.
 
     \example
 \begin{verbatim}
@@ -223,6 +125,7 @@ otherwise it contains only one slide.
   \end{thebibliography}
 \end{frame}
 \end{verbatim}
+
     \example
 \begin{verbatim}
 \begin{frame}[allowframebreaks,allowdisplaybreaks]{A Long Equation}
@@ -234,55 +137,21 @@ otherwise it contains only one slide.
   \end{align}
 \end{frame}
 \end{verbatim}
+
   \item
-    \declare{|b|}, \declare{|c|}, \declare{|t|} will cause the frame
-    to be vertically aligned at the bottom/center/top. This overrides
-    the global placement policy, which is governed by the class
-    options |t| and |c|.
+    \declare{|b|}, \declare{|c|}, \declare{|t|} will cause the frame to be vertically aligned at the bottom/center/top. This overrides the global placement policy, which is governed by the class options |t| and |c|.
   \item
-    \declare{|fragile|\opt{|=singleslide|}} tells \beamer\
-    that the frame contents is ``fragile.'' This means that the frame
-    contains text that is not ``interpreted as usual.'' For example,
-    this applies to verbatim text, which is, obviously, interpreted
-    somewhat differently from normal text.
-
-    If a frame contains fragile text, different internal mechanisms
-    are used to typeset the frame to ensure that inside the frame the
-    character codes can be reset. The price of switching to another
-    internal mechanism is that either you cannot use overlays or an
-    external file needs to be written and read back (which is not
-    always desirable).
-
-    In detail, the following happens when this option is given for
-    normal (pdf)\LaTeX: The contents of the frame is scanned and then
-    written to a  special file named \meta{jobname}|.vrb| or, if a
-    label has been assigned to the frame,
-    \meta{jobname}|.|\meta{current frame number}|.vrb|. Then, the
-    frame is started anew and the content of this file is read
-    back. Since, upon reading of a file, the character codes can be
-    modified, this allows you to use both verbatim text and overlays.
-
-    To determine the end of the frame, the following rule is used: The
-    first occurence of a single line containing exactly
-    |\end{|\meta{frame environment name}|}| ends the frame. The
-    \meta{environment name} normally |frame|, but it can be changed
-    using the |environment| option. This special  rule is needed since
-    the frame contents is, after all, not interpreted when it is
-    gathered. 
-
-    You can also add the optional information |=singleslide|. This
-    tells \beamer\ that the frame contains only a single slide. In
-    this case, the frame contents is \emph{not} written to a special
-    file, but interpreted directly, which is ``faster and cleaner.''
+    \declare{|fragile|\opt{|=singleslide|}} tells \beamer\ that the frame contents is ``fragile.'' This means that the frame contains text that is not ``interpreted as usual.'' For example, this applies to verbatim text, which is, obviously, interpreted somewhat differently from normal text.
+
+    If a frame contains fragile text, different internal mechanisms are used to typeset the frame to ensure that inside the frame the character codes can be reset. The price of switching to another internal mechanism is that either you cannot use overlays or an external file needs to be written and read back (which is not always desirable).
+
+    In detail, the following happens when this option is given for normal (pdf)\LaTeX: The contents of the frame is scanned and then written to a special file named \meta{jobname}|.vrb| or, if a label has been assigned to the frame, \meta{jobname}|.|\meta{current frame number}|.vrb|. Then, the frame is started anew and the content of this file is read back. Since, upon reading of a file, the character codes can be modified, this allows you to use both verbatim text and overlays.
+
+    To determine the end of the frame, the following rule is used: The first occurence of a single line containing exactly |\end{|\meta{frame environment name}|}| ends the frame. The \meta{environment name} is normally |frame|, but it can be changed using the |environment| option. This special rule is needed since the frame contents is, after all, not interpreted when it is gathered.
+
+    You can also add the optional information |=singleslide|. This tells \beamer\ that the frame contains only a single slide. In this case, the frame contents is \emph{not} written to a special file, but interpreted directly, which is ``faster and cleaner.''
   \item
-    \declare{|environment=|\meta{frame environment name}}. This option
-    is useful only in conjuction with the |fragile| option (but it
-    is not used for |fragile=singleslide|, only for the plain
-    |fragile|). The \meta{frame environment name} is used to determine
-    the end of the scanning when gathering the frame
-    contents. Normally, the frame ends when  a line reading
-    |\end{frame}| is reached. However, if you use |\begin{frame}|
-    inside another environment, you need to use this option:
+    \declare{|environment=|\meta{frame environment name}}. This option is useful only in conjuction with the |fragile| option (but it is not used for |fragile=singleslide|, only for the plain |fragile|). The \meta{frame environment name} is used to determine the end of the scanning when gathering the frame contents. Normally, the frame ends when a line reading |\end{frame}| is reached. However, if you use |\begin{frame}| inside another environment, you need to use this option:
 
     \example
 \begin{verbatim}
@@ -295,27 +164,18 @@ otherwise it contains only one slide.
   Text.
 \end{slide}
 \end{verbatim}
-    If you did not specify the option |environment=slide| in the above
-    example, \TeX\ would ``miss'' the end of the slide since it does
-    not interpret text while gathering the frame contents.
+
+    If you did not specify the option |environment=slide| in the above example, \TeX\ would ``miss'' the end of the slide since it does not interpret text while gathering the frame contents.
   \item
-    \declare{|label=|\meta{name}} causes the frame's contents to
-    be stored under the name \meta{name} for later resumption using
-    the command |\againframe|. Furthermore, on each slide of the frame
-    a label with the name \meta{name}|<|\meta{slide number}|>| is created. On the
-    \emph{first} slide, furthermore, a label with the name \meta{name}
-    is created (so the labels \meta{name} and \meta{name}|<1>| point
-    to the same slide). Note that labels in general, and these labels
-    in particular, can be used as targets for hyperlinks.
+    \declare{|label=|\meta{name}} causes the frame's contents to be stored under the name \meta{name} for later resumption using the command |\againframe|. Furthermore, on each slide of the frame a label with the name \meta{name}|<|\meta{slide number}|>| is created. On the \emph{first} slide, furthermore, a label with the name \meta{name} is created (so the labels \meta{name} and \meta{name}|<1>| point to the same slide). Note that labels in general, and these labels in particular, can be used as targets for hyperlinks.
 
     You can use this option together with |fragile|.
   \item
-    \declare{|plain|} causes  the headlines, footlines,
-    and sidebars to be suppressed. This is useful for creating single
-    frames with different head- and footlines or for creating frames
-    showing big pictures that completely fill the frame.
+    \declare{|plain|} causes the headlines, footlines, and sidebars to be suppressed. This is useful for creating single frames with different head- and footlines or for creating frames showing big pictures that completely fill the frame.
+
+    \example
+    A frame with a picture completely filling the frame:
 
-  \example A frame with a picture completely filling the frame:  
 \begin{verbatim}
 \begin{frame}[plain]
   \begin{centering}%
@@ -324,9 +184,10 @@ otherwise it contains only one slide.
   \end{centering}%
 \end{frame}
 \end{verbatim}
-  
-  \example A title page, in which the head- and footlines are replaced
-  by two graphics.
+
+    \example
+    A title page, in which the head- and footlines are replaced by two graphics.
+
 \begin{verbatim}
 \setbeamertemplate{title page}
 {
@@ -335,7 +196,7 @@ otherwise it contains only one slide.
 
   \begin{centering}
     {\usebeamerfont{title}\usebeamercolor[fg]{title}\inserttitle}
-    
+
     \insertdate
   \end{centering}
 
@@ -346,40 +207,15 @@ otherwise it contains only one slide.
   \titlepage
 \end{frame}
 \end{verbatim}
+
   \item
-    \declare{|shrink|}\opt{|=|\meta{minimum shrink percentage}}. This
-    option will cause the text of the frame to be shrunk if it is
-    too large to fit on the frame. \beamer\ will first normally
-    typeset the whole frame. Then it has a look at vertical size of
-    the frame text (excluding the frame title). If this vertical size
-    is larger than  the text height minus the frame title height,
-    \beamer\ computes a shrink factor and scales down the frame text
-    by this factor such that the frame text then fills the frame
-    completely. Using this option will automatically cause the
-    |squeeze| option to be used, also.
-
-    Since the shrinking takes place only after everything has been
-    typeset, shrunk frame text will not fill the frame completely
-    horizontally. For this reason, you can specify a \meta{minimum
-    shrink percentage} like |20|. If this percentage is specified, the
-    frame will be shrunk \emph{at least} by this percentage. Since
-    \beamer\ knows this, it can increase the horizontal width
-    proportionally such that the shrunk text once more fills the
-    entire frame. If, however, the percentage is not enough, the text
-    will be shrunk as needed and you will be punished with a warning
-    message.
-
-    The best way to use this option is to identify frames that are
-    overly full, but in which all text absolutely has to be fit on a
-    single frame. Then start specifying first |shrink=5|, then
-    |shrink=10|, and so on, until no warning is issued any more (or
-    just ignore the warning when things look satisfactory).
-
-    Using this option is \emph{very evil}. It will
-    result in changes of the font size from slide to slide, which is a
-    typographic nightmare. Its usage can \emph{always} be avoided by
-    restructuring and simplifying frames, which will result in a
-    better presentation.
+    \declare{|shrink|}\opt{|=|\meta{minimum shrink percentage}}. This option will cause the text of the frame to be shrunk if it is too large to fit on the frame. \beamer\ will first normally typeset the whole frame. Then it has a look at vertical size of the frame text (excluding the frame title). If this vertical size is larger than the text height minus the frame title height, \beamer\ computes a shrink factor and scales down the frame text by this factor such that the frame text then fills the frame completely. Using this option will automatically cause the |squeeze| option to be used, also.
+
+    Since the shrinking takes place only after everything has been typeset, shrunk frame text will not fill the frame completely horizontally. For this reason, you can specify a \meta{minimum shrink percentage} like |20|. If this percentage is specified, the frame will be shrunk \emph{at least} by this percentage. Since \beamer\ knows this, it can increase the horizontal width proportionally such that the shrunk text once more fills the entire frame. If, however, the percentage is not enough, the text will be shrunk as needed and you will be punished with a warning message.
+
+    The best way to use this option is to identify frames that are overly full, but in which all text absolutely has to be fit on a single frame. Then start specifying first |shrink=5|, then |shrink=10|, and so on, until no warning is issued any more (or just ignore the warning when things look satisfactory).
+
+    Using this option is \emph{very evil}. It will result in changes of the font size from slide to slide, which is a typographic nightmare. Its usage can \emph{always} be avoided by restructuring and simplifying frames, which will result in a better presentation.
 
     \example
 \begin{verbatim}
@@ -387,77 +223,53 @@ otherwise it contains only one slide.
   Some evil endless slide that is 5\% too large.
 \end{frame}
 \end{verbatim}
+
   \item
-    \declare{|squeeze|} causes all vertical spaces in the text to be
-    squeezed together as much as possible. Currently, this just causes
-    the vertical space in enumerations or itemizations to be reduced
-    to zero.
+    \declare{|squeeze|} causes all vertical spaces in the text to be squeezed together as much as possible. Currently, this just causes the vertical space in enumerations or itemizations to be reduced to zero.
 
-    Using this option is not good, but also not evil.   
+    Using this option is not good, but also not evil.
   \end{itemize}
 
   \lyxnote
-  Use the style ``BeginFrame'' to start a frame and the style
-  ``EndFrame'' to end it. A frame is automatically ended by the start
-  of a new frame and by the start of a new section or section (but
-  not by the end of the document!).
+  Use the style ``BeginFrame'' to start a frame and the style ``EndFrame'' to end it. A frame is automatically ended by the start of a new frame and by the start of a new section or section (but not by the end of the document!).
 
   \lyxnote
-  You can pass options and an overlay specification to a frame by
-  giving these in \TeX-mode as the first thing in the frame
-  title. (Some magic is performed to extract them in \LyX-mode from
-  there.)
+  You can pass options and an overlay specification to a frame by giving these in \TeX-mode as the first thing in the frame title. (Some magic is performed to extract them in \LyX-mode from there.)
 
   \lyxnote
-  The style ``BeginPlainFrame'' is included as a convenience. It
-  passes the |plain| option to the frame. To pass further options to a
-  plain frame, you should use the normal ``BeginFrame'' style and
-  specify all options (including |plain|).
+  The style ``BeginPlainFrame'' is included as a convenience. It passes the |plain| option to the frame. To pass further options to a plain frame, you should use the normal ``BeginFrame'' style and specify all options (including |plain|).
 
   \lyxnote
-  In \LyX, you can insert verbatim text directly even in overlayed
-  frames. The reason is that \LyX\ uses a different internal mechanism
-  for typesetting verbatim text, that is easier to handle for \beamer.
+  In \LyX, you can insert verbatim text directly even in overlayed frames. The reason is that \LyX\ uses a different internal mechanism for typesetting verbatim text, that is easier to handle for \beamer.
 
   \articlenote
-  In |article| mode, the |frame| environment does not create any visual
-  reference to the original frame (no frame is drawn). Rather, the
-  frame text is inserted into the normal text. To change this, you can
-  modify the templates |frame begin| and |frame end|, see below. To
-  suppress a frame in |article| mode, you can, for example, specify
-  |<presentation>| as overlay specification.
+  In |article| mode, the |frame| environment does not create any visual reference to the original frame (no frame is drawn). Rather, the frame text is inserted into the normal text. To change this, you can modify the templates |frame begin| and |frame end|, see below. To suppress a frame in |article| mode, you can, for example, specify |<presentation>| as overlay specification.
 
   \begin{element}{frame begin}\yes\no\no
-    The text of this template is inserted at the beginning of each
-    frame in |article| mode (and only there). You can use it, say, to
-    start a |minipage| environment at the beginning of a frame or to
-    insert a horizontal bar or whatever.
+    The text of this template is inserted at the beginning of each frame in |article| mode (and only there). You can use it, say, to start a |minipage| environment at the beginning of a frame or to insert a horizontal bar or whatever.
   \end{element}
 
   \begin{element}{frame end}\yes\no\no
-    The text of this template is inserted at the end of each
-    frame in |article| mode.
+    The text of this template is inserted at the end of each frame in |article| mode.
   \end{element}
 \end{environment}
 
-You \emph{can} use the |frame| environment inside other
-environments like this
+You \emph{can} use the |frame| environment inside other environments like this
+
 \begin{verbatim}
 \newenvironment{slide}{\begin{frame}}{\end{frame}}
 \end{verbatim}
+
 or like this
+
 \begin{verbatim}
 \newenvironment{myframe}[1]
   {\begin{frame}[fragile,environment=myframe]\frametitle{#1}}
   {\end{frame}}
 \end{verbatim}
-However, the actual mechanics are somewhat sensitive since the
-``collecting'' of the frame contents is not easy, so
-do not attempt anything too fancy. As a rule, the beginning of the
-environment can be pretty arbitrary, but the ending must end with
-|\end{frame}| and should not contain any |\end{xxx}|. Anything really
-complex is likely to fail. If you need some |\end{xxx}| there, define
-a new command that contains this stuff as in the following example:
+
+However, the actual mechanics are somewhat sensitive since the ``collecting'' of the frame contents is not easy, so do not attempt anything too fancy. As a rule, the beginning of the environment can be pretty arbitrary, but the ending must end with |\end{frame}| and should not contain any |\end{xxx}|. Anything really complex is likely to fail. If you need some |\end{xxx}| there, define a new command that contains this stuff as in the following example:
+
 \begin{verbatim}
 \newenvironment{itemizeframe}
   {\begin{frame}\startitemizeframe}
@@ -469,11 +281,9 @@ a new command that contains this stuff as in the following example:
 \begin{itemizeframe}
 \item First item
 \end{itemizeframe}
-
 \end{verbatim}
 
 
-
 \subsection{Components of a Frame}
 
 Each frame consists of several components:
@@ -483,52 +293,29 @@ Each frame consists of several components:
 \item navigation bars,
 \item navigation symbols,
 \item a logo,
-\item a frame title, 
+\item a frame title,
 \item a background, and
 \item some frame contents.
 \end{enumerate}
 
-A frame need not have all of these components. Usually, the first
-three components are automatically setup by the theme you are using. 
-
+A frame need not have all of these components. Usually, the first three components are automatically setup by the theme you are using.
 
 \subsubsection{The Headline and Footline}
 
-The headline of a frame is the area at the top of the frame. If it is
-not empty, it should show some information that helps the audience
-orientate itself during your talk. Likewise, the footline is the area
-at the bottom of the frame.
+The headline of a frame is the area at the top of the frame. If it is not empty, it should show some information that helps the audience orientate itself during your talk. Likewise, the footline is the area at the bottom of the frame.
 
-\beamer\ does not use the standard \LaTeX\ mechanisms for typesetting
-the headline and the footline. Instead, the special |headline| and
-|footline| templates are used to typeset them.
+\beamer\ does not use the standard \LaTeX\ mechanisms for typesetting the headline and the footline. Instead, the special |headline| and |footline| templates are used to typeset them.
 
-The size of the headline and the footline is determined as follows:
-Their width is always the paper width. Their height is determined by
-tentatively typesetting the headline and the footline right after the
-|\begin{document}| command. The head of the headline and the footline
-at that point is ``frozen'' and will be used throughout the whole
-document, even if the headline and footline vary in height later on
-(which they should not).
+The size of the headline and the footline is determined as follows: Their width is always the paper width. Their height is determined by tentatively typesetting the headline and the footline right after the |\begin{document}| command. The head of the headline and the footline at that point is ``frozen'' and will be used throughout the whole document, even if the headline and footline vary in height later on (which they should not).
 
-The appearance of the headline and footline is determined by the
-following templates:
+The appearance of the headline and footline is determined by the following templates:
 
 \begin{element}{headline}\yes\yes\yes
-  This template is used to typeset the headline. The \beamer-color and
-  -font |headline| are installed at the beginning. The background of
-  the \beamer-color is not used by default, that is, no background
-  rectangle is drawn behind the headline and footline (this may change
-  in the future with the introduction of a headline and a footline
-  canvas).
+  This template is used to typeset the headline. The \beamer-color and -font |headline| are installed at the beginning. The background of the \beamer-color is not used by default, that is, no background rectangle is drawn behind the headline and footline (this may change in the future with the introduction of a headline and a footline canvas).
 
-  The width of the headline is the whole paper width. The height is
-  determined automatically as described above. The headline is typeset
-  in vertical mode with interline skip turned off and the paragraph
-  skip set to zero.
+  The width of the headline is the whole paper width. The height is determined automatically as described above. The headline is typeset in vertical mode with interline skip turned off and the paragraph skip set to zero.
 
-  Inside this template, the |\\| command is changed such that it
-  inserts a comma instead.
+  Inside this template, the |\\| command is changed such that it inserts a comma instead.
 
   \example
 \begin{verbatim}
@@ -542,51 +329,29 @@ following templates:
 
   \begin{templateoptions}
     \itemoption{default}{}
-    The default is just an empty headline. To get the default headline
-    of earlier versions of the \beamer\ class, use the |compatibility|
-    theme.
+    The default is just an empty headline. To get the default headline of earlier versions of the \beamer\ class, use the |compatibility| theme.
     \itemoption{infolines theme}{}
-    This option becomes available (and is used) if the |infolines|
-    outer theme is loaded. The headline shows current section and subsection.
+    This option becomes available (and is used) if the |infolines| outer theme is loaded. The headline shows current section and subsection.
     \itemoption{miniframes theme}{}
-    This option becomes available (and is used) if the |miniframes|
-    outer theme is loaded. The headline shows the sections with small
-    clickable mini frames below them.    
+    This option becomes available (and is used) if the |miniframes| outer theme is loaded. The headline shows the sections with small clickable mini frames below them.
     \itemoption{sidebar theme}{}
-    This option becomes available (and is used) if the |sidebar|
-    outer theme is loaded and if the head height (and option of the
-    |sidebar| theme) is not zero. In this case, the headline is an
-    empty bar of the background color |frametitle| with the logo to
-    the left or right of this bar. 
+    This option becomes available (and is used) if the |sidebar| outer theme is loaded and if the head height (and option of the |sidebar| theme) is not zero. In this case, the headline is an empty bar of the background color |frametitle| with the logo to the left or right of this bar.
     \itemoption{smoothtree theme}{}
-    This option becomes available (and is used) if the |smoothtree|
-    outer theme is loaded. A ``smoothed'' navigation
-    tree is shown in the headline.
+    This option becomes available (and is used) if the |smoothtree| outer theme is loaded. A ``smoothed'' navigation tree is shown in the headline.
     \itemoption{smoothbars theme}{}
-    This option becomes available (and is used) if the |smoothbars|
-    outer theme is loaded. A ``smoothed'' version of the
-    |miniframes| headline is shown.
+    This option becomes available (and is used) if the |smoothbars| outer theme is loaded. A ``smoothed'' version of the |miniframes| headline is shown.
     \itemoption{tree}{}
-    This option becomes available (and is used) if the |tree|
-    outer theme is loaded. A navigational tree is shown in the headline.
+    This option becomes available (and is used) if the |tree| outer theme is loaded. A navigational tree is shown in the headline.
     \itemoption{split theme}{}
-    This option becomes available (and is used) if the |split|
-    outer theme is loaded. The headline is split into a left part
-    showing the sections and a right part showing the subsections.
+    This option becomes available (and is used) if the |split| outer theme is loaded. The headline is split into a left part showing the sections and a right part showing the subsections.
     \itemoption{text line}{\marg{text}}
-    The headline is typeset more or less as if it were a normal text
-    line with the \meta{text} as contents. The left and right margin
-    are setup such that they are the same as the margins of normal
-    text. The \meta{text} is typeset inside an |\hbox|, while the
-    headline is normally typeset in vertical mode.
+    The headline is typeset more or less as if it were a normal text line with the \meta{text} as contents. The left and right margin are setup such that they are the same as the margins of normal text. The \meta{text} is typeset inside an |\hbox|, while the headline is normally typeset in vertical mode.
   \end{templateoptions}
 
   Inside the template numerous inserts can be used:
   \begin{itemize}
     \iteminsert{\insertnavigation\marg{width}}
-    Inserts a horizontal navigation bar of the given \meta{width} into a
-    template. The bar lists the sections and below them mini frames for
-    each frame in that section.
+    Inserts a horizontal navigation bar of the given \meta{width} into a template. The bar lists the sections and below them mini frames for each frame in that section.
 
     \iteminsert{\insertpagenumber}
     Inserts the current page number into a template.
@@ -595,60 +360,46 @@ following templates:
     Inserts the current section into a template.
 
     \iteminsert{\insertsectionnavigation}\marg{width}
-    Inserts a vertical navigation bar containing all sections, with the
-    current section hilighted.
+    Inserts a vertical navigation bar containing all sections, with the current section highlighted.
 
     \iteminsert{\insertsectionnavigationhorizontal}\marg{width}\marg{left insert}\marg{right insert}
-    Inserts a horizontal navigation bar containing all sections, with
-    the current section hilighted. The \meta{left insert} will be
-    inserted to the left of the sections, the \marg{right insert} to the
-    right. By inserting a triple fill (a
-    |filll|) you can flush the bar to the left or right.
+    Inserts a horizontal navigation bar containing all sections, with the current section highlighted. The \meta{left insert} will be inserted to the left of the sections, the \marg{right insert} to the right. By inserting a triple fill (a |filll|) you can flush the bar to the left or right.
     \example
 \begin{verbatim}
 \insertsectionnavigationhorizontal{.5\textwidth}{\hskip0pt plus1filll}{}
 \end{verbatim}
 
     \iteminsert{\insertshortauthor}\oarg{options}
-    Inserts the short version of the author into a template. The text
-    will be printed in one long line, line breaks introduced using the
-    |\\| command are suppressed.  The
-    following \meta{options} may be given:
+    Inserts the short version of the author into a template. The text will be printed in one long line, line breaks introduced using the |\\| command are suppressed. The following \meta{options} may be given:
     \begin{itemize}
-    \item
+      \item
       \declare{|width=|\meta{width}}
-      causes the text to be put into a multi-line minipage of the given
-      size. Line breaks are still suppressed by default.
-    \item
+      causes the text to be put into a multi-line minipage of the given size. Line breaks are still suppressed by default.
+      \item
       \declare{|center|}
-      centers the text inside the minipage created using the |width|
-      option, rather than having it left aligned.
-    \item
+      centers the text inside the minipage created using the |width| option, rather than having it left aligned.
+      \item
       \declare{|respectlinebreaks|}
-      causes line breaks introduced by the |\\| command to be honored.    
+      causes line breaks introduced by the |\\| command to be honored.
     \end{itemize}
 
-    \example |\insertauthor[width={3cm},center,respectlinebreaks]|
+    \example
+    |\insertauthor[width={3cm},center,respectlinebreaks]|
 
     \iteminsert{\insertshortdate}\oarg{options}
-    Inserts the short version of the date into a template. The same
-    options as for |\insertshortauthor| may be given. 
+    Inserts the short version of the date into a template. The same options as for |\insertshortauthor| may be given.
 
     \iteminsert{\insertshortinstitute}\oarg{options}
-    Inserts the short version of the institute into a template. The same
-    options as for |\insertshortauthor| may be given. 
+    Inserts the short version of the institute into a template. The same options as for |\insertshortauthor| may be given.
 
     \iteminsert{\insertshortpart}\oarg{options}
-    Inserts the short version of the part name into a template. The same
-    options as for |\insertshortauthor| may be given. 
+    Inserts the short version of the part name into a template. The same options as for |\insertshortauthor| may be given.
 
     \iteminsert{\insertshorttitle}\oarg{options}
-    Inserts the short version of the document title into a template. Same
-    options as for |\insertshortauthor| may be given. 
+    Inserts the short version of the document title into a template. Same options as for |\insertshortauthor| may be given.
 
     \iteminsert{\insertshortsubtitle}\oarg{options}
-    Inserts the short version of the document subtitle. Same
-    options as for |\insertshortauthor| may be given. 
+    Inserts the short version of the document subtitle. Same options as for |\insertshortauthor| may be given.
 
     \iteminsert{\insertsubsection}
     Inserts the current subsection into a template.
@@ -657,27 +408,19 @@ following templates:
     Inserts the current subsection into a template.
 
     \iteminsert{\insertsubsectionnavigation}\marg{width}
-    Inserts a vertical navigation bar containing all subsections of the
-    current section, with the current subsection hilighted.
+    Inserts a vertical navigation bar containing all subsections of the current section, with the current subsection highlighted.
 
-    \iteminsert{\insertsubsectionnavigationhorizontal}\marg{width}\marg{left
-      insert}\marg{right insert}
-    
+    \iteminsert{\insertsubsectionnavigationhorizontal}\marg{width}\marg{left insert}\marg{right insert}
     See |\insertsectionnavigationhorizontal|.
 
     \iteminsert{\insertverticalnavigation}\marg{width}
-    Inserts a vertical navigation bar of the given \meta{width} into a
-    template. The bar shows a little table of contents. The individual
-    lines are typeset using the templates
-    |section in head/foot| and |subsection in head/foot|.
+    Inserts a vertical navigation bar of the given \meta{width} into a template. The bar shows a little table of contents. The individual lines are typeset using the templates |section in head/foot| and |subsection in head/foot|.
 
     \iteminsert{\insertframenumber}
     Inserts the number of the current frame (not slide) into a template.
 
     \iteminsert{\inserttotalframenumber}
-    Inserts the total number of the frames (not slides) into a
-    template. The number is only correct on the second run of \TeX\ on
-    your document.
+    Inserts the total number of the frames (not slides) into a template. The number is only correct on the second run of \TeX\ on your document.
 
     \iteminsert{\insertframestartpage}
     Inserts the page number of the first page of the current frame.
@@ -707,216 +450,139 @@ following templates:
     Inserts the page number of the first page of the presentation.
 
     \iteminsert{\insertpresentationendpage}
-    Inserts the page number of the last page of the presentation
-    (excluding the appendix).
-
+    Inserts the page number of the last page of the presentation (excluding the appendix).
 
     \iteminsert{\insertappendixstartpage}
-    Inserts the page number of the first page of the appendix. If there
-    is no appendix, this number is the last page of the document.
+    Inserts the page number of the first page of the appendix. If there is no appendix, this number is the last page of the document.
 
     \iteminsert{\insertappendixendpage}
-    Inserts the page number of the last page of the appendix. If there
-    is no appendix, this number is the last page of the document.
+    Inserts the page number of the last page of the appendix. If there is no appendix, this number is the last page of the document.
 
     \iteminsert{\insertdocumentstartpage}
     Inserts 1.
 
     \iteminsert{\insertdocumentendpage}
-    Inserts the page number of the last page of the document (including
-    the appendix).
+    Inserts the page number of the last page of the document (including the appendix).
   \end{itemize}
 \end{element}
 
 \begin{element}{footline}\yes\yes\yes
-  This template behaves exactly the same way as the headline. Note
-  that, sometimes quite annoyingly, \beamer\ currently adds a space of
-  4pt between the bottom of the frame's text and the top of the
-  footline.  
+  This template behaves exactly the same way as the headline. Note that, sometimes quite annoyingly, \beamer\ currently adds a space of 4pt between the bottom of the frame's text and the top of the footline.
 
   \begin{templateoptions}
     \itemoption{default}{}
-    The default is an empty footline. Note that the navigational
-    symbols are \emph{not} part of the footline by default. Rather,
-    they are part of an (invisible) right sidebar.
+    The default is an empty footline. Note that the navigational symbols are \emph{not} part of the footline by default. Rather, they are part of an (invisible) right sidebar.
     \itemoption{infolines theme}{}
-    This option becomes available (and is used) if the |infolines|
-    outer theme is loaded. The footline shows things like the author's
-    name and the title of the talk.
+    This option becomes available (and is used) if the |infolines| outer theme is loaded. The footline shows things like the author's name and the title of the talk.
     \itemoption{miniframes theme}{}
-    This option becomes available (and is used) if the |miniframes|
-    outer theme is loaded. Depending on the exact options that are
-    used when the |miniframes| theme is loaded, different things can
-    be shown in the footline.
+    This option becomes available (and is used) if the |miniframes| outer theme is loaded. Depending on the exact options that are used when the |miniframes| theme is loaded, different things can be shown in the footline.
     \itemoption{page number}{}
     Shows the current page number in the footline.
     \itemoption{frame number}{}
     Shows the current frame number in the footline.
     \itemoption{split}{}
-    This option becomes available (and is used) if the |split|
-    outer theme is loaded. The footline (just like the headline) is
-    split into a left part showing the author's name and a right part
-    showing the talk's title.
+    This option becomes available (and is used) if the |split| outer theme is loaded. The footline (just like the headline) is split into a left part showing the author's name and a right part showing the talk's title.
     \itemoption{text line}{\marg{text}}
-    The footline is typeset more or less as if it were a normal text
-    line with the \meta{text} as contents. The left and right margin
-    are setup such that they are the same as the margins of normal
-    text. The \meta{text} is typeset inside an |\hbox|, while the
-    headline is normally typeset in vertical mode. Using the |\strut|
-    command somewhere in such a line might be a good idea.
+    The footline is typeset more or less as if it were a normal text line with the \meta{text} as contents. The left and right margin are setup such that they are the same as the margins of normal text. The \meta{text} is typeset inside an |\hbox|, while the headline is normally typeset in vertical mode. Using the |\strut| command somewhere in such a line might be a good idea.
   \end{templateoptions}
 
   The same inserts as for headlines can be used.
 
   \begin{element}{page number in head/foot}\no\yes\yes
-    These \beamer-color and -font are used to typeset the page number
-    or frame number in the footline.
+    These \beamer-color and -font are used to typeset the page number or frame number in the footline.
   \end{element}
 \end{element}
 
+\subsubsection{The Sidebars}
 
+Sidebars are vertical areas that stretch from the lower end of the headline to the top of the footline. There can be a sidebar at the left and another one at the right (or even both). Sidebars can show a table of contents, but they could also be added for purely aesthetic reasons.
 
+When you install a sidebar template, you must explicitly specify the horizontal size of the sidebar using the command |\setbeamersize| with the option |sidebar left width| or |sidebar right width|. The vertical size is determined automatically. Each sidebar has its own background canvas, which can be setup using the sidebar canvas templates.
 
-\subsubsection{The Sidebars}
-
+Adding a sidebar of a certain size, say 1cm, will make the main text 1cm narrower. The distance between the inner side of a side bar and the outer side of the text, as specified by the command |\setbeamersize| with the option |text margin left| and its counterpart for the right margin, is not changed when a sidebar is installed.
 
-Sidebars are vertical areas that stretch from the lower end of the
-headline to the top of the footline. There can be a sidebar at the
-left and another one at the right (or even both). Sidebars can show a
-table of contents, but they could also be added for purely aesthetic
-reasons.
-
-When you install a sidebar template, you must explicitly specify the
-horizontal size of the sidebar using the command |\setbeamesize| with
-the option |sidebar left width| or |sidebar right width|. The vertical
-size is determined automatically. Each sidebar has its own background
-canvas, which can be setup using the sidebar canvas templates. 
-
-Adding a sidebar of a certain size, say 1cm, will make the main text
-1cm narrower. The distance between the inner side of a side
-bar and the outer side of the text, as specified by
-the command |\setbeamersize| with the option |text margin left| and
-its counterpart for the right margin, is not changed when a sidebar is
-installed. 
-
-Internally, the sidebars are typeset by showing them as part of the
-headline. The \beamer\ class keeps track of six dimensions, three 
-for each side: the variables |\beamer@leftsidebar| and
-|\beamer@rightsidebar| store the (horizontal) sizes of the side
-bars, the variables |\beamer@leftmargin| and
-|\beamer@rightmargin| store the distance between sidebar and
-text, and the macros |\Gm@lmargin| and  |\Gm@rmargin| store
-the distance from the edge of the paper to the edge of the text. Thus
-the sum |\beamer@leftsidebar| and |\beamer@leftmargin| is
-exactly  |\Gm@lmargin|. Thus, if you wish to put some text right
-next to the left sidebar, you might write
-|\hskip-\beamer@leftmargin| to get there.
+Internally, the sidebars are typeset by showing them as part of the headline. The \beamer\ class keeps track of six dimensions, three for each side: the variables |\beamer@leftsidebar| and |\beamer@rightsidebar| store the (horizontal) sizes of the side bars, the variables |\beamer@leftmargin| and |\beamer@rightmargin| store the distance between sidebar and text, and the macros |\Gm@lmargin| and |\Gm@rmargin| store the distance from the edge of the paper to the edge of the text. Thus the sum |\beamer@leftsidebar| and |\beamer@leftmargin| is exactly |\Gm@lmargin|. Thus, if you wish to put some text right next to the left sidebar, you might write |\hskip-\beamer@leftmargin| to get there.
 
 \begin{element}{sidebar left}\yes\yes\yes
   \colorfontparents{sidebar}
-  The template is used to typeset the left sidebar. As mentioned
-  above, the size of the left sidebar is set using the command
+  The template is used to typeset the left sidebar. As mentioned above, the size of the left sidebar is set using the command
+
 \begin{verbatim}
 \setbeamersize{sidebar width left=2cm}
 \end{verbatim}
-  \beamer\ will not clip sidebars automatically if they are too
-  large.
 
-  When the sidebar is typeset, it is put inside a |\vbox|. You should
-  currently setup things like the |\hsize| or the |\parskip|
-  yourself. 
+  \beamer\ will not clip sidebars automatically if they are too large.
+
+  When the sidebar is typeset, it is put inside a |\vbox|. You should currently setup things like the |\hsize| or the |\parskip| yourself.
 
   \begin{templateoptions}
     \itemoption{default}{}
     installs an empty template.
     \itemoption{sidebar theme}{}
-    This option is available if the outer theme |sidebar| is loaded
-    with the |left| option. In this case, this options is selected
-    automatically. It shows a mini table of contents in the sidebar.
+    This option is available if the outer theme |sidebar| is loaded with the |left| option. In this case, this options is selected automatically. It shows a mini table of contents in the sidebar.
   \end{templateoptions}
 \end{element}
 
 \begin{element}{sidebar right}\yes\yes\yes
   \colorfontparents{sidebar}
   This template works the same way as the template for the left.
-  
+
   \begin{templateoptions}
     \itemoption{default}{}
-    The default right sidebar has zero width. Nevertheless, it shows
-    navigational symbols and, if installed, a logo at the bottom of
-    the sidebar, protruding to the left into the text.
+    The default right sidebar has zero width. Nevertheless, it shows navigational symbols and, if installed, a logo at the bottom of the sidebar, protruding to the left into the text.
     \itemoption{sidebar theme}{}
-    This option is available, if the outer theme |sidebar| is loaded
-    with the |left| option. In this case, this options is selected
-    automatically. It shows a mini table of contents in the sidebar.
+    This option is available, if the outer theme |sidebar| is loaded with the |right| option. In this case, this option is selected automatically. It shows a mini table of contents in the sidebar. % FIXME: unsure
   \end{templateoptions}
 \end{element}
 
 \begin{element}{sidebar canvas left}\yes\no\no
-  Like the overall background canvas, this canvas is drawn behind the
-  actual text of the sidebar. This template should normally insert a
-  rectangle of the size of the sidebar, though a too large height will
-  not lead to an error or warning. When this template is called, the
-  \beamer-color |sidebar left| will have been installed.
+  Like the overall background canvas, this canvas is drawn behind the actual text of the sidebar. This template should normally insert a rectangle of the size of the sidebar, though a too large height will not lead to an error or warning. When this template is called, the \beamer-color |sidebar left| will have been installed.
 
   \begin{templateoptions}
-  \item{default}{}
-    uses a large rectangle colored with |sidebar.bg| as the sidebar
-    canvas. However, if the background of |sidebar| is empty, nothing
-    is drawn and the canvas is ``transparent.''
-    
+    \itemoption{default}{}
+    uses a large rectangle colored with |sidebar.bg| as the sidebar canvas. However, if the background of |sidebar| is empty, nothing is drawn and the canvas is ``transparent.''
+
     \itemoption{vertical shading}{\oarg{color options}}
-    installs a vertically shaded background. The following
-    \meta{color options} may be given:
+    installs a vertically shaded background. The following \meta{color options} may be given:
     \begin{itemize}
-    \item \declare{|top=|\meta{color}} specifies the color at the
-      top of the sidebar. By default, 25\% of the foreground of the
-      \beamer-color |palette primary| is used.
-    \item \declare{|bottom=|\meta{color}} specifies the color at the
-      bottom of the sidebar (more precisely, at a distance of the page
-      height below the top of the sidebar). By default, the background of
-      |normal text| at the moment of invocation of this command is
-      used. 
-    \item \declare{|middle=|\meta{color}} specifies the color
-      for the middle of the sidebar. Thus, if this option is given, the
-      shading changes from the bottom color to this color and then
-      to the top color.
-    \item \declare{|midpoint=|\meta{factor}} specifies at which
-      point of the page the middle color is used. A factor of |0| is
-      the bottom of the page, a factor of |1| is the top. The
-      default, which is |0.5|, is in the middle.
+    \item
+      \declare{|top=|\meta{color}} specifies the color at the top of the sidebar. By default, 25\% of the foreground of the \beamer-color |palette primary| is used.
+    \item
+      \declare{|bottom=|\meta{color}} specifies the color at the bottom of the sidebar (more precisely, at a distance of the page height below the top of the sidebar). By default, the background of |normal text| at the moment of invocation of this command is used.
+    \item
+      \declare{|middle=|\meta{color}} specifies the color for the middle of the sidebar. Thus, if this option is given, the shading changes from the bottom color to this color and then to the top color.
+    \item
+      \declare{|midpoint=|\meta{factor}} specifies at which point of the page the middle color is used. A factor of |0| is the bottom of the page, a factor of |1| is the top. The default, which is |0.5|, is in the middle.
     \end{itemize}
-    Note that you must give ``real'' \LaTeX\ colors here. This often
-    makes it necessary to invoke the command |\usebeamercolor| before
-    this command can be used.
+    Note that you must give ``real'' \LaTeX\ colors here. This often makes it necessary to invoke the command |\usebeamercolor| before this command can be used.
+
+    Also note, that the width of the sidebar should be setup before this option is used.
 
-    Also note, that the width of the sidebar should be setup before
-    this option is used.
+    \example
+    A stylish, but not very useful shading:
 
-    \example A stylish, but not very useful shading:
 \begin{verbatim}
 {\usebeamercolor{palette primary}}
 \setbeamertemplate{sidebar canvas}[vertical shading]
 [top=palette primary.bg,middle=white,bottom=palette primary.bg]
 \end{verbatim}
-    
+
     \itemoption{horizontal shading}{\oarg{color options}}
-    installs a horizontally shaded background. The following
-    \meta{color options} may be given:
+    installs a horizontally shaded background. The following \meta{color options} may be given:
     \begin{itemize}
-    \item \declare{|left=|\meta{color}} specifies the color at the
-      left of the sidebar.
-    \item \declare{|right=|\meta{color}} specifies the color at the
-      right of the sidebar.
-    \item \declare{|middle=|\meta{color}} specifies the color
-      in the middle of the sidebar.
-    \item \declare{|midpoint=|\meta{factor}} specifies at which
-      point of the sidebar the middle color is used. A factor of |0| is
-      the left of the sidebar, a factor of |1| is the right. The
-      default, which is |0.5|, is in the middle.
+      \item
+      \declare{|left=|\meta{color}} specifies the color at the left of the sidebar.
+      \item
+      \declare{|right=|\meta{color}} specifies the color at the right of the sidebar.
+      \item
+      \declare{|middle=|\meta{color}} specifies the color in the middle of the sidebar.
+      \item
+      \declare{|midpoint=|\meta{factor}} specifies at which point of the sidebar the middle color is used. A factor of |0| is the left of the sidebar, a factor of |1| is the right. The default, which is |0.5|, is in the middle.
     \end{itemize}
 
-    \example Adds two ``pillars''
+    \example
+    Adds two ``pillars''
+
 \begin{verbatim}
 \setbeamersize{sidebar width left=0.5cm,sidebar width right=0.5cm}
 
@@ -927,89 +593,57 @@ next to the left sidebar, you might write
 \setbeamertemplate{sidebar canvas right}[horizontal shading]
 [left=white,middle=sidebar.bg,right=white]
 \end{verbatim}
-  \end{templateoptions}  
+  \end{templateoptions}
 \end{element}
 
 \begin{element}{sidebar canvas right}\yes\no\no
   Works exactly as for the left side.
 \end{element}
 
-
-
 \subsubsection{Navigation Bars}
 \label{section-navigation-bars}
 
-Many themes install a headline or a sidebar that shows a
-\emph{navigation bar}. Although these navigation bars take up quite
-a bit of space, they are often useful for two reasons: 
-
+Many themes install a headline or a sidebar that shows a \emph{navigation bar}. Although these navigation bars take up quite a bit of space, they are often useful for two reasons:
 \begin{itemize}
 \item
-  They provide the audience with a visual feedback of how much of your
-  talk you have covered and what is yet to come. Without such
-  feedback, an audience will often puzzle whether something you are
-  currently introducing will be explained in more detail later on or
-  not.
+  They provide the audience with a visual feedback of how much of your talk you have covered and what is yet to come. Without such feedback, an audience will often puzzle whether something you are currently introducing will be explained in more detail later on or not.
 \item
-  You can click on all parts of the navigation bar. This will directly
-  ``jump'' you to the part you have clicked on. This is particularly
-  useful to skip certain parts of your talk and during a ``question
-  session,'' when you wish to jump back to a particular frame someone
-  has asked about.
+  You can click on all parts of the navigation bar. This will directly ``jump'' you to the part you have clicked on. This is particularly useful to skip certain parts of your talk and during a ``question session,'' when you wish to jump back to a particular frame someone has asked about.
 \end{itemize}
 
 Some navigation bars can be ``compressed'' using the following option:
 
 \begin{classoption}{compress}
-  Tries to make all navigation bars as small as possible. For example,
-  all small frame representations in the navigation bars for a single
-  section are shown alongside each other. Normally, the representations
-  for different subsections are shown in different lines. Furthermore,
-  section and subsection navigations are compressed into one line.
+  Tries to make all navigation bars as small as possible. For example, all small frame representations in the navigation bars for a single section are shown alongside each other. Normally, the representations for different subsections are shown in different lines. Furthermore, section and subsection navigations are compressed into one line.
 \end{classoption}
 
-
-
-Some themes use the |\insertnavigation| to insert a navigation bar
-into the headline. Inside this bar, small icons are shown (called
-``mini frames'') that represent the frames of a presentation. 
-When you click on such an icon, the
-following happens: 
+Some themes use the |\insertnavigation| to insert a navigation bar into the headline. Inside this bar, small icons are shown (called ``mini frames'') that represent the frames of a presentation. When you click on such an icon, the following happens:
 \begin{itemize}
 \item
-  If you click on (the icon of) any frame other than the current frame, the
-  presentation will jump to the first slide of the frame you clicked
-  on.
+  If you click on (the icon of) any frame other than the current frame, the presentation will jump to the first slide of the frame you clicked on.
 \item
-  If you click on the current frame and you are not on the last slide
-  of this frame, you will jump to the last slide of the frame.
+  If you click on the current frame and you are not on the last slide of this frame, you will jump to the last slide of the frame.
 \item
-  If you click on the current frame and you are on the last slide, you
-  will jump to the first slide of the frame.
+  If you click on the current frame and you are on the last slide, you will jump to the first slide of the frame.
 \end{itemize}
+
 By the above rules you can:
 \begin{itemize}
 \item
-  Jump to the beginning of a frame from somewhere else by clicking on
-  it once.  
+  Jump to the beginning of a frame from somewhere else by clicking on it once.
 \item
-  Jump to the end of a frame from somewhere else by clicking on it
-  twice.
+  Jump to the end of a frame from somewhere else by clicking on it twice.
 \item
   Skip the rest of the current frame by clicking on it once.
 \end{itemize}
 
-I also tried making a jump to an already-visited frame jump
-automatically to the last slide of this frame. However, this turned
-out to be more confusing than helpful. With the current implementation
-a double-click always brings you to the end of a slide, regardless
-from where you ``come.''
+We also tried making a jump to an already-visited frame jump automatically to the last slide of this frame. However, this turned out to be more confusing than helpful. With the current implementation a double-click always brings you to the end of a slide, regardless from where you ``come.''
 
 \begin{element}{mini frames}\semiyes\no\no
-  This parent template has the children |mini frame| and
-  |mini frame in current subsection|.
+  This parent template has the children |mini frame| and |mini frame in current subsection|.
 
-  \example |\setbeamertemplate{mini frames}[box]|
+  \example
+  |\setbeamertemplate{mini frames}[box]|
 
   \begin{templateoptions}
     \itemoption{default}{}
@@ -1022,147 +656,98 @@ from where you ``come.''
 \end{element}
 
 \begin{element}{mini frame}\yes\yes\yes
-  The template is used to render the mini frame of the current frame
-  in a navigation bar.
+  The template is used to render the mini frame of the current frame in a navigation bar.
 
-  The width of the template is ignored. Instead, when multiple mini
-  frames are shown, their position is calculated based on the
-  \beamer-sizes |mini frame size| and |mini frame offset|. See the
-  command |\setbeamersize| for a description of how to change them.
+  The width of the template is ignored. Instead, when multiple mini frames are shown, their position is calculated based on the \beamer-sizes |mini frame size| and |mini frame offset|. See the command |\setbeamersize| for a description of how to change them.
 \end{element}
 
 \begin{element}{mini frame in current subsection}\yes\no\no
-  This template is used to render the mini frame of frames in the
-  current subsection that are not the current frame. The
-  \beamer-color/-font |mini frame| is installed prior to the usage of
-  this template is invoked.
+  This template is used to render the mini frame of frames in the current subsection that are not the current frame. The \beamer-color/-font |mini frame| installed prior to the usage of this template is invoked.
 \end{element}
 
 \begin{element}{mini frame in other subsection}\yes\no\no
-  This template is used to render mini frames of frame from
-  subsections other than the current one.
+  This template is used to render mini frames of frames from subsections other than the current one.
   \begin{templateoptions}
     \itemoption{default}{\oarg{percentage}}
-    By default, this template shows |mini frame in current subsection|, except that the color is first
-    changed to |fg!|\meta{percentage}|!bg|. The default
-    \meta{percentage} is 50\%.
+    By default, this template shows |mini frame in current subsection|, except that the color is first changed to |fg!|\meta{percentage}|!bg|. The default \meta{percentage} is 50\%.
+
+    \example
+    To get an extremely ``shaded'' rendering of the frames outside the current subsection you can use the following:
 
-    \example To get an extremely ``shaded'' rendering of the frames
-    outside the current subsection you can use the following:
 \begin{verbatim}
 \setbeamertemplate{mini frame in other subsection}[default][20]
 \end{verbatim}
 
-    \example To render all mini frames other than the current one in
-    the same way, use
+    \example
+    To render all mini frames other than the current one in the same way, use
 \begin{verbatim}
 \setbeamertemplate{mini frame in other subsection}[default][100]
 \end{verbatim}
   \end{templateoptions}
 \end{element}
 
-
-
-Some themes show sections and/or subsections in the navigation bars. 
-By clicking on a section or subsection in the navigation bar, you will
-jump to that section. Clicking on a section is particularly useful if
-the section starts with a |\tableofcontents[currentsection]|, since you
-can use it to jump to the different subsections.
+Some themes show sections and/or subsections in the navigation bars. By clicking on a section or subsection in the navigation bar, you will jump to that section. Clicking on a section is particularly useful if the section starts with a |\tableofcontents[currentsection]|, since you can use it to jump to the different subsections.
 
 \begin{element}{section in head/foot}\yes\yes\yes
-  This template is used to render a section entry if it occurs in the
-  headline or the footline. The background of the \beamer-color is
-  typically used as the background of the whole ``area'' where section
-  entries are shown in the headline. You cannot usually use this
-  template yourself since the insert |\insertsectionhead| is setup
-  correctly only when a list of sections is being typeset in the
-  headline. 
-
-  The default template just inserts the section name. The following
-  inserts are useful for this template:
+  This template is used to render a section entry if it occurs in the headline or the footline. The background of the \beamer-color is typically used as the background of the whole ``area'' where section entries are shown in the headline. You cannot usually use this template yourself since the insert |\insertsectionhead| is setup correctly only when a list of sections is being typeset in the headline.
+
+  The default template just inserts the section name. The following inserts are useful for this template:
   \begin{itemize}
     \iteminsert{\insertsectionhead}
-    inserts the name of the section that is to be typeset in a
-    navigation bar. 
+    inserts the name of the section that is to be typeset in a navigation bar.
 
     \iteminsert{\insertsectionheadnumber}
-    inserts the number of the section that is to be typeset in a
-    navigation bar. 
+    inserts the number of the section that is to be typeset in a navigation bar.
 
     \iteminsert{\insertpartheadnumber}
-    inserts the number of the part of the current section or subsection
-    that is to be typeset in a navigation bar. 
+    inserts the number of the part of the current section or subsection that is to be typeset in a navigation bar.
   \end{itemize}
 \end{element}
 
 \begin{element}{section in head/foot shaded}\yes\no\no
-  This template is used instead of |section in head/foot| for
-  typesetting sections that are currently shaded. Such shading is
-  usually applied to all sections but the current one.
+  This template is used instead of |section in head/foot| for typesetting sections that are currently shaded. Such shading is usually applied to all sections but the current one.
 
-  Note that this template does \emph{not} have its own color and
-  font. When this template is called, the \beamer-font and color
-  |section in head/foot| will have been setup. Then, at the start of
-  the template, you will typically change the current color or start a
-  |colormixin| environment.
+  Note that this template does \emph{not} have its own color and font. When this template is called, the \beamer-font and color |section in head/foot| will have been setup. Then, at the start of the template, you will typically change the current color or start a |colormixin| environment.
 
   \begin{templateoptions}
     \itemoption{default}{\oarg{percentage}}
-    The default template changes the current color to
-    |fg!|\meta{percentage}|!bg|. This causes the current color to
-    become ``washed out'' or ``shaded.'' The default percentage is
-    |50|.
+    The default template changes the current color to |fg!|\meta{percentage}|!bg|. This causes the current color to become ``washed out'' or ``shaded.'' The default percentage is |50|.
+
+    \example
+    You can use the following command to make the shaded entries very ``light'':
 
-    \example You can use the following command to make the shaded
-    entries very ``light'':
 \begin{verbatim}
 \setbeamertemplate{section in head/foot shaded}[default][20]
 \end{verbatim}
   \end{templateoptions}
 \end{element}
 
-
-
 \begin{element}{section in sidebar}\yes\yes\yes
-  This template is used to render a section entry if it occurs in the
-  sidebar, typically as part of a mini table of contents shown
-  there. The background of the \beamer-color is used as background for
-  the entry. Just like |section in head/foot|, you cannot usually use
-  this template yourself and you should also use |\insertsectionhead|
-  to insert the name of the section that is to be typeset.
+  This template is used to render a section entry if it occurs in the sidebar, typically as part of a mini table of contents shown there. The background of the \beamer-color is used as background for the entry. Just like |section in head/foot|, you cannot usually use this template yourself and you should also use |\insertsectionhead| to insert the name of the section that is to be typeset.
 
   For once, no default is installed for this template.
 
   \begin{templateoptions}
     \itemoption{sidebar theme}{}
-    This template, which is only available if the |sidebar| outer
-    theme is loaded, inserts a bar with the \beamer-color's
-    foreground and background that shows the section  name. The width of
-    the bar is the same as the width of the whole sidebar.
+    This template, which is only available if the |sidebar| outer theme is loaded, inserts a bar with the \beamer-color's foreground and background that shows the section name. The width of the bar is the same as the width of the whole sidebar.
   \end{templateoptions}
 
   The same inserts as for |section in head/foot| can be used.
 \end{element}
 
 \begin{element}{section in sidebar shaded}\yes\yes\no
-  This template is used instead of |section in sidebar| for
-  typesetting sections that are currently shaded. Such shading is
-  usually applied to all sections but the current one.
+  This template is used instead of |section in sidebar| for typesetting sections that are currently shaded. Such shading is usually applied to all sections but the current one.
 
-  Differently from |section in head/foot shaded|, this template
-  \emph{has} its own \beamer-color.
+  Differently from |section in head/foot shaded|, this template \emph{has} its own \beamer-color.
 
   \begin{templateoptions}
     \itemoption{sidebar theme}{}
-    Does the same as for the nonshaded version, except that a
-    different \beamer-color is used.
+    Does the same as for the nonshaded version, except that a different \beamer-color is used.
   \end{templateoptions}
 \end{element}
 
-
 \begin{element}{subsection in head/foot}\yes\yes\yes
-  This template behaves exactly like |section in head/foot|, only for
-  subsections. 
+  This template behaves exactly like |section in head/foot|, only for subsections.
   \begin{itemize}
     \iteminsert{\insertsubsectionhead}
     works like |\insertsectionhead|.
@@ -1173,8 +758,7 @@ can use it to jump to the different subsections.
 \end{element}
 
 \begin{element}{subsection in head/foot shaded}\yes\no\no
-  This template behaves exactly like |section in head/foot shaded|,
-  only for subsections. 
+  This template behaves exactly like |section in head/foot shaded|, only for subsections.
   \begin{templateoptions}
     \itemoption{default}{\oarg{percentage}}
     works like the corresponding option for sections.
@@ -1188,18 +772,15 @@ can use it to jump to the different subsections.
 \end{element}
 
 \begin{element}{subsection in sidebar}\yes\yes\yes
-  This template behaves exactly like |section in sidebar|, only for
-  subsections. 
+  This template behaves exactly like |section in sidebar|, only for subsections.
 \end{element}
 
 \begin{element}{subsection in sidebar shaded}\yes\no\no
-  This template behaves exactly like |section in sidebar shaded|,
-  only for subsections. 
+  This template behaves exactly like |section in sidebar shaded|, only for subsections.
 \end{element}
 
 \begin{element}{subsubsection in head/foot}\yes\yes\yes
-  This template behaves exactly like |section in head/foot|, only for
-  subsubsections. Currently, it is not used by the default themes.
+  This template behaves exactly like |section in head/foot|, only for subsubsections. Currently, it is not used by the default themes.
   \begin{itemize}
     \iteminsert{\insertsubsubsectionhead}
     works like |\insertsectionhead|.
@@ -1210,8 +791,7 @@ can use it to jump to the different subsections.
 \end{element}
 
 \begin{element}{subsubsection in head/foot shaded}\yes\no\no
-  This template behaves exactly like |section in head/foot shaded|,
-  only for subsubsections. 
+  This template behaves exactly like |section in head/foot shaded|, only for subsubsections.
   \begin{templateoptions}
     \itemoption{default}{\oarg{percentage}}
     works like the corresponding option for sections.
@@ -1219,111 +799,66 @@ can use it to jump to the different subsections.
 \end{element}
 
 \begin{element}{subsubsection in sidebar}\yes\yes\yes
-  This template behaves exactly like |section in sidebar|, only for
-  subsubsections. 
+  This template behaves exactly like |section in sidebar|, only for subsubsections.
 \end{element}
 
 \begin{element}{subsubsection in sidebar shaded}\yes\no\no
-  This template behaves exactly like |section in sidebar shaded|,
-  only for subsubsections. 
+  This template behaves exactly like |section in sidebar shaded|, only for subsubsections.
 \end{element}
 
-By clicking on the document title in a navigation bar (not all themes
-show it), you will jump to the first slide of your presentation
-(usually the title page) \emph{except} if you are already at the first
-slide. On the first slide, clicking on the document title will jump to
-the end of the presentation, if there is one. Thus by \emph{double}
-clicking the document title in a navigation bar, you can jump to the end.
-
-
+By clicking on the document title in a navigation bar (not all themes show it), you will jump to the first slide of your presentation (usually the title page) \emph{except} if you are already at the first slide. On the first slide, clicking on the document title will jump to the end of the presentation, if there is one. Thus by \emph{double} clicking the document title in a navigation bar, you can jump to the end.
 
 \subsubsection{The Navigation Symbols}
 \label{section-navigation-symbols}
 
-
-Navigation symbols are small icons that are shown on every slide
-by default. The following symbols are shown: 
+Navigation symbols are small icons that are shown on every slide by default. The following symbols are shown:
 \begin{enumerate}
 \item
-  A slide icon, which is depicted as  a single rectangle. To the left and
-  right of this symbol, a left and right arrow are shown.
+  A slide icon, which is depicted as a single rectangle. To the left and right of this symbol, a left and right arrow are shown.
 \item
-  A frame icon, which is depicted as three slide icons ``stacked on top of
-  each other''. This symbol is framed by arrows.
+  A frame icon, which is depicted as three slide icons ``stacked on top of each other''. This symbol is framed by arrows.
 \item
-  A subsection icon, which is depicted as a highlighted subsection
-  entry in a table of contents. This  symbols is framed by arrows.
+  A subsection icon, which is depicted as a highlighted subsection entry in a table of contents. This symbols is framed by arrows.
 \item
-  A section icon, which is depicted as a highlighted section entry
-  (together with all subsections) in a table of contents. This symbol
-  is framed by arrows.
+  A section icon, which is depicted as a highlighted section entry (together with all subsections) in a table of contents. This symbol is framed by arrows.
 \item
-  A presentation icon, which is depicted as a completely highlighted
-  table of contents.
+  A presentation icon, which is depicted as a completely highlighted table of contents.
 \item
-  An appendix icon, which is depicted as a completely highlighted
-  table of contents consisting of only one section. (This icon is only
-  shown if there is an appendix.)
+  An appendix icon, which is depicted as a completely highlighted table of contents consisting of only one section. (This icon is only shown if there is an appendix.)
 \item
   Back and forward icons, depicted as circular arrows.
 \item
-  A ``search'' or ``find'' icon, depicted as a detective's
-  magnifying glass.
+  A ``search'' or ``find'' icon, depicted as a detective's magnifying glass.
 \end{enumerate}
 
-Clicking on the left arrow next to an icon always jumps to (the
-last slide of) the previous slide, frame, subsection, or
-section. Clicking on the right arrow next to an icon always jump to
-(the first slide of) the next slide, frame, subsection, or section. 
+Clicking on the left arrow next to an icon always jumps to (the last slide of) the previous slide, frame, subsection, or section. Clicking on the right arrow next to an icon always jumps to (the first slide of) the next slide, frame, subsection, or section.
 
 Clicking \emph{on} any of these icons has different effects:
 \begin{enumerate}
 \item
-  If supported by the viewer application, clicking on a slide icon
-  pops up a window that allows you to enter a slide number to which
-  you wish to jump.
+  If supported by the viewer application, clicking on a slide icon pops up a window that allows you to enter a slide number to which you wish to jump.
 \item
-  Clicking on the left side of a frame icon will jump to the first
-  slide of the frame, clicking on the right side will jump to the last
-  slide of the frame (this can be useful for skipping overlays).
+  Clicking on the left side of a frame icon will jump to the first slide of the frame, clicking on the right side will jump to the last slide of the frame (this can be useful for skipping overlays).
 \item
-  Clicking on the left side of a subsection icon will jump to the
-  first slide of the subsection, clicking on the right side will jump
-  to the last slide of the subsection.
+  Clicking on the left side of a subsection icon will jump to the first slide of the subsection, clicking on the right side will jump to the last slide of the subsection.
 \item
-  Clicking on the left side of a section icon will jump to the
-  first slide of the section, clicking on the right side will jump
-  to the last slide of the section.
+  Clicking on the left side of a section icon will jump to the first slide of the section, clicking on the right side will jump to the last slide of the section.
 \item
-  Clicking on the left side of the presentation icon will jump to the
-  first slide, clicking on the right side will jump to the last slide
-  of the presentation. However, this does \emph{not} include the
-  appendix. 
+  Clicking on the left side of the presentation icon will jump to the first slide, clicking on the right side will jump to the last slide of the presentation. However, this does \emph{not} include the appendix.
 \item
-  Clicking on the left side of the appendix icon will jump to the
-  first slide of the appendix, clicking on the right side will jump to
-  the last slide of the appendix.
+  Clicking on the left side of the appendix icon will jump to the first slide of the appendix, clicking on the right side will jump to the last slide of the appendix.
 \item
-  If supported by the viewer application, clicking on the back and
-  forward symbols jumps to the previously visited slides.
+  If supported by the viewer application, clicking on the back and forward symbols jumps to the previously visited slides.
 \item
-  If supported by the viewer application, clicking on the search icon
-  pops up a window that allows you to enter a search string. If found,
-  the viewer application will jump to this string.
+  If supported by the viewer application, clicking on the search icon pops up a window that allows you to enter a search string. If found, the viewer application will jump to this string.
 \end{enumerate}
 
-You can reduce the number of icons that are shown or their layout by
-adjusting the |navigation symbols| template.
+You can reduce the number of icons that are shown or their layout by adjusting the |navigation symbols| template.
 
 \begin{element}{navigation symbols}\yes\yes\yes
-  This template is invoked in ``three-star-mode'' by themes
-  at the place where the navigation symbols should be
-  shown. ``Three-star-mode'' means that the command
-  |\usebeamertemplate***| is used.
+  This template is invoked in ``three-star-mode'' by themes at the place where the navigation symbols should be shown. ``Three-star-mode'' means that the command |\usebeamertemplate***| is used.
 
-  Note that, although it may \emph{look} like that the symbols are part of
-  the footline, they are more often part of an invisible right
-  sidebar.
+  Note that, although it may \emph{look} like the symbols are part of the footline, they are more often part of an invisible right sidebar.
 
   \begin{templateoptions}
     \itemoption{default}{}
@@ -1336,7 +871,8 @@ adjusting the |navigation symbols| template.
     Shows only the navigational symbol for navigating frames.
   \end{templateoptions}
 
-  \example The following command suppresses all navigation symbols:
+  \example
+  The following command suppresses all navigation symbols:
 \begin{verbatim}
 \setbeamertemplate{navigation symbols}{}
 \end{verbatim}
@@ -1344,9 +880,7 @@ adjusting the |navigation symbols| template.
   Inside this template, the following inserts are useful:
   \begin{itemize}
     \iteminsert{\insertslidenavigationsymbol}
-    Inserts the slide navigation symbols, that is, the slide symbols
-    (a rectangle) together with arrows to the left and right that are
-    hyperlinked.
+    Inserts the slide navigation symbols, that is, the slide symbols (a rectangle) together with arrows to the left and right that are hyperlinked.
 
     \iteminsert{\insertframenavigationsymbol}
     Inserts the frame navigation symbol.
@@ -1358,29 +892,20 @@ adjusting the |navigation symbols| template.
     Inserts the section navigation symbol.
 
     \iteminsert{\insertdocnavigationsymbol}
-    Inserts the presentation navigation symbol and (if necessary) the
-    appendix navigation symbol.
+    Inserts the presentation navigation symbol and (if necessary) the appendix navigation symbol.
 
     \iteminsert{\insertbackfindforwardnavigationsymbol}
     Inserts a back, a find, and a forward navigation symbol.
   \end{itemize}
 \end{element}
 
-
-
-
-
-
 \subsubsection{The Logo}
 
 To install a logo, use the following command:
 
 \begin{command}{\logo\marg{logo text}}
-  The \meta{logo text} is usually a command for including a graphic,
-  but it can be any text. The position where the logo is inserted is
-  determined by the current theme, you cannot (currently) specify this
-  position directly.
-  
+  The \meta{logo text} is usually a command for including a graphic, but it can be any text. The position where the logo is inserted is determined by the current theme; you cannot (currently) specify this position directly.
+
   \example
 \begin{verbatim}
 \pgfdeclareimage[height=0.5cm]{logo}{tu-logo}
@@ -1392,11 +917,10 @@ To install a logo, use the following command:
 \logo{\includegraphics[height=0.5cm]{logo.pdf}}
 \end{verbatim}
 
-  Currently, the effect of this command is just to setup the |logo|
-  template. However, a more sophisticated effect might be implemented
-  in the future.
-  
-  \articlenote This command has no effect.
+  Currently, the effect of this command is just to setup the |logo| template. However, a more sophisticated effect might be implemented in the future.
+
+  \articlenote
+  This command has no effect.
 
   \begin{element}{logo}\yes\yes\yes
     This template is used to render the logo.
@@ -1405,25 +929,16 @@ To install a logo, use the following command:
   The following insert can be used to insert a logo somewhere:
   \begin{itemize}
     \iteminsert{\insertlogo}
-    inserts the logo at the current position. This command has the
-    same effect as |\usebeamertemplate*{logo}|.
+    inserts the logo at the current position. This command has the same effect as |\usebeamertemplate*{logo}|.
   \end{itemize}
 \end{command}
 
-
 \subsubsection{The Frame Title}
 
-The frame title is shown prominently at the top of the frame and can
-be specified with the following command:
+The frame title is shown prominently at the top of the frame and can be specified with the following command:
 
-\begin{command}{\frametitle\sarg{overlay specification}\oarg{short
-  frame title}\marg{frame title text}} 
-  You should end the \meta{frame title text} with a period, if the title is a
-  proper sentence. Otherwise, there should not be a period. The
-  \meta{short frame title} is normally not shown, but its available
-  via the |\insertshortframetitle| command. The \meta{overlay
-  specification} is mostly useful for suppressing the frame title in
-  |article| mode.
+\begin{command}{\frametitle\sarg{overlay specification}\oarg{short frame title}\marg{frame title text}}
+  You should end the \meta{frame title text} with a period, if the title is a proper sentence. Otherwise, there should not be a period. The \meta{short frame title} is normally not shown, but it's available via the |\insertshortframetitle| command. The \meta{overlay specification} is mostly useful for suppressing the frame title in |article| mode.
 
   \example
 \begin{verbatim}
@@ -1435,77 +950,34 @@ be specified with the following command:
 \end{frame}
 \end{verbatim}
 
-  If you are using the |allowframebreaks| option with the current frame,
-  a continuation text (like ``(cont.)'' or something similar,
-  depending on the template |frametitle continuation|) is
-  automatically added to the \meta{frame title text} at the end,
-  separated with a space.
+  If you are using the |allowframebreaks| option with the current frame, a continuation text (like ``(cont.)'' or something similar, depending on the template |frametitle continuation|) is automatically added to the \meta{frame title text} at the end, separated with a space.
 
   \beamernote
-  The frame title is not typeset immediately when the command
-  |\frametitle| is encountered. Rather, the argument of the command is
-  stored internally and the frame title is only typeset when the
-  complete frame has been read. This gives you access to both the
-  \meta{frame title text} and to the \meta{subframe title text} that
-  is possibly introduced using the |\framesubtitle| command.
+  The frame title is not typeset immediately when the command |\frametitle| is encountered. Rather, the argument of the command is stored internally and the frame title is only typeset when the complete frame has been read. This gives you access to both the \meta{frame title text} and to the \meta{subframe title text} that is possibly introduced using the |\framesubtitle| command.
 
   \articlenote
-  By default, this command creates a new paragraph in |article| mode,
-  entitled \meta{frame title text}. Using the \meta{overlay
-    specification} makes it easy to suppress the a frame title once in
-  a while. If you generally wish to suppress \emph{all} frame
-  titles in |article| mode, say |\setbeamertemplate<article>{frametitle}{}|.
+  By default, this command creates a new paragraph in |article| mode, entitled \meta{frame title text}. Using the \meta{overlay specification} makes it easy to suppress a frame title once in a while. If you generally wish to suppress \emph{all} frame titles in |article| mode, say |\setbeamertemplate<article>{frametitle}{}|.
 
   \lyxnote
-  The frame title is the text that follows on the line of the
-  ``BeginFrame'' style.
+  The frame title is the text that follows on the line of the ``BeginFrame'' style.
 
   \begin{element}{frametitle}\yes\yes\yes
     \colorfontparents{titlelike}
-    
-    When the frame title and subtitle are to be typeset, this template
-    is invoked with the \beamer-color and -font |frametitle| set. This
-    template is \emph{not} invoked when the commands |\frametitle| or
-    |\framesubtitle| are called. Rather, it is invoked when the whole
-    frame has been completely read. Till then, the frame title and frame
-    subtitle text are stored in a special place. This way, when the
-    template is invoked, both inserts are setup correctly. The resulting
-    \TeX-box is then magically put back to the top of the frame.
+
+    When the frame title and subtitle are to be typeset, this template is invoked with the \beamer-color and -font |frametitle| set. This template is \emph{not} invoked when the commands |\frametitle| or |\framesubtitle| are called. Rather, it is invoked when the whole frame has been completely read. Till then, the frame title and frame subtitle text are stored in a special place. This way, when the template is invoked, both inserts are setup correctly. The resulting \TeX-box is then magically put back to the top of the frame.
 
     \begin{templateoptions}
       \itemoption{default}{\oarg{alignment}}
-      The frame is typeset using the \beamer-color |frametitle| and the
-      \beamer-font |frametitle|. The subtitle is put below using the
-      color and font |framesubtitle|. If the color |frametitle| has a
-      background, a background bar stretching the whole frame width is put
-      behind the title. A background color of the subtitle is ignored. The
-      \meta{alignment} is passed on to the |beamercolorbox|
-      environment. In particular, useful options are |left|, |center|, and
-      |right|. As a special case, the |right| option causes the left
-      border of the frame title to be somewhat larger than normal so that
-      the frame title is more in the middle of the frame.
-      
+      The frame is typeset using the \beamer-color |frametitle| and the \beamer-font |frametitle|. The subtitle is put below using the color and font |framesubtitle|. If the color |frametitle| has a background, a background bar stretching the whole frame width is put behind the title. A background color of the subtitle is ignored. The \meta{alignment} is passed on to the |beamercolorbox| environment. In particular, useful options are |left|, |center|, and |right|. As a special case, the |right| option causes the left border of the frame title to be somewhat larger than normal so that the frame title is more in the middle of the frame.
+
       \itemoption{shadow theme}{}
-      This option is available if the outer theme |shadow| is
-      loaded. It draws the frame title on top of a horizontal shading
-      between the background colors of |frametitle| and
-      |frametitle right|. A subtitle is, if present, also put on this
-      bar. Below the bar, a ``shadow'' is drawn.
-      
+      This option is available if the outer theme |shadow| is loaded. It draws the frame title on top of a horizontal shading between the background colors of |frametitle| and |frametitle right|. A subtitle is, if present, also put on this bar. Below the bar, a ``shadow'' is drawn.
+
       \itemoption{sidebar theme}{}
-      This option is available if the outer theme |sidebar| is loaded
-      and if the headline height is not set to 0pt (which can be done
-      using and option of the |sidebar| theme). With this option, the
-      frame title is put inside a rectangular area that is part of the
-      headline (some ``negative space'' is used to raise the frame title
-      into this area). The background of the color |frametitle| is not
-      used, this is the job of the headline template in this case.
+      This option is available if the outer theme |sidebar| is loaded and if the headline height is not set to 0pt (which can be done using an option of the |sidebar| theme). With this option, the frame title is put inside a rectangular area that is part of the headline (some ``negative space'' is used to raise the frame title into this area). The background of the color |frametitle| is not used, this is the job of the headline template in this case.
 
       \itemoption{smoothbars theme}{}
-      This option is available if the outer theme |smoothbars| is
-      loaded. It typesets the frametitle on a colored bar with the
-      background color of |frametitle|. The top and bottom of the bar
-      smoothly blend over to backgrounds above and below.
+      This option is available if the outer theme |smoothbars| is loaded. It typesets the frame title on a colored bar with the background color of |frametitle|. The top and bottom of the bar smoothly blend over to backgrounds above and below.
 
       \itemoption{smoothtree theme}{}
       Like |smoothbars theme|, only for the |smoothtree| theme.
@@ -1520,13 +992,9 @@ be specified with the following command:
 \end{command}
 
 
-\begin{command}{\framesubtitle\sarg{overlay specification}\marg{frame
-      subtitle text}}
-  If present, a subtitle will be shown in a smaller font below the
-  main title. Like the |\frametitle| command, this command can be
-  given anywhere in the frame, since the frame title is actually
-  typeset only when everything else has already been typeset.
-  
+\begin{command}{\framesubtitle\sarg{overlay specification}\marg{frame subtitle text}}
+  If present, a subtitle will be shown in a smaller font below the main title. Like the |\frametitle| command, this command can be given anywhere in the frame, since the frame title is actually typeset only when everything else has already been typeset.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -1542,181 +1010,137 @@ be specified with the following command:
 
   \begin{element}{framesubtitle}\no\yes\yes
     \colorfontparents{frametitle}
-    This element provides a color and a font for the subtitle, but no
-    template. It is the job of the |frametitle| template to also
-    typeset the subtitle.
+    This element provides a color and a font for the subtitle, but no template. It is the job of the |frametitle| template to also typeset the subtitle.
   \end{element}
 \end{command}
 
-Be default, all material for a slide is vertically centered. You can
-change this using the following class options:
+Be default, all material for a slide is vertically centered. You can change this using the following class options:
 
 \begin{classoption}{t}
-  Place text of slides at the (vertical) top of the slides. This
-  corresponds to a vertical ``flush.'' You can override this for
-  individual frames using the |c| or |b| option.
+  Place text of slides at the (vertical) top of the slides. This corresponds to a vertical ``flush.'' You can override this for individual frames using the |c| or |b| option.
 \end{classoption}
 
 \begin{classoption}{c}
-  Place text of slides at the (vertical) center of the slides. This is
-  the default. You can override this for
-  individual frames using the |t| or |b| option.
+  Place text of slides at the (vertical) center of the slides. This is the default. You can override this for individual frames using the |t| or |b| option.
 \end{classoption}
 
-
 \subsubsection{The Background}
 \label{section-canvas}
 \label{section-background}
 
-Each frame has a \emph{background}, which---as the name suggests---is
-``behind everything.'' The background is a surprisingly complex
-object: in \beamer, it consists of a \emph{background canvas} and the
-\emph{main background}.
-
-The background canvas can be imagined as a large area on which
-everything (the main background and everything else) is painted on. By
-default, this canvas is a big rectangle filling the whole frame whose
-color is the background of the \beamer-color
-|background canvas|. Since this color inherits from |normal text|, by
-changing the background color of the normal text, you can change this
-color of the canvas.
-
-\example The following command changes the background color to a light
-red.
+Each frame has a \emph{background}, which---as the name suggests---is ``behind everything.'' The background is a surprisingly complex object: in \beamer, it consists of a \emph{background canvas} and the \emph{main background}.
+
+The background canvas can be imagined as a large area on which everything (the main background and everything else) is painted on. By default, this canvas is a big rectangle filling the whole frame whose color is the background of the \beamer-color |background canvas|. Since this color inherits from |normal text|, by changing the background color of the normal text, you can change this color of the canvas.
+
+\example
+The following command changes the background color to a light red.
 \begin{verbatim}
-\setbeamercolor{normal text}{bg=red!20} 
+\setbeamercolor{normal text}{bg=red!20}
 \end{verbatim}
 
-The canvas need not be monochrome. Instead, you can install a shading
-or even make it transparent. Making it transparent is a good idea if
-you wish to include your slides in some other document.
+The canvas need not be monochrome. Instead, you can install a shading or even make it transparent. Making it transparent is a good idea if you wish to include your slides in some other document.
 
-\example The following command makes the background canvas transparent:
+\example
+The following command makes the background canvas transparent:
 \begin{verbatim}
-\setbeamercolor{background canvas}{bg=} 
+\setbeamercolor{background canvas}{bg=}
 \end{verbatim}
 
 \begin{element}{background canvas}\yes\yes\yes
   \colorparents{normal text}
-  The template is inserted ``behind everything.'' The template should
-  typically be some \TeX\ commands that produce a rectangle of height
-  |\paperheight| and width |\paperwidth|.
+  The template is inserted ``behind everything.'' The template should typically be some \TeX\ commands that produce a rectangle of height |\paperheight| and width |\paperwidth|.
 
   \begin{templateoptions}
     \itemoption{default}{}
-    installs a large rectangle with the background color. If the
-    background is empty, the canvas is ``transparent.'' Since
-    |background canvas| inherits from |normal text|, you can change the 
-    background of the \beamer-color |normal text| to change the
-    color of the default canvas. However, to make the canvas
-    transparent, only set the background of the canvas empty; leave
-    the background of normal text white.
-    
+    installs a large rectangle with the background color. If the background is empty, the canvas is ``transparent.'' Since |background canvas| inherits from |normal text|, you can change the background of the \beamer-color |normal text| to change the color of the default canvas. However, to make the canvas transparent, only set the background of the canvas empty; leave the background of normal text white.
+
     \itemoption{vertical shading}{\oarg{color options}}
-    installs a vertically shaded background. \emph{Use with care:
-      Background shadings are often distracting!} The following
-    \meta{color options} may be given:
+    installs a vertically shaded background. \emph{Use with care: Background shadings are often distracting!} The following \meta{color options} may be given:
     \begin{itemize}
-    \item \declare{|top=|\meta{color}} specifies the color at the
-      top of the page. By default, 25\% of the foreground of the
-      \beamer-color |palette primary| is used.
-    \item \declare{|bottom=|\meta{color}} specifies the color at the
-      bottom of the page. By default, the background of
-      |normal text| at the moment of invocation of this command is
-      used. 
-    \item \declare{|middle=|\meta{color}} specifies the color
-      for the middle of the page. Thus, if this option is given, the
-      shading changes from the bottom color to this color and then
-      to the top color.
-    \item \declare{|midpoint=|\meta{factor}} specifies at which
-      point of the page the middle color is used. A factor of |0| is
-      the bottom of the page, a factor of |1| is the top. The
-      default, which is |0.5| is in the middle.
+      \item
+      \declare{|top=|\meta{color}} specifies the color at the top of the page. By default, 25\% of the foreground of the \beamer-color |palette primary| is used.
+      \item
+      \declare{|bottom=|\meta{color}} specifies the color at the bottom of the page. By default, the background of |normal text| at the moment of invocation of this command is used.
+      \item
+      \declare{|middle=|\meta{color}} specifies the color for the middle of the page. Thus, if this option is given, the shading changes from the bottom color to this color and then to the top color.
+      \item
+      \declare{|midpoint=|\meta{factor}} specifies at which point of the page the middle color is used. A factor of |0| is the bottom of the page, a factor of |1| is the top. The default, which is |0.5| is in the middle.
     \end{itemize}
-  \end{templateoptions}  
+  \end{templateoptions}
 \end{element}
 
-The main background is drawn on top of the background canvas. It can
-be used to add, say, a grid to every frame or a big background picture
-or whatever.
+The main background is drawn on top of the background canvas. It can be used to add, say, a grid to every frame or a big background picture or whatever.
 
 \begin{element}{background}\yes\yes\yes
   \colorparents{background canvas}
-  The template is inserted ``behind everything, but on top of the
-  background canvas.'' Use it for pictures or grids or anything that
-  does not necessarily fill the whole background. When this template
-  is typeset, the \beamer-color and -font |background| will be
-  setup.
+  The template is inserted ``behind everything, but on top of the background canvas.'' Use it for pictures or grids or anything that does not necessarily fill the whole background. When this template is typeset, the \beamer-color and -font |background| will be setup.
 
   \begin{templateoptions}
     \itemoption{default}{} is empty.
-    
+
     \itemoption{grid}{\oarg{grid options}}
-    places a grid on the background. The following
-    \meta{grid options} may be given:
+    places a grid on the background. The following \meta{grid options} may be given:
     \begin{itemize}
-    \item \declare{|step=|\meta{dimension}} specifies the distance
-      between grid lines. The default is 0.5cm.
-    \item \declare{|color=|\meta{color}} specifies the color of the
-      grid lines. The default is 10\% foreground.
+      \item
+      \declare{|step=|\meta{dimension}} specifies the distance between grid lines. The default is 0.5cm.
+      \item
+      \declare{|color=|\meta{color}} specifies the color of the grid lines. The default is 10\% foreground.
     \end{itemize}
-  \end{templateoptions}  
+  \end{templateoptions}
 \end{element}
 
 
+\subsection{Frame and Margin Sizes}
+
+The size of a frame is actually the ``paper size'' of a \beamer\ presentation, and it is variable. By default, it amounts to 128mm by 96mm. The aspect ratio of this size is 4:3, which is exactly what most beamers offer these days. It is the job of the presentation program (like |acroread|, |xpdf|, |okular| or |evince|) to display the slides at full screen size. The main advantage of using a small ``paper size'' is that you can use all your normal fonts at their natural sizes. In particular, inserting a graphic with 11pt labels will result in reasonably sized labels during the presentation.
+
+To change ``paper size'' and aspect ratio, you can use the following class options:
+
+\begin{classoption}{aspectratio=1610}
+  Sets aspect ratio to 16:10, and frame size to 160mm by 100mm.
+\end{classoption}
+
+\begin{classoption}{aspectratio=169}
+  Sets aspect ratio to 16:9, and frame size to 160mm by 90mm.
+\end{classoption}
+
+\begin{classoption}{aspectratio=149}
+  Sets aspect ratio to 14:9, and frame size to 140mm by 90mm.
+\end{classoption}
 
+\begin{classoption}{aspectratio=54}
+  Sets aspect ratio to 5:4, and frame size to 125mm by 100mm.
+\end{classoption}
 
-\subsection{Margin Sizes}
+\begin{classoption}{aspectratio=43}
+  The default aspect ratio and frame size. You need not specify this option.
+\end{classoption}
 
-The ``paper size'' of a \beamer\ presentation is fixed to 128mm times
-96mm. The aspect ratio of this size is 4:3, which is exactly what most
-beamers offer these days. It is the job of the
-presentation program (like |acroread| or |xpdf|) to display the slides
-at full screen size. The main advantage of using a small ``paper size''
-is that you can use all your normal fonts at their natural sizes. In
-particular, inserting a graphic with 11pt labels will result in
-reasonably sized labels during the presentation.
+\begin{classoption}{aspectratio=32}
+  Sets aspect ratio to 3:2, and frame size to 135mm by 90mm.
+\end{classoption}
 
-You should refrain from changing the ``paper size.'' However, you
-\emph{can} change the size of the left and right margins, which
-default to 1cm. To change them, you should use the following 
-command:
+Aside from using these options, you should refrain from changing the ``paper size.'' However, you \emph{can} change the size of the left and right margins, which default to 1cm. To change them, you should use the following command:
 
 \begin{command}{\setbeamersize\marg{options}}
   The following \meta{options} can be given:
   \begin{itemize}
   \item
-    \declare{|text margin left=|\meta{\TeX\ dimension}} sets a new left
-    margin. This excludes the left sidebar. Thus, it is the distance
-    between the right edge of the left sidebar and the left edge of
-    the text.
+    \declare{|text margin left=|\meta{\TeX\ dimension}} sets a new left margin. This excludes the left sidebar. Thus, it is the distance between the right edge of the left sidebar and the left edge of the text.
   \item
-    \declare{|text margin right=|\meta{\TeX\ dimension}} sets a new right
-    margin.
+    \declare{|text margin right=|\meta{\TeX\ dimension}} sets a new right margin.
   \item
-    \declare{|sidebar width left=|\meta{\TeX\ dimension}} sets the
-    size of the left sidebar. Currently, this command should be given
-    \emph{before} a shading is installed for the sidebar canvas.
+    \declare{|sidebar width left=|\meta{\TeX\ dimension}} sets the size of the left sidebar. Currently, this command should be given \emph{before} a shading is installed for the sidebar canvas.
   \item
-    \declare{|sidebar width right=|\meta{\TeX\ dimension}} sets the
-    size of the right sidebar.
+    \declare{|sidebar width right=|\meta{\TeX\ dimension}} sets the size of the right sidebar.
   \item
-    \declare{|description width=|\meta{\TeX\ dimension}} sets the
-    default width of description labels, see
-    Section~\ref{section-descriptions}. 
+    \declare{|description width=|\meta{\TeX\ dimension}} sets the default width of description labels, see Section~\ref{section-descriptions}.
   \item
-    \declare{|description width of=|\meta{text}} sets the
-    default width of description labels to the width of the
-    \meta{text}, see  Section~\ref{section-descriptions}.
+    \declare{|description width of=|\meta{text}} sets the default width of description labels to the width of the \meta{text}, see Section~\ref{section-descriptions}.
   \item
-    \declare{|mini frame size=|\meta{\TeX\ dimension}} sets the size
-    of mini frames in a navigation bar. When two mini frame icons are
-    shown alongside each other, their left end points are \meta{\TeX\
-      dimension} far apart.
+    \declare{|mini frame size=|\meta{\TeX\ dimension}} sets the size of mini frames in a navigation bar. When two mini frame icons are shown alongside each other, their left end points are \meta{\TeX\ dimension} far apart.
   \item
-    \declare{|mini frame offset=|\meta{\TeX\ dimension}} set an
-    additional vertical offset that is added to the mini frame size
-    when arranging mini frames vertically.
+    \declare{|mini frame offset=|\meta{\TeX\ dimension}} set an additional vertical offset that is added to the mini frame size when arranging mini frames vertically.
   \end{itemize}
 
   \articlenote
@@ -1724,20 +1148,12 @@ command:
 \end{command}
 
 
-
 \subsection{Restricting the Slides of a Frame}
 \label{section-restriction}
 
-The number of slides in a frame is automatically
-calculated. If the largest number mentioned in any
-overlay specification inside the frame is 4, four slides are
-introduced (despite the fact that a specification like |<4->|
-might suggest that more than four slides would be possible).
+The number of slides in a frame is automatically calculated. If the largest number mentioned in any overlay specification inside the frame is 4, four slides are introduced (despite the fact that a specification like |<4->| might suggest that more than four slides would be possible).
 
-You can also specify the number of slides in the frame ``by hand.'' To
-do so, you pass an overlay specification the |\frame| command. The
-frame will contain only the slides specified in this
-argument. Consider the following example. 
+You can also specify the number of slides in the frame ``by hand.'' To do so, you pass an overlay specification to the |\frame| command. The frame will contain only the slides specified in this argument. Consider the following example.
 
 \begin{verbatim}
 \begin{frame}<1-2,4->
@@ -1745,26 +1161,7 @@ argument. Consider the following example.
   \only<4>{4}\only<5>{5}.
 \end{frame}
 \end{verbatim}
-This command will create a frame containing four slides. The first
-will contain the text ``This is slide number~1,'' the second ``This is
-slide number~2,'' the third ``This is slide number~4,'' and the fourth
-``This is slide number~5.''
-
-A useful specification is just |<0>|, which causes the frame to
-have to no slides at all. For example, |\begin{frame}<handout:0>| causes
-the frame to be suppressed in the handout version, but to be shown
-normally in all other versions. Another useful specification is
-|<beamer>|, which causes the frame to be shown normally in |beamer|
-mode, but to be suppressed in all other versions.
-
-
-
-
-
-
 
+This command will create a frame containing four slides. The first will contain the text ``This is slide number~1,'' the second ``This is slide number~2,'' the third ``This is slide number~4,'' and the fourth ``This is slide number~5.''
 
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+A useful specification is just |<0>|, which causes the frame to have no slides at all. For example, |\begin{frame}<handout:0>| causes the frame to be suppressed in the handout version, but to be shown normally in all other versions. Another useful specification is |<beamer>|, which causes the frame to be shown normally in |beamer| mode, but to be suppressed in all other versions.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-globalstructure.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-globalstructure.tex
index bb2e7024c93..badb6b7d5d2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-globalstructure.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-globalstructure.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,92 +8,59 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-globalstructure.tex,v 1.7 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Structuring a Presentation: The Static Global Structure}
 
-This section lists the commands that are used for structuring a
-presentation ``globally'' using commands like |\section| or
-|\part|. These commands are use to create a \emph{static} structure,
-meaning that the resulting presentation is normally presented one slide
-after the other in the order the slides occur. 
-Section~\ref{section-nonlinear} explains which commands can be used to
-create the \emph{interactive} structure. For the interactive structure,
-you must interact with the presentation program, typically by clicking
-on hyperlinks, to advance the presentation. 
+This section lists the commands that are used for structuring a presentation ``globally'' using commands like |\section| or |\part|. These commands are used to create a \emph{static} structure, meaning that the resulting presentation is normally presented one slide after the other in the order the slides occur. Section~\ref{section-nonlinear} explains which commands can be used to create the \emph{interactive} structure. For the interactive structure, you must interact with the presentation program, typically by clicking on hyperlinks, to advance the presentation.
 
 \subsection{Adding a Title Page}
 
-You can use the |\titlepage| command to insert a title page into
-a frame. By default, it will arrange the following elements on
-the title page: the document title, the author(s)'s names, their
-affiliation, a title graphic, and a date.
+You can use the |\titlepage| command to insert a title page into a frame. By default, it will arrange the following elements on the title page: the document title, the author(s)'s names, their affiliation, a title graphic, and a date.
 
 \begin{command}{\titlepage}
   Inserts the text of a title page into the current frame.
-  \example |\frame{\titlepage}|
-  \example |\frame[plain]{\titlepage}| for a titlepage that fills the
-  whole frame.
+  \example
+  |\frame{\titlepage}|
+  \example
+  |\frame[plain]{\titlepage}| for a titlepage that fills the whole frame.
 
   \lyxnote
-  If you use the ``Title'' style in your presentation, a title page is
-  automatically inserted.
+  If you use the ``Title'' style in your presentation, a title page is automatically inserted.
 
   \begin{element}{title page}\yes\yes\yes
     This template is invoked when the |\titlepage| command is used.
 
     \begin{templateoptions}
       \itemoption{default}{\oarg{alignment}}
-      The title page is typeset showing the title, followed by the
-      author, his or her affiliation, the date, and a titlegraphic. If
-      any of these are missing, they are not shown. Except for the
-      titlegraphic, if the \beamer-color |title|, |author|, |institute|,
-      or |date| is defined, respectively, it is used to as textcolor for
-      these entries. If a background color is defined for them, a
-      colored bar in the corresponding color is drawn behind them,
-      spanning the text width. The corresponding \beamer-fonts are used
-      for these entries.
-
-      The \meta{alignment} option is passed on the |beamercolorbox|
-      and can be used, for example, to flush the title page to the left
-      by specifying |left| here.
+      The title page is typeset showing the title, followed by the author, his or her affiliation, the date, and a titlegraphic. If any of these are missing, they are not shown. Except for the titlegraphic, if the \beamer-color |title|, |author|, |institute|, or |date| is defined, respectively, it is used to as textcolor for these entries. If a background color is defined for them, a colored bar in the corresponding color is drawn behind them, spanning the text width. The corresponding \beamer-fonts are used for these entries.
+
+      The \meta{alignment} option is passed on the |beamercolorbox| and can be used, for example, to flush the title page to the left by specifying |left| here.
     \end{templateoptions}
 
     The following commands are useful for this template:
     \begin{templateinserts}
-      \iteminsert{\insertauthor} inserts a version of the author's name
-      that is useful for the title page.
+      \iteminsert{\insertauthor} inserts a version of the author's name that is useful for the title page.
       \iteminsert{\insertdate} inserts the date.
       \iteminsert{\insertinstitute} inserts the institute.
-      \iteminsert{\inserttitle} inserts a version of the document title
-      that is useful for the title page.
-      \iteminsert{\insertsubtitle} inserts a version of the document title
-      that is useful for the title page.
-      \iteminsert{\inserttitlegraphic} inserts the title graphic into a
-      template. 
+      \iteminsert{\inserttitle} inserts a version of the document title that is useful for the title page.
+      \iteminsert{\insertsubtitle} inserts a version of the document title that is useful for the title page.
+      \iteminsert{\inserttitlegraphic} inserts the title graphic into a template.
     \end{templateinserts}
   \end{element}
 \end{command}
 
-For compatibility with other classes, in |article| mode the following
-command is also provided: 
+For compatibility with other classes, in |article| mode the following command is also provided:
 
 \begin{command}{\maketitle}
   \beamernote
-  If used inside a frame, it has the same effect as |\titlepage|. If
-  used outside a frame, it has the same effect as
-  |\frame{\titlepage}|; in other words, a frame is added if necessary.
+  If used inside a frame, it has the same effect as |\titlepage|. If used outside a frame, it has the same effect as |\frame{\titlepage}|; in other words, a frame is added if necessary.
 \end{command}
 
-
-Before you invoke the title page command, you must specify all
-elements you wish to be shown. This is done using the following
-commands: 
+Before you invoke the title page command, you must specify all elements you wish to be shown. This is done using the following commands:
 
 \begin{command}{\title\oarg{short title}\marg{title}}
-  The \meta{short tile} is used in headlines and footlines. Inside
-  the \meta{title} line breaks can be inserted using the
-  double-backslash command.
+  The \meta{short title} is used in headlines and footlines. Inside the \meta{title} line breaks can be inserted using the double-backslash command.
   \example
 \begin{verbatim}
 \title{The Beamer Class}
@@ -104,9 +72,7 @@ commands:
 \end{command}
 
 \begin{command}{\subtitle\oarg{short subtitle}\marg{subtitle}}
-  The \meta{subshort tile} is not used by default, but is available
-  via the insert |\insertshortsubtitle|. The subtitle is shown below
-  the title in a smaller font.
+  The \meta{short subtitle} is not used by default, but is available via the insert |\insertshortsubtitle|. The subtitle is shown below the title in a smaller font.
   \example
 \begin{verbatim}
 \title{The Beamer Class}
@@ -114,39 +80,32 @@ commands:
 \end{verbatim}
 
   \articlenote
-  This command causes the subtitle to be appended to the title with a
-  linebreak and a |\normalsize| command issued before it. This may or
-  may not be what you would like to happen.
+  This command causes the subtitle to be appended to the title with a linebreak and a |\normalsize| command issued before it. This may or may not be what you would like to happen.
 \end{command}
 
 \begin{command}{\author\oarg{short author names}\marg{author names}}
-  The names should be separated using the
-  command |\and|. In case authors have different affiliations,
-  they should be suffixed by the command |\inst| with different
-  parameters.
-  \example|\author[Hemaspaandra et al.]{L. Hemaspaandra\inst{1} \and T. Tantau\inst{2}}|
+  The names should be separated using the command |\and|. In case authors have different affiliations, they should be suffixed by the command |\inst| with different parameters.
+  \example
+  |\author[Hemaspaandra et al.]{L. Hemaspaandra\inst{1} \and T. Tantau\inst{2}}|
 
   \articlenote
   The short form is ignored in |article| mode.
 \end{command}
 
 \begin{command}{\institute\oarg{short institute}\marg{institute}}
-  If more than one institute is given, they should be separated using
-  the command |\and| and they should be prefixed by the command
-  |\inst| with different parameters.
+  If more than one institute is given, they should be separated using the command |\and| and they should be prefixed by the command |\inst| with different parameters.
   \example
 \begin{verbatim}
-\institute[Universities of Rochester and Berlin]{
-  \inst{1}Department of Computer Science\\
-  University of Rochester
+\institute[Universities of Rijeka and Berlin]{
+  \inst{1}Department of Informatics\\
+  University of Rijeka
   \and
   \inst{2}Fakult\"at f\"ur Elektrotechnik und Informatik\\
   Technical University of Berlin}
 \end{verbatim}
 
   \articlenote
-  The short form is ignored in |article| mode. The long form is also
-  ignored, except if the document class (like |llncs|) defines it.
+  The short form is ignored in |article| mode. The long form is also ignored, except if the document class (like |llncs|) defines it.
 \end{command}
 
 \begin{command}{\date\oarg{short date}\marg{date}}
@@ -157,72 +116,44 @@ commands:
 \end{command}
 
 \begin{command}{\titlegraphic\marg{text}}
-  The \meta{text} is shown as title graphic. Typically, a picture
-  environment is used as \meta{text}.
-  \example|\titlegraphic{\pgfuseimage{titlegraphic}}|
+  The \meta{text} is shown as title graphic. Typically, a picture environment is used as \meta{text}.
+  \example
+  |\titlegraphic{\pgfuseimage{titlegraphic}}|
 
   \articlenote
-  The command is  ignored in |article| mode.
+  The command is ignored in |article| mode.
 \end{command}
 
-
-
-
 \begin{command}{\subject\marg{text}}
-  Enters the \meta{text} as the subject text in the \pdf\ document
-  info. It currently has no other effect.
+  Enters the \meta{text} as the subject text in the \pdf\ document info. It currently has no other effect.
 \end{command}
 
 \begin{command}{\keywords\marg{text}}
-  Enters the \meta{text} as keywords in the \pdf\ document
-  info. It currently has no other effect.
+  Enters the \meta{text} as keywords in the \pdf\ document info. It currently has no other effect.
 \end{command}
 
 
-By default, the |\title| and |\author| commands will also insert their
-arguments into a resulting \pdf-file in the document information
-fields. This may cause problems if you use complicated things like
-boxes as arguments to these commands. In this case, you might wish to
-switch off the automatic generation of these entries using the
-following class option:
+By default, the |\title| and |\author| commands will also insert their arguments into a resulting \pdf-file in the document information fields. This may cause problems if you use complicated things like boxes as arguments to these commands. In this case, you might wish to switch off the automatic generation of these entries using the following class option:
 
 \begin{classoption}{usepdftitle=false}
-  Suppresses the automatic generation of title and author entries in
-  the \pdf\ document information.
+  Suppresses the automatic generation of title and author entries in the \pdf\ document information.
 \end{classoption}
 
 
-
-
-
 \subsection{Adding Sections and Subsections}
 
-You can structure your text using the commands |\section| and
-|\subsection|. Unlike standard \LaTeX, these commands will not
-create a heading at the position where you use them. Rather, they will
-add an entry to the table of contents and also to the navigation
-bars.
+You can structure your text using the commands |\section| and |\subsection|. Unlike standard \LaTeX, these commands will not create a heading at the position where you use them. Rather, they will add an entry to the table of contents and also to the navigation bars.
 
-In order to create a line break in the table of contents (usually not
-a good idea), you can use the command |\breakhere|. Note that the
-standard command |\\| does not work (actually, I do not really know
-why; comments would be appreciated).
+In order to create a line break in the table of contents (usually not a good idea), you can use the command |\breakhere|. Note that the standard command |\\| does not work (actually, we do not really know why; comments would be appreciated).
 
 \begin{command}{\section\sarg{mode specification}\oarg{short section name}\marg{section name}}
-  Starts a section. No heading is created. The \meta{section name}
-  is shown in the table of contents and in the navigation bars, except
-  if \meta{short section name} is specified. In this case, \meta{short
-    section name} is used in the navigation bars instead. If a
-    \meta{mode specification} is given, the command only has an effect
-    for the specified modes.
-    
-  \example|\section[Summary]{Summary of Main Results}|
+  Starts a section. No heading is created. The \meta{section name} is shown in the table of contents and in the navigation bars, except if \meta{short section name} is specified. In this case, \meta{short section name} is used in the navigation bars instead. If a \meta{mode specification} is given, the command only has an effect for the specified modes.
+
+  \example
+  |\section[Summary]{Summary of Main Results}|
 
   \articlenote
-  The \meta{mode specification} allows you to provide an alternate
-  section command in |article| mode. This is necessary for example if
-  the \meta{short section name} is unsuitable for the table of
-  contents:
+  The \meta{mode specification} allows you to provide an alternate section command in |article| mode. This is necessary for example if the \meta{short section name} is unsuitable for the table of contents:
 
   \example
 \begin{verbatim}
@@ -231,9 +162,7 @@ why; comments would be appreciated).
 \end{verbatim}
 
   \begin{element}{section in toc}\yes\yes\yes
-    This template is used when a section entry is to be typeset. For
-    the permissible \meta{options} see the parent template
-    |table of contents|.
+    This template is used when a section entry is to be typeset. For the permissible \meta{options} see the parent template |table of contents|.
 
     The following commands are useful for this template:
     \begin{templateinserts}
@@ -246,35 +175,30 @@ why; comments would be appreciated).
   \end{element}
 
   \begin{element}{section in toc shaded}\yes\yes\yes
-    This template is used instead of the previous one if the section
-    should be shown in a shaded way, because it is not the current
-    section.  For the permissible \meta{options} see the parent
-    template |table of contents|.
+    This template is used instead of the previous one if the section should be shown in a shaded way, because it is not the current section. For the permissible \meta{options} see the parent template |table of contents|.
   \end{element}
 \end{command}
 
 \begin{command}{\section\sarg{mode specification}\declare{|*|}\marg{section name}}
-  Starts a section without an entry in the table of contents. No
-  heading is created, but the \meta{section name} is shown in the
-  navigation bar. 
-  \example|\section*{Outline}|
-  \example|\section<beamer>*{Outline}|
+  Starts a section without an entry in the table of contents. No heading is created, but the \meta{section name} is shown in the navigation bar.
+  \example
+  |\section*{Outline}|
+  \example
+  |\section<beamer>*{Outline}|
 \end{command}
 
-\begin{command}{\subsection\sarg{mode specification}\oarg{short
-  subsection name}\marg{subsection name}} 
+\begin{command}{\subsection\sarg{mode specification}\oarg{short subsection name}\marg{subsection name}}
   This command works the same way as the |\section| command.
-  \example|\subsection[Applications]{Applications to the Reduction of Pollution}|
+  \example
+  |\subsection[Applications]{Applications to the Reduction of Pollution}|
 
   \begin{element}{subsection in toc}\yes\yes\yes
     Like |section in toc|, only for subsection.
 
-    In addition to the inserts for the |section in toc| template, the
-    following commands are available for this template: 
+    In addition to the inserts for the |section in toc| template, the following commands are available for this template:
     \begin{templateinserts}
       \iteminsert{\inserttocsubsection}
-      inserts the table of contents version of the current subsection
-      name.
+      inserts the table of contents version of the current subsection name.
 
       \iteminsert{\inserttocsubsectionnumber}
       inserts the number of the current subsection (in the table of contents).
@@ -286,13 +210,8 @@ why; comments would be appreciated).
   \end{element}
 \end{command}
 
-\begin{command}{\subsection\sarg{mode specification}\declare{|*|}\marg{subsection name}} 
-  Starts a subsection without an entry in the table of contents. No
-  heading is created, but the \meta{subsection name} is shown in the
-  navigation bar, \emph{except} if \meta{subsection name} is empty. In
-  this case, neither a table of contents entry nor a navigation bar
-  entry is created, \emph{but} any frames in this ``empty'' subsection
-  are shown in the navigation bar.
+\begin{command}{\subsection\sarg{mode specification}\declare{|*|}\marg{subsection name}}
+  Starts a subsection without an entry in the table of contents. No heading is created, but the \meta{subsection name} is shown in the navigation bar, \emph{except} if \meta{subsection name} is empty. In this case, neither a table of contents entry nor a navigation bar entry is created, \emph{but} any frames in this ``empty'' subsection are shown in the navigation bar.
 
   \example
 \begin{verbatim}
@@ -308,32 +227,25 @@ why; comments would be appreciated).
   \subsection*{A subsection}
 
   \frame{Normal frame, shown in navigation bar. The subsection name is
-    also shown in the navigation bar, but not in the table of contents.} 
+    also shown in the navigation bar, but not in the table of contents.}
 \end{verbatim}
 \end{command}
 
-\begin{command}{\subsubsection\sarg{mode specification}\oarg{short
-      subsubsection name}\marg{subsubsection name}}
-  This command works the like |\subsection|. However, subsubsections
-  are supported less well than subsections. For example, in the table
-  of contents subsubsections are always shown with the same
-  shading/hiding parameters as the subsection.
-
-  I \emph{strongly} discourage the use of subsubsections in
-  presentations. If you do not use them, you will give a better
-  presentation.
-  
-  \example|\subsubsection[Applications]{Applications to the Reduction of Pollution}|
-  
+\begin{command}{\subsubsection\sarg{mode specification}\oarg{short subsubsection name}\marg{subsubsection name}}
+  This command works the like |\subsection|. However, subsubsections are supported less well than subsections. For example, in the table of contents subsubsections are always shown with the same shading/hiding parameters as the subsection.
+
+  We \emph{strongly} discourage the use of subsubsections in presentations. If you do not use them, you will give a better presentation.
+
+  \example
+  |\subsubsection[Applications]{Applications to the Reduction of Pollution}|
+
   \begin{element}{subsubsection in toc}\yes\yes\yes
     Like |subsection in toc|, only for subsection.
 
-    In addition to the inserts for the |subsection in toc| template, the
-    following commands are available for this template: 
+    In addition to the inserts for the |subsection in toc| template, the following commands are available for this template:
     \begin{templateinserts}
       \iteminsert{\inserttocsubsubsection}
-      inserts the table of contents version of the current subsubsection
-      name.
+      inserts the table of contents version of the current subsubsection name.
 
       \iteminsert{\inserttocsubsubsectionnumber}
       inserts the number of the current subsubsection (in the table of contents).
@@ -345,27 +257,15 @@ why; comments would be appreciated).
   \end{element}
 \end{command}
 
-\begin{command}{\subsection\sarg{mode specification}\declare{|*|}\marg{subsubsection name}} 
-  Starts a subsection without an entry in the table of contents. No
-  heading is created, but the \meta{subsubsection name} is shown in
-  a possible sidebar.
+\begin{command}{\subsection\sarg{mode specification}\declare{|*|}\marg{subsubsection name}}
+  Starts a subsection without an entry in the table of contents. No heading is created, but the \meta{subsubsection name} is shown in a possible sidebar.
 \end{command}
 
-Often, you may want a certain type of frame to be shown directly after
-a section or subsection starts. For example, you may wish every
-subsection to start with a frame showing the table of contents with
-the current subsection hilighted. To facilitate this, you can use the
-following  commands.
-
+Often, you may want a certain type of frame to be shown directly after a section or subsection starts. For example, you may wish every subsection to start with a frame showing the table of contents with the current subsection hilighted. To facilitate this, you can use the following commands.
 
 \begin{command}{\AtBeginSection\oarg{special star text}\marg{text}}
-  The given text will be inserted at the beginning of every
-  section. If the \meta{special star text} parameter is specified,
-  this text will be used for starred sections instead. Different calls
-  of this command will not ``add up'' the given texts (like the
-  |\AtBeginDocument| command does), but will  overwrite any previous
-  text. 
-  
+  The given text will be inserted at the beginning of every section. If the \meta{special star text} parameter is specified, this text will be used for starred sections instead. Different calls of this command will not ``add up'' the given texts (like the |\AtBeginDocument| command does), but will overwrite any previous text.
+
   \example
 \begin{verbatim}
 \AtBeginSection[] % Do nothing for \section*
@@ -384,13 +284,9 @@ following  commands.
   You have to insert this command using a \TeX-mode text.
 \end{command}
 
-
 \begin{command}{\AtBeginSubsection\oarg{special star text}\marg{text}}
-  The given text will be inserted at the beginning of every
-  subsection. If the \meta{special star text} parameter is specified,
-  this text will be used for starred subsections instead. Different calls
-  of this command will not ``add up'' the given texts.
-  
+  The given text will be inserted at the beginning of every subsection. If the \meta{special star text} parameter is specified, this text will be used for starred subsections instead. Different calls of this command will not ``add up'' the given texts.
+
   \example
 \begin{verbatim}
 \AtBeginSubsection[] % Do nothing for \subsection*
@@ -403,35 +299,19 @@ following  commands.
 \end{verbatim}
 \end{command}
 
-
 \begin{command}{\AtBeginSubsubsection\oarg{special star text}\marg{text}}
   Like |\AtBeginSubsection|, only for subsubsections.
 \end{command}
 
 
-
-
 \subsection{Adding Parts}
 
-If you give a long talk (like a lecture), you may wish to break up
-your talk into several parts. Each such part acts like a little ``talk
-of its own'' with its own table of contents, its own navigation bars,
-and so on. Inside one part, the sections and subsections of the other
-parts are not shown at all.
+If you give a long talk (like a lecture), you may wish to break up your talk into several parts. Each such part acts like a little ``talk of its own'' with its own table of contents, its own navigation bars, and so on. Inside one part, the sections and subsections of the other parts are not shown at all.
 
-To create a new part, use the |\part| command. All sections and
-subsections following this command will be ``local'' to that part.
-Like the |\section| and |\subsection| command, the |\part| command
-does not cause any frame or special text to be produced. However,
-it is often advisable for the start of a new part to use the command
-|\partpage| to insert some text into a frame that ``advertises'' the
-beginning of a new part. See |beamerexample3.tex| for an example.
+To create a new part, use the |\part| command. All sections and subsections following this command will be ``local'' to that part. Like the |\section| and |\subsection| command, the |\part| command does not cause any frame or special text to be produced. However, it is often advisable for the start of a new part to use the command |\partpage| to insert some text into a frame that ``advertises'' the beginning of a new part. See |beamerexample3.tex| for an example.
 
 \begin{command}{\part\sarg{mode specification}\oarg{short part name}\marg{part name}}
-  Starts a part. The \meta{part name} will be shown when the
-  |\partpage| command is used. The \meta{shown part name} is not shown
-  anywhere by default, but it is accessible via the command
-  |\insertshortpart|.
+  Starts a part. The \meta{part name} will be shown when the |\partpage| command is used. The \meta{short part name} is not shown anywhere by default, but it is accessible via the command |\insertshortpart|.
   \example
 \begin{verbatim}
 \begin{document}
@@ -454,7 +334,7 @@ beginning of a new part. See |beamerexample3.tex| for an example.
   \frame{...}
   \subsection{Learning Objectives}
   \frame{...}
-  
+
   \part{Today's Lecture}
   \frame{\partpage}
   \section{Topic A}
@@ -470,20 +350,16 @@ beginning of a new part. See |beamerexample3.tex| for an example.
 \end{command}
 
 \begin{command}{\partpage}
-  Works like |\titlepage|, only that the current part, not the current
-  presentation is ``advertised.''
-  \example |\frame{\partpage}|
-  
+  Works like |\titlepage|, only that the current part, not the current presentation is ``advertised.''
+  \example
+  |\frame{\partpage}|
+
   \begin{element}{part page}\yes\yes\yes
     This template is invoked when the |\partpage| command is used.
 
     \begin{templateoptions}
       \itemoption{default}{\oarg{alignment}}
-      The part page is typeset showing the current part number and,
-      below, the current part title. The \beamer-color and -font
-      |part page| are used, including the background color of
-      |part page|. As for the |title page| template, the
-      \meta{alignment} option is passed on the |beamercolorbox|.
+      The part page is typeset showing the current part number and, below, the current part title. The \beamer-color and -font |part page| are used, including the background color of |part page|. As for the |title page| template, the \meta{alignment} option is passed on the |beamercolorbox|.
     \end{templateoptions}
 
     The following commands are useful for this template:
@@ -499,9 +375,8 @@ beginning of a new part. See |beamerexample3.tex| for an example.
 \end{command}
 
 \begin{command}{\AtBeginPart\marg{text}}
-  The given text will be inserted at the beginning of every
-  part.
-  
+  The given text will be inserted at the beginning of every part.
+
   \example
 \begin{verbatim}
 \AtBeginPart{\frame{\partpage}}
@@ -511,28 +386,15 @@ beginning of a new part. See |beamerexample3.tex| for an example.
 
 \subsection{Splitting a Course Into Lectures}
 
-When using \beamer\ with the |article| mode, you may wish to have the
-lecture notes of a whole course reside in one file. In this case, only
-a few frames are actually part of any particular lecture.
-
-The |\lecture| command makes it easy to select only a certain set of
-frames from a file to be presented. This command takes (among other
-things) a label name. If you say |\includeonlylecture| with this label
-name, then only the frames following the corresponding |\lecture|
-command are shown. The frames following other |\lecture| commands are
-suppressed. 
-
-By default, the |\lecture| command has no other effect. It does not
-create any frames or introduce entries in the table of
-contents. However, you can use |\AtBeginLecture| to have \beamer\
-insert, say, a title page at the beginning of (each) lecture.
-
-\begin{command}{\lecture\oarg{short lecture name}\marg{lecture
-  name}\marg{lecture label}} 
-  Starts a lecture. The \meta{lecture name} will be available via the
-  |\insertlecture| command. The \meta{short lecture name} is available
-  via the |\insertshortlecture| command.
-  
+When using \beamer\ with the |article| mode, you may wish to have the lecture notes of a whole course reside in one file. In this case, only a few frames are actually part of any particular lecture.
+
+The |\lecture| command makes it easy to select only a certain set of frames from a file to be presented. This command takes (among other things) a label name. If you say |\includeonlylecture| with this label name, then only the frames following the corresponding |\lecture| command are shown. The frames following other |\lecture| commands are suppressed.
+
+By default, the |\lecture| command has no other effect. It does not create any frames or introduce entries in the table of contents. However, you can use |\AtBeginLecture| to have \beamer\ insert, say, a title page at the beginning of (each) lecture.
+
+\begin{command}{\lecture\oarg{short lecture name}\marg{lecture name}\marg{lecture label}}
+  Starts a lecture. The \meta{lecture name} will be available via the |\insertlecture| command. The \meta{short lecture name} is available via the |\insertshortlecture| command.
+
   \example
 \begin{verbatim}
 \begin{document}
@@ -556,13 +418,10 @@ insert, say, a title page at the beginning of (each) lecture.
 \end{command}
 
 \begin{command}{\includeonlylecture\meta{lecture label}}
-  Causes all |\frame|, |frame|, |\section|, |\subsection|, and |\part|
-  commands following a |\lecture| command to be suppressed, except if the
-  lecture's label matches the \meta{lecture label}. Frames before any
-  |\lecture| commands are always included. This command should be
-  given in the preamble.
+  Causes all |\frame|, |frame|, |\section|, |\subsection|, and |\part| commands following a |\lecture| command to be suppressed, except if the lecture's label matches the \meta{lecture label}. Frames before any |\lecture| commands are always included. This command should be given in the preamble.
 
-  \example |\includeonlylecture{week 1}|
+  \example
+  |\includeonlylecture{week 1}|
 
   \articlenote
   This command has no effect in |article| mode.
@@ -571,7 +430,7 @@ insert, say, a title page at the beginning of (each) lecture.
 \begin{command}{\AtBeginLecture\marg{text}}
   The given text will be inserted at the beginning of every
   lecture.
-  
+
   \example
 \begin{verbatim}
 \AtBeginLecture{\frame{\Large Today's Lecture: \insertlecture}}
@@ -584,13 +443,11 @@ insert, say, a title page at the beginning of (each) lecture.
 
 \subsection{Adding a Table of Contents}
 
-You can create a table of contents using the command
-|\tableofcontents|. Unlike the normal \LaTeX\ table of contents
-command, this command takes an optional parameter in square brackets
-that can be used to create certain special effects.
+You can create a table of contents using the command |\tableofcontents|. Unlike the normal \LaTeX\ table of contents command, this command takes an optional parameter in square brackets that can be used to create certain special effects.
 
 \begin{command}{\tableofcontents\oarg{comma-separated option list}}
   Inserts a table of contents into the current frame.
+
   \example
 \begin{verbatim}
 \section*{Outline}
@@ -615,207 +472,108 @@ that can be used to create certain special effects.
   The following options can be given:
   \begin{itemize}
   \item
-    \declare{|currentsection|} causes all sections but the current to
-    be shown in a semi-transparent way. Also, all subsections but
-    those in the current section are shown in the semi-transparent
-    way. This command is a shorthand for specifying the following
-    options: 
+    \declare{|currentsection|} causes all sections but the current to be shown in a semi-transparent way. Also, all subsections but those in the current section are shown in the semi-transparent way. This command is a shorthand for specifying the following options:
+
 \begin{verbatim}
 sectionstyle=show/shaded,subsectionstyle=show/show/shaded
 \end{verbatim}
   \item
-    \declare{|currentsubsection|} causes all subsections but the
-    current subsection in the current section to be shown in a
-    semi-transparent way. This command is a shorthand for specifying
-    the option |subsectionstyle=show/shaded|.
+    \declare{|currentsubsection|} causes all subsections but the current subsection in the current section to be shown in a semi-transparent way. This command is a shorthand for specifying the option |subsectionstyle=show/shaded|.
   \item
-    \declare{|firstsection=|\meta{section number}} specifies which
-    section should be numbered as section~``1.''  This is useful if
-    you have a first section (like an overview section) that should
-    not receive a number. Section numbers are not shown by default. To
-    show them, you must install a different table of contents
-    templates.
+    \declare{|firstsection=|\meta{section number}} specifies which section should be numbered as section~``1.''  This is useful if you have a first section (like an overview section) that should not receive a number. Section numbers are not shown by default. To show them, you must install a different table of contents templates.
   \item
-    \declare{|hideallsubsections|} causes all subsections to be
-    hidden. This command is a shorthand for specifying
-    the option |subsectionstyle=hide|.
+    \declare{|hideallsubsections|} causes all subsections to be hidden. This command is a shorthand for specifying the option |subsectionstyle=hide|.
   \item
-    \declare{|hideothersubsections|} causes the subsections of
-    sections other than the current one to be hidden. This command is
-    a shorthand for specifying the option |subsectionstyle=show/show/hide|.
+    \declare{|hideothersubsections|} causes the subsections of sections other than the current one to be hidden. This command is a shorthand for specifying the option |subsectionstyle=show/show/hide|.
   \item
-    \declare{|part=|\meta{part number}} causes the table of contents
-    of part \meta{part number} to be shown, instead of the table of
-    contents of the current part (which is the default). This option
-    can be combined with the other options, although combining it with
-    the |current| option obviously makes no sense.
+    \declare{|part=|\meta{part number}} causes the table of contents of part \meta{part number} to be shown, instead of the table of contents of the current part (which is the default). This option can be combined with the other options, although combining it with the |current| option obviously makes no sense.
   \item
-    \declare{|pausesections|} causes a |\pause| command to
-    be issued before each section. This is useful if you wish to show
-    the table of contents in an incremental way.
+    \declare{|pausesections|} causes a |\pause| command to be issued before each section. This is useful if you wish to show the table of contents in an incremental way.
   \item
-    \declare{|pausesubsections|} causes a |\pause| command to
-    be issued before each subsection.
+    \declare{|pausesubsections|} causes a |\pause| command to be issued before each subsection.
   \item
-    \declare{|sections=|\marg{overlay specification}} causes only the
-    sections mentioned in the \meta{overlay specification} to be
-    shown. For example, \verb/sections={<2-4| handout:0>}/ causes only the second,
-    third, and fourth section to be shown in the normal version,
-    nothing to be shown in the handout version, and everything to be
-    shown in all other versions. For convenience, if you omit the
-    pointed brackets, the specification is assumed to apply to all
-    versions. Thus |sections={2-4}| causes sections two, three, and
-    four to be shown in all versions.
+    \declare{|sections=|\marg{overlay specification}} causes only the sections mentioned in the \meta{overlay specification} to be shown. For example, \verb/sections={<2-4| handout:0>}/ causes only the second, third, and fourth section to be shown in the normal version, nothing to be shown in the handout version, and everything to be shown in all other versions. For convenience, if you omit the pointed brackets, the specification is assumed to apply to all versions. Thus |sections={2-4}| causes sections two, three, and four to be shown in all versions.
   \item
-    \declare{|sectionstyle=|\meta{style for current
-      section}|/|\meta{style for other sections}} specifies how
-    sections should be displayed. Allowed \meta{styles} are |show|,
-    |shaded|, and |hide|. The first will show the section title
-    normally, the second will show it in a semi-transparent way, and
-    the third will completely suppress it. You can
-    also omit the second style, in which case the first is used for
-    all sections (this is not really useful). 
+    \declare{|sectionstyle=|\meta{style for current section}|/|\meta{style for other sections}} specifies how sections should be displayed. Allowed \meta{styles} are |show|, |shaded|, and |hide|. The first will show the section title normally, the second will show it in a semi-transparent way, and the third will completely suppress it. You can also omit the second style, in which case the first is used for all sections (this is not really useful).
   \item
-    \declare{|subsectionstyle=|\meta{style for current
-      subsection}|/|\meta{style for other subsections in current
-      section}|/|\\\meta{style for subsections in other sections}}
-    specifies how subsections should be displayed. The same styles as
-    for the |sectionstyle| option may be given. You can omit the last
-    style, in which case the second also applies to the last, and you can
-    omit the last two, in which case the first applies to all.
-    \example |subsectionstyle=shaded| causes all subsections to be
-    shaded.
-    \example |subsectionstyle=hide| causes all subsections to be
-    hidden.
-    \example |subsectionstyle=show/shaded| causes all subsections but the
-    current subsection in the current section to be shown in a
-    semi-transparent way.
-    \example |subsectionstyle=show/show/hide| causes all
-    subsections outside the current section to be suppressed.
-    \example |subsectionstyle=show/shaded/hide| causes all
-    subsections outside the current section to be suppressed and only
-    the current subsection in the current section to be hilighted.
+    \declare{|subsectionstyle=|\meta{style for current subsection}|/|\meta{style for other subsections in current section}|/|\\\meta{style for subsections in other sections}} specifies how subsections should be displayed. The same styles as for the |sectionstyle| option may be given. You can omit the last style, in which case the second also applies to the last, and you can omit the last two, in which case the first applies to all.
+    \example
+    |subsectionstyle=shaded| causes all subsections to be shaded.
+    \example
+    |subsectionstyle=hide| causes all subsections to be hidden.
+    \example
+    |subsectionstyle=show/shaded| causes all subsections but the current subsection in the current section to be shown in a semi-transparent way.
+    \example
+    |subsectionstyle=show/show/hide| causes all subsections outside the current section to be suppressed.
+    \example
+    |subsectionstyle=show/shaded/hide| causes all subsections outside the current section to be suppressed and only the current subsection in the current section to be highlighted.
   \end{itemize}
-  The last examples are useful if you do not wish to show
-  too many details when presenting the talk outline.
+
+  The last examples are useful if you do not wish to show too many details when presenting the talk outline.
 
   \articlenote
   The options are ignored in |article| mode.
 
   \lyxnote
-  You can give options to the |\tableofcontents| command by 
-  inserting a \TeX-mode text with the options in square brackets
-  directly after the table of contents.
+  You can give options to the |\tableofcontents| command by inserting a \TeX-mode text with the options in square brackets directly after the table of contents.
 
   \begin{element}{sections/subsections in toc}\semiyes\no\no
-    This is a parent template, whose children are
-    |section in toc| and |subsection in toc|. This means that if you
-    use the |\setbeamertemplate| command on this template, the command
-    is instead called for both of these children (with the same arguments).
+    This is a parent template, whose children are |section in toc| and |subsection in toc|. This means that if you use the |\setbeamertemplate| command on this template, the command is instead called for both of these children (with the same arguments).
 
     \begin{templateoptions}
       \itemoption{default}{}
-      In the default setting, the sections and subsections are typeset
-      using the fonts and colors |section in toc| and
-      |subsection in toc|, though the background colors are ignored. The
-      subsections are indented.
+      In the default setting, the sections and subsections are typeset using the fonts and colors |section in toc| and |subsection in toc|, though the background colors are ignored. The subsections are indented.
       \itemoption{sections numbered}{}
-      Similar to the default setting, but the section numbers are also
-      shown. The subsections are not numbered.
+      Similar to the default setting, but the section numbers are also shown. The subsections are not numbered.
       \itemoption{subsections numbered}{}
-      This time, the subsections are numbered, but not the
-      sections. Nevertheless, since the subsections are ``fully
-      numbered'' as in ``1.2'' or ``3.2,'' if every section has at least
-      one subsection, the section numbered will not really be missed.
+      This time, the subsections are numbered, but not the sections. Nevertheless, since the subsections are ``fully numbered'' as in ``1.2'' or ``3.2,'' if every section has at least one subsection, the section numbered will not really be missed.
       \itemoption{circle}{}
-      Draws little circles before the sections. Inside
-      the circles the section number is shown. The \beamer-font and
-      color |section number projected| is used for typesetting the
-      circles, that is, the circle gets the background color and the
-      text inside the circle the foreground color.
+      Draws little circles before the sections. Inside the circles the section number is shown. The \beamer-font and color |section number projected| is used for typesetting the circles, that is, the circle gets the background color and the text inside the circle the foreground color.
       \itemoption{square}{}
-      Similar to the |circle| option, except that small squares are
-      used instead of circles. Small, unnumbered squares are shown in
-      front of the subsections.
+      Similar to the |circle| option, except that small squares are used instead of circles. Small, unnumbered squares are shown in front of the subsections.
       \itemoption{ball}{}
-      Like |square|, the only difference being the balls are used
-      instead of squares.
+      Like |square|, the only difference being the balls are used instead of squares.
       \itemoption{ball unnumbered}{}
-      Similar to |ball|, except that no numbering is used. This option
-      makes the table of contents look more like an |itemize|.
+      Similar to |ball|, except that no numbering is used. This option makes the table of contents look more like an |itemize|.
     \end{templateoptions}
 
-    If none of the above options suits you, you have to change the
-    templates |section in toc| and |subsection in toc| directly.
+    If none of the above options suits you, you have to change the templates |section in toc| and |subsection in toc| directly.
   \end{element}
 
   \begin{element}{sections/subsections in toc shaded}\semiyes\no\no
-    A parent template with children
-    |section in toc shaded| and |subsection in toc shaded|. They are
-    used to render section and subsection entries when 
-    they are currently shaded; like all non-current subsections in
-    |\tableofcontents[currentsubsection]|. 
+    A parent template with children |section in toc shaded| and |subsection in toc shaded|. They are used to render section and subsection entries when they are currently shaded; like all non-current subsections in |\tableofcontents[currentsubsection]|.
 
     \begin{templateoptions}
       \itemoption{default}{\oarg{opaqueness}}
-      In the default setting, the templates |section in toc shaded| and
-      |subsection in toc shaded| just show whatever the nonshaded
-      versions of these templates show, but only \meta{opaqueness}\%
-      opaque. The default is 20\%.
+      In the default setting, the templates |section in toc shaded| and |subsection in toc shaded| just show whatever the nonshaded versions of these templates show, but only \meta{opaqueness}\% opaque. The default is 20\%.
 
-      \example |\setbeamertemplate{table of contents shaded}[default][50]|
-      makes dimmed entries 50\% transparent. 
+      \example
+      |\setbeamertemplate{table of contents shaded}[default][50]| makes dimmed entries 50\% transparent.
     \end{templateoptions}
   \end{element}
 \end{command}
 
 
+\subsection{Adding a Bibliography}
 
+You can use the bibliography environment and the |\cite| commands of \LaTeX\ in a \beamer\ presentation. You will typically have to typeset your bibliography items partly ``by hand.'' Nevertheless, you \emph{can} use |bibtex| to create a ``first approximation'' of the bibliography. Copy the content of the file |main.bbl| into your presentation. If you are not familiar with |bibtex|, you may wish to consult its documentation. It is a  powerful tool for creating high-quality citations.
 
+Using |bibtex| or your editor, place your bibliographic references in the environment |thebibliography|. This (standard \LaTeX) environment takes one parameter, which should be the longest |\bibitem| label in the following list of bibliographic entries.
 
-\subsection{Adding a Bibliography}
+\begin{environment}{{thebibliography}\marg{longest label text}}
+  Inserts a bibliography into the current frame. The \meta{longest label text} is used to determine the indentation of the list. However, several predefined options for the typesetting of the bibliography ignore this parameter since they replace the references by a symbol.
 
-You can use the bibliography environment and the |\cite| commands
-of \LaTeX\ in a \beamer\ presentation. You will typically have to
-typeset your bibliography items partly ``by hand.'' Nevertheless, you
-\emph{can} use |bibtex| to create a ``first approximation'' of the
-bibliography. Copy the content of the file |main.bbl| into your
-presentation. If you are not familiar with |bibtex|, you may wish
-to consult its documentation. It is a  powerful tool for
-creating high-quality citations.
-
-Using |bibtex| or your editor, place your bibliographic
-references in the environment |thebibliography|. This
-(standard \LaTeX) environment takes one parameter, which should be the
-longest |\bibitem| label in the following list of bibliographic
-entries.
+  Inside the environment, use a (standard \LaTeX) |\bibitem| command for each reference item. Inside each item, use a (standard \LaTeX) |\newblock| command to separate the authors' names, the title, the book/journal reference, and any notes. Each of these commands may introduce a new line or color or other formatting, as specified by the template for bibliographies.
+
+  The environment must be placed inside a frame. If the bibliography does not fit on one frame, you should split it (create a new frame and a second |thebibliography| environment) or use the |allowframebreaks| option. Even better, you should reconsider whether it is a good idea to present so many references.
 
-\begin{environment}{{thebibliography}\marg{longest label text}}
-  Inserts a bibliography into the current frame. The \meta{longest
-    label text} is used to determine the indentation of the list. However,
-  several predefined options for the typesetting of the bibliography
-  ignore this parameter since they replace the references by a symbol.
-
-  Inside the environment, use a (standard \LaTeX) |\bibitem| command
-  for each reference item. Inside each item, use a (standard \LaTeX)
-  |\newblock| command to separate the authors's names, the title, the
-  book/journal reference, and any notes. Each of these commands may
-  introduce a new line or color or other formatting, as specified by
-  the template for bibliographies.
-
-  The environment must be placed inside a frame. If the bibliography
-  does not fit on one frame, you should 
-  split it (create a new frame and a second |thebibliography|
-  environment) or use the |allowframebreaks| option. Even better, you
-  should reconsider whether it is a good idea to present so many
-  references. 
   \example
 \begin{verbatim}
 \begin{frame}
   \frametitle{For Further Reading}
 
   \begin{thebibliography}{Dijkstra, 1982}
-  \bibitem[Solomaa, 1973]{Solomaa1973}
+  \bibitem[Salomaa, 1973]{Salomaa1973}
     A.~Salomaa.
     \newblock {\em Formal Languages}.
     \newblock Academic Press, 1973.
@@ -828,64 +586,34 @@ entries.
 \end{frame}
 \end{verbatim}
 
-  Four templates govern the appearance of the author, title, journal,
-  and note text. These author templates are inserted before the first block
-  of the entry (the first block is all text before the first occurrence of a 
-  |\newblock| command). The title template is inserted before
-  the second block (the text between the first and second occurrence
-  of |\newblock|). Likewise for the journal and note templates.
+  Four templates govern the appearance of the author, title, journal, and note text. These author templates are inserted before the first block of the entry (the first block is all text before the first occurrence of a |\newblock| command). The title template is inserted before the second block (the text between the first and second occurrence of |\newblock|). Likewise for the journal and note templates.
 
-  The templates are inserted \emph{before} the blocks and you do not
-  have access to the blocks themselves via insert commands. The
-  corresponding \beamer-color and -font are also installed before the
-  blocks.
+  The templates are inserted \emph{before} the blocks and you do not have access to the blocks themselves via insert commands. The corresponding \beamer-color and -font are also installed before the blocks.
 
   \begin{element}{bibliography entry author}\yes\yes\yes
-    This template is inserted before the author of a bibliography
-    entry. The color and font are also installed. Note that the effect
-    of this template will persist until the end of the bibliography
-    item or until one of the following templates undo the effect.
+    This template is inserted before the author of a bibliography entry. The color and font are also installed. Note that the effect of this template will persist until the end of the bibliography item or until one of the following templates undo the effect.
 
-    By default, this template does nothing. The default color is the
-    structure color.
+    By default, this template does nothing. The default color is the structure color.
   \end{element}
 
   \begin{element}{bibliography entry title}\yes\yes\yes
-    This template is inserted before the title of a bibliography
-    entry (more precisely, it is inserted after the first occurrence of
-    the |\newblock| command). By default, this template starts a new
-    paragraph, causing a line break. The default color is the normal
-    text color.
+    This template is inserted before the title of a bibliography entry (more precisely, it is inserted after the first occurrence of the |\newblock| command). By default, this template starts a new paragraph, causing a line break. The default color is the normal text color.
   \end{element}
-  
+
   \begin{element}{bibliography entry journal}\yes\yes\yes
-    This template is inserted before the journal of a bibliography
-    entry (the second |\newblock|). By default, this template starts a
-    new paragraph. The default color is a slightly transparent version
-    of the structure color.
+    This template is inserted before the journal of a bibliography entry (the second |\newblock|). By default, this template starts a new paragraph. The default color is a slightly transparent version of the structure color.
   \end{element}
-  
-  
+
   \begin{element}{bibliography entry note}\yes\yes\yes
-    This template is inserted before any note text at the end of a
-    bibliography entry (it is inserted before the third
-    |\newblock|). By default, this template starts a new
-    paragraph. The default color is the same as for the journal.
-  \end{element}  
+    This template is inserted before any note text at the end of a bibliography entry (it is inserted before the third |\newblock|). By default, this template starts a new paragraph. The default color is the same as for the journal.
+  \end{element}
 \end{environment}
 
+\begin{command}{\bibitem\sarg{overlay specification}\oarg{citation text}\marg{label name}}
+  The \meta{citation text} is inserted into the text when the item is cited using |\cite{|\meta{label name}|}| in the main presentation text. For a \beamer\ presentation, this should usually be as long as possible.
 
-\begin{command}{\bibitem\sarg{overlay specification}%
-    \oarg{citation text}\marg{label name}}
-  The \meta{citation text} is inserted into the text when the item is
-  cited using |\cite{|\meta{label name}|}| in the main presentation
-  text. For a \beamer\ presentation, this should usually be as long as
-  possible.  
+  Use |\newblock| commands to separate the authors's names, the title, the book/journal reference, and any notes. If the \meta{overlay specification} is present, the entry will only be shown on the specified slides.
 
-  Use |\newblock| commands to separate the authors's names, the title, the
-  book/journal reference, and any notes. If the \meta{overlay specification}
-  is present, the entry will only be shown on the
-  specified slides.
   \example
 \begin{verbatim}
 \bibitem[Dijkstra, 1982]{Dijkstra1982}
@@ -896,33 +624,23 @@ entries.
 
   \begin{element}{bibliography item}\yes\yes\yes
     \colorfontparents{item}
-    This template is used to render the bibliography item.   Unlike
-    normal \LaTeX, the default template for the bibliography does not
-    repeat the citation text (like ``[Dijkstra, 1982]'') before each
-    item in the bibliography. Instead, a cute, small article symbol is
-    drawn. The rationale is that the audience will not be able to
-    remember any abbreviated citation texts till the end of the
+    This template is used to render the bibliography item. Unlike normal \LaTeX, the default template for the bibliography does not repeat the citation text (like ``[Dijkstra, 1982]'') before each item in the bibliography. Instead, a cute, small article symbol is drawn. The rationale is that the audience will not be able to remember any abbreviated citation texts till the end of the
     talk.
     \begin{templateoptions}
       \itemoption{default}{}
-      Draws a cute little article icon as the reference. Use this for
-      journal articles, parts of books (like conference proceedings),
-      or technical reports.
-      
+      Draws a cute little article icon as the reference. Use this for journal articles, parts of books (like conference proceedings), or technical reports.
+
       \itemoption{article}{}
       Alias for the default.
-      
+
       \itemoption{book}{}
-      Draws a cute little book icon as the reference. Use this for,
-      well, books.
+      Draws a cute little book icon as the reference. Use this for, well, books.
 
       \itemoption{triangle}{}
-      Draws a triangle as the reference. This is more in keeping with
-      the standard itemize items.
+      Draws a triangle as the reference. This is more in keeping with the standard itemize items.
 
       \itemoption{text}{}
-      Uses the reference text (like ``[Dijkstra, 1982]'') as the
-      reference text. Be sure you what you are doing if you use this. 
+      Uses the reference text (like ``[Dijkstra, 1982]'') as the reference text. Be sure you know what you are doing if you use this.
     \end{templateoptions}
     The following insert is useful for the template:
     \begin{itemize}
@@ -933,22 +651,12 @@ entries.
 \end{command}
 
 
-
 \subsection{Adding an Appendix}
 
-You can add an appendix to your talk by using the |\appendix|
-command. You should put frames and perhaps whole subsections into the
-appendix that you do not intend to show during your presentation, but
-which might be useful to answer a question. The |\appendix| command
-essentially just starts a new part named |\appendixname|. However, it
-also sets up certain hyperlinks. 
-Like other parts, the appendix is kept separate of your actual
-talk.
+You can add an appendix to your talk by using the |\appendix| command. You should put frames and perhaps whole subsections into the appendix that you do not intend to show during your presentation, but which might be useful to answer a question. The |\appendix| command essentially just starts a new part named |\appendixname|. However, it also sets up certain hyperlinks. Like other parts, the appendix is kept separate from your actual talk.
 
 \begin{command}{\appendix\sarg{mode specification}}
-  Starts the appendix in the specified modes. All frames, all
-  |\subsection| commands, and all |\section| commands used after this
-  command will not be shown as part of the normal navigation bars.
+  Starts the appendix in the specified modes. All frames, all |\subsection| commands, and all |\section| commands used after this command will not be shown as part of the normal navigation bars.
   \example
 \begin{verbatim}
 \begin{document}
@@ -971,11 +679,3 @@ talk.
 \end{document}
 \end{verbatim}
 \end{command}
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-graphics.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-graphics.tex
index 19e4c997fe4..a8e845e2bda 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-graphics.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-graphics.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,32 +8,19 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-graphics.tex,v 1.9 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Graphics}
-
-
 \label{section-graphics}
 
-In the following, the advantages and disadvantages of different
-possible ways of creating graphics for \beamer\ presentations are
-discussed. Much of the information presented in the following is not
-really special to \beamer, but applies to any other document class as well.
+In the following, the advantages and disadvantages of different possible ways of creating graphics for \beamer\ presentations are discussed. Much of the information presented in the following is not really special to \beamer, but applies to any other document class as well.
 
 
 \subsection{Including External Graphic Files Versus Inlines Graphics}
 
-There are two principal ways of creating \TeX-documents that include
-graphics: Either the graphic resides in an external file that is
-\emph{included} or the graphic is \emph{inlined}, which means that
-\TeX-file contains a bunch commands like ``draw a red line from
-here to there.'' In the following, the advantages and disadvantages of
-these two approaches are discussed.
+There are two principal ways of creating \TeX-documents that include graphics: Either the graphic resides in an external file that is \emph{included} or the graphic is \emph{inlined}, which means that \TeX-file contains a bunch of commands like ``draw a red line from here to there.'' In the following, the advantages and disadvantages of these two approaches are discussed.
 
-You can use an external program, like |xfig| or the Gimp, to create a
-graphic. These programs have an option to \emph{export} graphic files
-in a format that can then be inserted into the presentation.
+You can use an external program, like |xfig|, GIMP or Inkscape, to create a graphic. These programs have an option to \emph{export} graphic files in a format that can then be inserted into the presentation.
 
 The main advantage is:
 \begin{itemize}
@@ -43,43 +31,23 @@ The main advantage is:
 The main disadvantages are:
 \begin{itemize}
 \item
-  You  have to worry about many files. Typically there are at least
-  two for each presentation, namely the program's graphic data file and the
-  exported graphic file in a format that can be read by \TeX.
+  You  have to worry about many files. Typically there are at least two for each presentation, namely the program's graphic data file and the exported graphic file in a format that can be read by \TeX.
 \item
-  Changing the graphic using the program does not automatically change
-  the graphic in the presentation. Rather, you must reexport the
-  graphic and rerun \LaTeX.
+  Changing the graphic using the program does not automatically change the graphic in the presentation. Rather, you must reexport the graphic and rerun \LaTeX.
 \item
-  It may be difficult to get the line width, fonts, and font sizes
-  right.
+  It may be difficult to get the line width, fonts, and font sizes right.
 \item
-  Creating formulas as part of graphics is often difficult or
-  impossible.
+  Creating formulas as part of graphics is often difficult or impossible.
 \end{itemize}
 
-You can use all the standard \LaTeX\ commands for inserting graphics,
-like |\includegraphics| (be sure to include the package
-|graphics| or |graphicx|). Also, the |pgf| package offers commands for
-including graphics. Either will work fine in most situations, so
-choose whichever you like. Like |\pgfdeclareimage|,
-|\includegraphics| also includes an image only once in a |.pdf| file,
-even if it used several times (as a matter of fact, the |graphics|
-package is even a bit smarter about this than |pgf|). However,
-currently only |pgf| offers the ability to include images that are
-partly transparent.
+You can use all the standard \LaTeX\ commands for inserting graphics, like |\includegraphics| (be sure to include the package |graphics| or |graphicx|). Also, the |pgf| package offers commands for including graphics. Either will work fine in most situations, so choose whichever you like. Like |\pgfdeclareimage|, |\includegraphics| also includes an image only once in a |.pdf| file, even if it used several times (as a matter of fact, the |graphics| package is even a bit smarter about this than |pgf|). However, currently only |pgf| offers the ability to include images that are partly transparent.
 
-At the end of this section you will find notes on how to include
-specific graphic formats like |.eps| or |.jpg|.
+At the end of this section you will find notes on how to include specific graphic formats like |.eps| or |.jpg|.
 
 \lyxnote
 You can use the usual ``Insert Graphic'' command to insert a graphic.
 
-The commands |\includegraphics|, |\pgfuseimage|, and |\pgfimage| are
-overlay-specification-aware in \beamer. If the overlay specification
-does not apply, the command has no effect. This is useful for creating
-a simple animation where each picture of the animation resides in a
-different file:
+The commands |\includegraphics|, |\pgfuseimage|, and |\pgfimage| are overlay-specification-aware in \beamer. If the overlay specification does not apply, the command has no effect. This is useful for creating a simple animation where each picture of the animation resides in a different file:
 
 \begin{verbatim}
 \begin{frame}
@@ -88,129 +56,60 @@ different file:
   \includegraphics<3>[height=2cm]{step3.pdf}%
 \end{frame}
 \end{verbatim}
-
-
-A different way of creating graphics is to insert
-graphic drawing commands directly into your \LaTeX\ file. There are numerous
-packages that help you do this. They have various degrees of
-sophistication. Inlining graphics suffers from none of the
-disadvantages mentioned above for including external graphic files,
-but the main disadvantage is that it is often hard to use
-these packages. In some sense, you ``program'' your graphics, which 
-requires a bit of practice.
+A different way of creating graphics is to insert graphic drawing commands directly into your \LaTeX\ file. There are numerous packages that help you do this. They have various degrees of sophistication. Inlining graphics suffers from none of the disadvantages mentioned above for including external graphic files, but the main disadvantage is that it is often hard to use these packages. In some sense, you ``program'' your graphics, which requires a bit of practice.
 
 When choosing a graphic package, there are a few things to keep in
 mind:
 \begin{itemize}
 \item
-  Many packages produce poor quality graphics. This is especially true
-  of the standard |picture| environment of \LaTeX.
+  Many packages produce poor quality graphics. This is especially true of the standard |picture| environment of \LaTeX.
 \item
-  Powerful packages that produce high-quality graphics often do not
-  work together with |pdflatex|.
+  Powerful packages that produce high-quality graphics often do not work together with |pdflatex|, |lualatex| or |xelatex|.
 \item
-  The most powerful and easiest-to-use package around, namely
-  |pstricks|, does not work together with |pdflatex| and
-  this is a fundamental problem. Due to the fundamental differences
-  between \textsc{pdf} and PostScript, it is not possible to write a
-  ``|pdflatex| back-end for |pstricks|.''
+  The most powerful and easiest-to-use package around, namely |pstricks|, does not work together with |pdflatex|, |lualatex| or |xelatex| and this is a fundamental problem. Due to the fundamental differences between \pdf\ and PostScript, it is not possible to write a ``|pdflatex| back-end for |pstricks|.'' (Situation with |lualatex| and |xelatex| is very similar.) Regardless, \textsc{pst-pdf}, \textsc{xetex-pstricks} and \textsc{pdftricks} package can help here and simplify things from user's perspective.
 \end{itemize}
 
-A solution to the above problem (though not necessarily the best) is
-to use the \textsc{pgf} package. It produces high-quality graphics and
-works together with |pdflatex|, but also with normal
-|latex|. It is not as powerful as |pstricks| (as pointed
-out above, this is because of rather fundamental reasons) and not as
-easy to use, but it should be sufficient in most cases.
+There are three possible solutions to the above problem, each with it's own advantages and disadvantages.
+\begin{itemize}
+\item
+  Use the \textsc{pgf} package. It produces high-quality graphics and works together with |pdflatex|, |lualatex|, |xelatex| and also with normal |latex|. It is not as powerful as |pstricks| (as pointed out above, this is because of rather fundamental reasons) and not as easy to use, but it should be sufficient in most cases.
+\item
+  Use \textsc{luamplib} package and |lualatex|. It provides you with an environment using which you can type MetaPost code directly in your document.
+\item 
+  Use |pstricks| and stick to |latex| and |dvips| or use some of the workarounds mentioned above.
+\end{itemize}
 
 \lyxnote
-Inlined graphics must currently by inserted in a large \TeX-mode
-box. This is not very convenient.
+Inlined graphics must currently be inserted in a large \TeX-mode box. This is not very convenient.
 
 
 \subsection{Including Graphic Files Ending \texttt{.eps} or \texttt{.ps}}
 
-External graphic files ending with the extension |.eps| (Encapsulated
-PostScript) or |.ps| (PostScript) can be included if you use |latex|
-and |dvips|, but \emph{not} when using |pdflatex|. This is true
-both for the normal |graphics| package and for |pgf|. When using
-|pgf|, do \emph{not} add the extension |.eps|. When using
-|graphics|, do add the extension.
+External graphic files ending with the extension |.eps| (Encapsulated PostScript) or |.ps| (PostScript) can be included if you use |latex| and |dvips|, but \emph{not} when using |pdflatex|. This is true both for the normal |graphics| package and for |pgf|. When using |pgf|, do \emph{not} add the extension |.eps|. When using |graphics|, do add the extension.
 
-If you have a |.eps| graphic and wish to use |pdflatex|, you can use
-the program |ps2pdf| to convert the graphic to a |.pdf| file. Note,
-however, that it is often a better idea to directly generate a |.pdf|
-if the program that produced the |.eps| supports this.
+If you have a |.eps| graphic and wish to use |pdflatex|, you can use the program |ps2pdf| to convert the graphic to a |.pdf| file. Some modern distributions enable |write18| which allows |pdflatex| to do that automatically. Note, however, that it is often a better idea to directly generate a |.pdf| if the program that produced the |.eps| supports this.
 
 
-\subsection{Including Graphic Files Ending \texttt{.pdf},
-  \texttt{.jpg}, \texttt{.jpeg} or \texttt{.png}}
+\subsection{Including Graphic Files Ending \texttt{.pdf}, \texttt{.jpg}, \texttt{.jpeg} or \texttt{.png}}
 
-The four formats |.pdf|, |.jpg|, |.jpeg|, and |.png| can only be
-included by |pdflatex|. As before, do not add these extension when
-using |pgf|, but do add them when using |graphics|. If your graphic
-file has any of these formats and you wish/must you |latex| and
-|dvips|, you  have to convert your graphic to |.eps| first.
+The four formats |.pdf|, |.jpg|, |.jpeg|, and |.png| can only be included by |pdflatex|. As before, do not add these extension when using |pgf|, but do add them when using |graphics|. If your graphic file has any of these formats and you wish/must use |latex| and |dvips|, you  have to convert your graphic to |.eps| first.
 
 
 \subsection{Including Graphic Files Ending \texttt{.mps}}
 
-A graphic file ending |.mps| (MetaPost PostScript) is a special kind
-of Encapsulated PostScript file. Files in this format are produced by
-the MetaPost program. As you know, \TeX\ is a program that converts
-simple plain text into beautifully typeset documents. The MetaPost
-program is similar, only it converts simple plain text into beautiful
-graphics.
-
-The MetaPost program converts a plain text file ending |.mp|
-into an |.mps| file (although for some unfathomable reason the
-extension is not added). The |.mp| file 
-must contain text written in the MetaFont programming language. Since
-|.mps| files are actually also |.eps| files, you can use the normal 
-|\includegraphics| command to include them.
-
-However, as a special bonus, you can \emph{also}
-include such a file when using |pdflatex|. Normally, |pdflatex| cannot
-handle |.eps| files, but the |.mps| files produced by MetaPost have
-such a simple and special structure that this is possible. The |graphics|
-package implements some filters to convert such PostScript output to
-\pdf\ on-the-fly. For this to work, the file should end |.mps| instead
-of |.eps|. The following command can be used to make the |graphics|
-package just \emph{assume} the extension |.mps| for any file it knows
-nothing about (like files ending with |.1|, which is what MetaPost
-loves to produce): 
+A graphic file ending |.mps| (MetaPost PostScript) is a special kind of Encapsulated PostScript file. Files in this format are produced by the MetaPost program. As you know, \TeX\ is a program that converts simple plain text into beautifully typeset documents. The MetaPost program is similar, only it converts simple plain text into beautiful graphics.
+
+The MetaPost program converts a plain text file ending |.mp| into an |.mps| file (although for some unfathomable reason the extension is not added). The |.mp| file must contain text written in the MetaFont programming language. Since |.mps| files are actually also |.eps| files, you can use the normal |\includegraphics| command to include them.
+
+However, as a special bonus, you can \emph{also} include such a file when using |pdflatex|. Normally, |pdflatex| cannot handle |.eps| files, but the |.mps| files produced by MetaPost have such a simple and special structure that this is possible. The |graphics| package implements some filters to convert such PostScript output to \pdf\ on-the-fly. For this to work, the file should end |.mps| instead of |.eps|. The following command can be used to make the |graphics| package just \emph{assume} the extension |.mps| for any file it knows nothing about (like files ending with |.1|, which is what MetaPost loves to produce):
 \begin{verbatim}
 \DeclareGraphicsRule{*}{mps}{*}{}
 \end{verbatim}
-
-This special feature currently  only works with the |graphics|
-package, not with |pgf|.
-
+This special feature currently only works with the |graphics| package, not with |pgf|.
 
 
 \subsection{Including Graphic Files Ending \texttt{.mmp}}
 
-The format |.mmp| (Multi-MetaPost) is actually not format that can be
-included directly in a \TeX-file. Rather, like a |.mp| file, it first
-has to be converted using the MetaPost program. The crucial difference
-between |.mp| and |.mmp| is that in the latter multiple graphics
-can reside in a single |.mmp| file (actually, multiple graphics can
-also reside in a |.mp| file, but by convention such a file is called
-|.mmp|). When running MetaPost on a |.mmp| file, it will create not a
-single encapsulated PostScript file, but several, ending |.0|, |.1|,
-|.2|, and so on. The idea is that |.0| might contain a main graphics
-and the following pictures contain overlay material that should be
-incrementally added to this graphic. 
-
-To include the series of resulting files, you can use the command
-|\multiinclude| from the |mpmulti| or from the |xmpmulti| package. How
-this program works is explained in Section~\ref{section-mpmulti}.
-
-
-
-
+The format |.mmp| (Multi-MetaPost) is actually not a format that can be included directly in a \TeX-file. Rather, like a |.mp| file, it first has to be converted using the MetaPost program. The crucial difference between |.mp| and |.mmp| is that in the latter multiple graphics can reside in a single |.mmp| file (actually, multiple graphics can also reside in a |.mp| file, but by convention such a file is called |.mmp|). When running MetaPost on a |.mmp| file, it will create not a single encapsulated PostScript file, but several, ending |.0|, |.1|, |.2|, and so on. The idea is that |.0| might contain a main graphic and the following pictures contain overlay material that should be incrementally added to this graphic.
 
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+To include the series of resulting files, you can use the command |\multiinclude| from the |mpmulti| or from the |xmpmulti| package. How this program works is explained in Section~\ref{section-mpmulti}.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-guidelines.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-guidelines.tex
index 073e7d1eb76..5a5237f5dd4 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-guidelines.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-guidelines.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,808 +8,364 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-guidelines.tex,v 1.11 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Guidelines for Creating Presentations}
-
-
 \label{section-guidelines}
 
-In this section I sketch the guidelines that I try to stick to when I
-create presentations. These guidelines either arise out of experience,
-out of common sense, or out of recommendations by other people or
-books. These rules are certainly not intended as commandments that, if
-not followed, will result in catastrophe. The central rule of
-typography also applies to creating presentations: \emph{Every rule
-  can be broken, but no rule may be ignored.} 
-
-
+In this section we sketch the guidelines that we try to stick to when we create presentations. These guidelines either arise out of experience, out of common sense, or out of recommendations by other people or books. These rules are certainly not intended as commandments that, if not followed, will result in catastrophe. The central rule of typography also applies to creating presentations: \emph{Every rule can be broken, but no rule may be ignored.}
 
 
 \subsection{Structuring a Presentation}
-
 \label{section-structure-guidelines}
 
-
-
 \subsubsection{Know the Time Constraints}
 
-When you start to create a presentation, the very first thing you
-should worry about is the amount of time you have for your
-presentation. Depending on the occasion, this can
-be anything between 2 minutes and two hours.
-
+When you start to create a presentation, the very first thing you should worry about is the amount of time you have for your presentation. Depending on the occasion, this can be anything between 2 minutes and two hours.
 \begin{itemize}
 \item
-  A simple rule for the number of frames is that you should have at
-  most one frame per minute.
+  A simple rule for the number of frames is that you should have at most one frame per minute.
 \item
-  In most situations, you will have less time for your presentation
-  that you would like.
+  In most situations, you will have less time for your presentation that you would like.
 \item
-  \emph{Do not try to squeeze more into a presentation than time
-  allows for.} No matter how important some detail seems to you, it is
-  better to leave it out, but get the main message across, than
-  getting neither the main message nor the detail across.
+  \emph{Do not try to squeeze more into a presentation than time allows for.} No matter how important some detail seems to you, it is better to leave it out, but get the main message across, than getting neither the main message nor the detail across.
 \end{itemize}
 
-In many situations, a quick appraisal of how much time you have will
-show that you won't be able to mention certain details. Knowing this can
-save you hours of work on preparing slides that you would have to remove
-later anyway.
-
-
+In many situations, a quick appraisal of how much time you have will show that you won't be able to mention certain details. Knowing this can save you hours of work on preparing slides that you would have to remove later anyway.
 
 \subsubsection{Global Structure}
 
-To create the ``global structure'' of a presentation, with the time
-constraints in mind, proceed as follows:
+To create the ``global structure'' of a presentation, with the time constraints in mind, proceed as follows:
 \begin{itemize}
 \item
-  Make a mental inventory of the things you can reasonably talk about
-  within the time available.
+  Make a mental inventory of the things you can reasonably talk about within the time available.
 \item
   Categorize the inventory into sections and subsections.
 \item
-  For very long talks (like a 90 minute lecture), you might also
-  divide your talk into independent parts (like a ``review of the
-  previous lecture part'' and a ``main part'') using the |\part|
-  command. Note that each  part has its own table of contents. 
+  For very long talks (like a 90 minute lecture), you might also divide your talk into independent parts (like a ``review of the previous lecture part'' and a ``main part'') using the |\part| command. Note that each  part has its own table of contents.
 \item
-  Do not feel afraid to change the structure later on as you work on
-  the talk.
+  Do not feel afraid to change the structure later on as you work on the talk.
 \end{itemize}
 
-
-
 \paragraph{Parts, Section, and Subsections.}
 
 \begin{itemize}
 \item
-  Do not use more than four sections and not less than two per
-  part.
+  Do not use more than four sections and not less than two per part.
 \end{itemize}
-Even four sections are usually too much, unless they follow 
-a very easy pattern. Five and more sections are simply too hard to
-remember for the audience. After all, when you present the table of
-contents, the audience will not yet really be able to grasp the
-importance and relevance of the different sections and will most
-likely have forgotten them by the time you reach them.
 
+Even four sections are usually too much, unless they follow a very easy pattern. Five and more sections are simply too hard to remember for the audience. After all, when you present the table of contents, the audience will not yet really be able to grasp the importance and relevance of the different sections and will most likely have forgotten them by the time you reach them.
 \begin{itemize}
 \item
-  Ideally, a table of contents should be understandable by itself. In
-  particular, it should be comprehensible \emph{before} someone has
-  heard your talk.
+  Ideally, a table of contents should be understandable by itself. In particular, it should be comprehensible \emph{before} someone has heard your talk.
 \item
   Keep section and subsection titles self-explaining.
-\item   
-  Both the sections and the subsections should follow a logical
-  pattern.
 \item
-  Begin with an explanation of what your talk is all about. (Do
-  not assume that everyone knows this. The \emph{Ignorant Audience
-  Law} states: Someone important in the audience always knows less
-  than you think everyone should know, even if you take the Ignorant
-  Audience Law into account.) 
+  Both the sections and the subsections should follow a logical pattern.
+\item
+  Begin with an explanation of what your talk is all about. (Do not assume that everyone knows this. The \emph{Ignorant Audience Law} states: Someone important in the audience always knows less than you think everyone should know, even if you take the Ignorant Audience Law into account.)
 \item
-  Then explain what you or someone else has found out concerning the
-  subject matter.
+  Then explain what you or someone else has found out concerning the subject matter.
 \item
-  Always conclude your talk with a summary that repeats the main
-  message of the talk in a short and simple way. People pay most
-  attention at the beginning and at the end of talks. The summary is
-  your ``second chance'' to get across a message.
+  Always conclude your talk with a summary that repeats the main message of the talk in a short and simple way. People pay most attention at the beginning and at the end of talks. The summary is your ``second chance'' to get across a message.
 \item
-  You can also add an appendix part using the |\appendix| command. Put
-  everything into this part that you do not actually intend to talk
-  about, but that might come in handy when questions are asked.
+  You can also add an appendix part using the |\appendix| command. Put everything into this part that you do not actually intend to talk about, but that might come in handy when questions are asked.
 \item
   Do not use subsubsections, they are evil.
 \end{itemize}
 
-
-
 \paragraph{Giving an Abstract}
 
-In papers, the abstract gives a short summary of the whole paper in
-about 100 words. This summary is intend to help readers appraise
-whether they should read the whole paper or not.
+In papers, the abstract gives a short summary of the whole paper in about 100 words. This summary is intend to help readers appraise whether they should read the whole paper or not.
 \begin{itemize}
 \item
-  Since you audience is unlikely to flee after the first slide, in
-  a presentation you usually do not need to present an abstract.
+  Since your audience is unlikely to flee after the first slide, in a presentation you usually do not need to present an abstract.
+\item
+  However, if you can give a nice, succinct statement of your talk, you might wish to include an abstract.
 \item
-  However, if you can give a nice, succinct statement of your
-  talk, you might wish to include an abstract.
-\item  
-  If you include an abstract, be sure that it is \emph{not} some long 
-  text but just a very short message.
+  If you include an abstract, be sure that it is \emph{not} some long text but just a very short message.
 \item
-  \emph{Never, ever} reuse a paper abstract for a presentation,
-  \emph{except} if the abstract is ``We show $\operatorname{P} =
-  \operatorname{NP}$'' or ``We show $\operatorname{P} \neq
-  \operatorname{NP}$''
+  \emph{Never, ever} reuse a paper abstract for a presentation, \emph{except} if the abstract is ``We show $\operatorname{P} = \operatorname{NP}$'' or ``We show $\operatorname{P} \neq \operatorname{NP}$''
 \item
-  If your abstract is one of the above two, double-check whether
-  your proof is correct.
+  If your abstract is one of the above two, double-check whether your proof is correct.
 \end{itemize}
 
+\paragraph{Numbered Theorems and Definitions.}
 
+A common way of globally structuring (math) articles and books is to use consecutively numbered definitions and theorems. Unfortunately, for presentations the situation is a bit more complicated and we would like to discourage using numbered theorems in presentations. The audience has no chance of remembering these numbers. \emph{Never} say things like ``now, by Theorem~2.5 that I showed you earlier, we have \dots'' It would be much better to refer to, say, Kummer's Theorem instead of Theorem~2.5. If Theorem~2.5 is some obscure theorem that does not have its own name (unlike Kummer's Theorem or Main Theorem or Second Main Theorem or Key Lemma), then the audience will have forgotten about it anyway by the time you refer to it again.
 
+In our opinion, the only situation in which numbered theorems make sense in a presentation is in a lecture, in which the students can read lecture notes in parallel to the lecture where the theorems are numbered in exactly the same way.
 
-
-\paragraph{Numbered Theorems and Definitions.}
-
-A common way of globally structuring (math) articles and books is to
-use consecutively numbered definitions and theorems. Unfortunately,
-for presentations the situation is a bit more complicated and I would
-like to discourage using numbered theorems in presentations. The
-audience has no chance of remembering these numbers. \emph{Never} say
-things like ``now, by Theorem~2.5 that I showed you earlier, we have
-\dots'' It would be much better to refer to, say, Kummer's Theorem
-instead of Theorem~2.5. If Theorem~2.5 is some obscure theorem that
-does not have its own name (unlike Kummer's Theorem or Main Theorem or
-Second Main Theorem or Key Lemma), then the audience will have
-forgotten about it anyway by the time you refer to it again.
-
-In my opinion, the only situation in which numbered theorems make
-sense in a presentation is in a lecture, in which the students can read
-lecture notes in parallel to the lecture where the theorems are
-numbered in exactly the same way.
-
-If you do number theorems and definition, number everything
-consecutively. Thus if there are one theorem, one lemma, 
-and one definition, you would have Theorem~1, Lemma~2, and
-Definition~3. Some people prefer all three to be numbered~1. I would
-\emph{strongly} like to discourage this. The problem is that this
-makes it virtually impossible to find anything since Theorem~2 might
-come after Definition~10 or the other way round. Papers and, worse,
-books that have a Theorem~1 and a Definition~1 are a pain.
+If you do number theorems and definition, number everything consecutively. Thus if there are one theorem, one lemma, and one definition, you would have Theorem~1, Lemma~2, and Definition~3. Some people prefer all three to be numbered~1. We would \emph{strongly} like to discourage this. The problem is that this makes it virtually impossible to find anything since Theorem~2 might come after Definition~10 or the other way round. Papers and, worse, books that have a Theorem~1 and a Definition~1 are a pain.
 \begin{itemize}
 \item
   Do not inflict pain on other people.
 \end{itemize}
 
-
 \paragraph{Bibliographies.}
 
-You may also wish to present a bibliography at the end of your talk,
-so that people can see what kind of ``further reading'' is possible. 
-When adding a bibliography to a presentation, keep the following in mind:
-
+You may also wish to present a bibliography at the end of your talk, so that people can see what kind of ``further reading'' is possible. When adding a bibliography to a presentation, keep the following in mind:
 \begin{itemize}
 \item
-  It is a bad idea to present a long bibliography in a 
-  presentation. Present only very few references. (Naturally, this
-  applies only to the talk itself, not to a possible handout.)
+  It is a bad idea to present a long bibliography in a presentation. Present only very few references. (Naturally, this applies only to the talk itself, not to a possible handout.)
 \item
-  If you present more references than fit on a single slide you can be 
-  almost sure that none of them will not be remembered. 
+  If you present more references than fit on a single slide you can be almost sure that none of them will be remembered.
 \item
-  Present references only if they are intended as ``further reading.''
-  Do not present a list of all things you used like in a paper.
+  Present references only if they are intended as ``further reading.'' Do not present a list of all things you used like in a paper.
 \item
-  You should not present a long list of all your other great papers
-  \emph{except} if you are giving an application talk.
+  You should not present a long list of all your other great papers \emph{except} if you are giving an application talk.
 \item
-  Using the |\cite| commands can be confusing since the audience
-  has little chance of remembering the citations. If you cite the
-  references, always cite them with full author name and year like
-  ``[Tantau, 2003]'' instead of something like ``[2,4]'' or
-  ``[Tan01,NT02]''.
+  Using the |\cite| commands can be confusing since the audience has little chance of remembering the citations. If you cite the references, always cite them with full author name and year like ``[Tantau, 2003]'' instead of something like ``[2,4]'' or ``[Tan01,NT02]''.
 \item
-  If you want to be modest, you can abbreviate your name when citing
-  yourself as in ``[Nickelsen and T., 2003]'' or ``[Nickelsen and T,
-  2003]''. However, this can be confusing for the audience since it is
-  often not immediately clear who exactly ``T.'' might be. I recommend
-  using the full name.
+  If you want to be modest, you can abbreviate your name when citing yourself as in ``[Nickelsen and T., 2003]'' or ``[Nickelsen and T, 2003]''. However, this can be confusing for the audience since it is often not immediately clear who exactly ``T.'' might be. We recommend using the full name.
 \end{itemize}
 
-
-
-
 \subsubsection{Frame Structure}
-
 \label{section-frame-guidelines}
 \label{section-guidelines-local}
 
-Just like your whole presentation, each frame should also be
-structured. A frame that is solely filled with some long text is very
-hard to follow. It is your job to structure the contents of each frame
-such that, ideally, the audience immediately seems which information
-is important, which information is just a detail, how the presented
-information is related, and so on.
-
-
+Just like your whole presentation, each frame should also be structured. A frame that is solely filled with some long text is very hard to follow. It is your job to structure the contents of each frame such that, ideally, the audience immediately seems which information is important, which information is just a detail, how the presented information is related, and so on.
 
 \paragraph{The Frame Title}
 
 \begin{itemize}
 \item
-  Put a title on each frame. The title explains the contents of the
-  frame to people who did not follow all details on the slide.
-\item
-  The title should really \emph{explain} things, not just give a
-  cryptic summary that cannot be understood unless one has understood
-  the whole slide. For example, a title like ``The Poset'' will have
-  everyone puzzled what this slide might be about. Titles like
-  ``Review of the Definition of Partially Ordered Sets (Posets)'' or
-  ``A Partial Ordering on the Columns of the Genotype Matrix'' are
-  \emph{much} more informative.
-\item
-  Ideally, titles on consecutive frames should ``tell a story'' all by
-  themselves.
-\item
-  In English, you should \emph{either} \emph{always} capitalize all words in
-  a frame title except for words like ``a'' or ``the'' (as in a
-  title), \emph{or} you \emph{always} use the normal lowercase
-  letters. Do \emph{not} mix this; stick to one rule. The same is true
-  for block titles. For example, do not use titles like ``A short
-  Review of Turing machines.'' Either use ``A Short Review of Turing
-  Machines.'' or ``A short review of Turing machines.'' (Turing is
-  still spelled with a capital letter since it is a name).
-\item
-  In English, the title of the whole document should be
-  capitalized, regardless of whether you capitalize anything else.
-\item
-  In German and other languages that have lots of capitalized words,
-  always use the correct upper-/lowercase letters. Never capitalize
-  anything in addition to what is usually capitalized.
+  Put a title on each frame. The title explains the contents of the frame to people who did not follow all details on the slide.
+\item
+  The title should really \emph{explain} things, not just give a cryptic summary that cannot be understood unless one has understood the whole slide. For example, a title like ``The Poset'' will have everyone puzzled what this slide might be about. Titles like ``Review of the Definition of Partially Ordered Sets (Posets)'' or ``A Partial Ordering on the Columns of the Genotype Matrix'' are \emph{much} more informative.
+\item
+  Ideally, titles on consecutive frames should ``tell a story'' all by themselves.
+\item
+  In English, you should \emph{either} \emph{always} capitalize all words in a frame title except for words like ``a'' or ``the'' (as in a title), \emph{or} you \emph{always} use the normal lowercase letters. Do \emph{not} mix this; stick to one rule. The same is true for block titles. For example, do not use titles like ``A short Review of Turing machines.'' Either use ``A Short Review of Turing Machines.'' or ``A short review of Turing machines.'' (Turing is still spelled with a capital letter since it is a name).
+\item
+  In English, the title of the whole document should be capitalized, regardless of whether you capitalize anything else.
+\item
+  In German and other languages that have lots of capitalized words, always use the correct upper-/lowercase letters. Never capitalize anything in addition to what is usually capitalized.
 \end{itemize}
 
-
-
 \paragraph{How Much Can I Put On a Frame?}
 
 \begin{itemize}
 \item
-  A frame with too little on it is better than a frame with too much
-  on it. A usual frame should have between 20 and 40 words. The
-  maximum should be at about 80 words.
-\item
-  Do not assume that everyone in the audience is an expert on the
-  subject matter. Even if the
-  people listening to you should be experts, they may last have heard
-  about things you consider obvious several years ago. You should
-  always have the time for a quick reminder of what exactly a
-  ``semantical complexity class'' or an ``$\omega$-complete partial
-  ordering'' is.
-\item
-  Never put anything on a slide that you are not going to explain
-  during the talk, not even to impress anyone with how
-    complicated your subject matter really is. However, you may
-  explain things that are not on a slide.
-\item
-  Keep it simple. Typically, your audience will see a slide for less
-  than 50 seconds. They will not have the time to puzzle through long
-  sentences or complicated formulas.
-\item
-  Lance Forthnow claims: PowerPoint users give better talks. His
-  reason: Since PowerPoint is so bad at typesetting math, they use
-  less math, making their talks easier to understand.
-
-  There is some truth in this in my opinion. The great
-  math-typesetting capabilities of \TeX\ can easily lure you into
-  using many more formulas than is necessary and healthy. For example,
-  instead of writing {\catcode `|=12``Since $\left|\{x \in \{0,1\}^*
-  \mid x \sqsubseteq y\}\right| < \infty$}, we have\dots''\ use ``Since
-  $y$ has only finitely many prefixes, we have\dots''
-
-  You will be surprised how much mathematical text can be reformulated
-  in plain English or can just be omitted. Naturally, if some
-  mathematical argument is what you are actually talking about, as in
-  a math lecture, make use of \TeX's typesetting capabilities to your
-  heart's content. 
-\end{itemize}
+  A frame with too little on it is better than a frame with too much on it. A usual frame should have between 20 and 40 words. The maximum should be at about 80 words.
+\item
+  Do not assume that everyone in the audience is an expert on the subject matter. Even if the people listening to you should be experts, they may last have heard about things you consider obvious several years ago. You should always have the time for a quick reminder of what exactly a ``semantical complexity class'' or an ``$\omega$-complete partial ordering'' is.
+\item
+  Never put anything on a slide that you are not going to explain during the talk, not even to impress anyone with how complicated your subject matter really is. However, you may explain things that are not on a slide.
+\item
+  Keep it simple. Typically, your audience will see a slide for less than 50 seconds. They will not have the time to puzzle through long sentences or complicated formulas.
+\item
+  Lance Fortnow, a professor of computer science, claims: PowerPoint users give better talks. His reason: Since PowerPoint is so bad at typesetting math, they use less math, making their talks easier to understand.
 
+  There is some truth in this in our opinion. The great math-typesetting capabilities of \TeX\ can easily lure you into using many more formulas than is necessary and healthy. For example, instead of writing {\catcode `|=12``Since $\left|\{x \in \{0,1\}^* \mid x \sqsubseteq y\}\right| < \infty$}, we have\dots''\ use ``Since $y$ has only finitely many prefixes, we have\dots''
 
+  You will be surprised how much mathematical text can be reformulated in plain English or can just be omitted. Naturally, if some mathematical argument is what you are actually talking about, as in a math lecture, make use of \TeX's typesetting capabilities to your heart's content.
+\end{itemize}
 
 \paragraph{Structuring a Frame}
 
 \begin{itemize}
 \item
-  Use block environments like |block|, |theorem|, |proof|, |example|,
-  and so on.
+  Use block environments like |block|, |theorem|, |proof|, |example|, and so on.
 \item
   Prefer enumerations and itemize environments over plain text.
 \item
   Use |description| when you define several things.
 \item
-  Do not use more than two levels of ``subitemizing.'' \beamer\
-  supports three levels, but you should not use that third
-  level. Mostly, you should not even use the second one. Use good
-  graphics instead.
+  Do not use more than two levels of ``subitemizing.'' \beamer\ supports three levels, but you should not use that third level. Mostly, you should not even use the second one. Use good graphics instead.
 \item
   Do not create endless |itemize| or |enumerate| lists.
 \item
-  Do not uncover lists piecewise. 
+  Do not uncover lists piecewise.
 \item
-  Emphasis is an important part of creating structure. Use |\alert| to
-  highlight important things. This can be a single word or a whole
-  sentence. However, do not overuse hilighting since this will negate
-  the effect.
+  Emphasis is an important part of creating structure. Use |\alert| to highlight important things. This can be a single word or a whole sentence. However, do not overuse highlighting since this will negate the effect.
 \item
   Use columns.
 \item
-  \emph{Never} use footnotes. They needlessly disrupt the flow of
-  reading. Either what is said in the footnote is important and should
-  be put in the normal text; or it is not important and should be
-  omitted (\emph{especially} in a presentation).
+  \emph{Never} use footnotes. They needlessly disrupt the flow of reading. Either what is said in the footnote is important and should be put in the normal text; or it is not important and should be omitted (\emph{especially} in a presentation).
 \item
   Use |quote| or |quotation| to typeset quoted text.
 \item
-  Do not use the option |allowframebreaks| except for long
-  bibliographies.
+  Do not use the option |allowframebreaks| except for long bibliographies.
 \item
   Do not use long bibliographies.
 \end{itemize}
 
-
-
-
 \paragraph{Writing the Text}
 
 \begin{itemize}
 \item
   Use short sentences.
 \item
-  Prefer phrases over complete sentences. For example,
-  instead of ``The figure on the left shows a Turing machine, the
-  figure on the right shows a finite automaton.''\ try ``Left: A Turing
-  machine. Right: A finite automaton.'' Even better, turn this into an
-  itemize or a description.
+  Prefer phrases over complete sentences. For example, instead of ``The figure on the left shows a Turing machine, the figure on the right shows a finite automaton.''\ try ``Left: A Turing machine. Right: A finite automaton.'' Even better, turn this into an itemize or a description.
 \item
-  Punctuate correctly: no punctuation after phrases, complete
-  punctuation in and after complete sentences.
+  Punctuate correctly: no punctuation after phrases, complete punctuation in and after complete sentences.
 \item
-  \emph{Never} use a smaller font size to ``fit more on a frame.''
-  \emph{Never ever} use the \emph{evil} option |shrink|.
+  \emph{Never} use a smaller font size to ``fit more on a frame.'' \emph{Never ever} use the \emph{evil} option |shrink|.
 \item
-  Do not hyphenate words. If absolutely necessary, hyphenate words
-  ``by hand,'' using the command~|\-|.
+  Do not hyphenate words. If absolutely necessary, hyphenate words ``by hand,'' using the command~|\-|.
 \item
-  Break lines ``by hand'' using the command~|\\|. Do not rely on
-  automatic line breaking. Break where there is a logical pause. For 
-  example, good breaks in ``the tape alphabet is larger
-  than the input alphabet'' are before ``is'' and before the second
-  ``the.'' Bad breaks are before either ``alphabet'' and before
-  ``larger.''
+  Break lines ``by hand'' using the command~|\\|. Do not rely on automatic line breaking. Break where there is a logical pause. For example, good breaks in ``the tape alphabet is larger than the input alphabet'' are before ``is'' and before the second ``the.'' Bad breaks are before either ``alphabet'' and before ``larger.''
 \item
-  Text and numbers in figures should have the \emph{same} size as
-  normal text. Illegible numbers on axes usually ruin a chart and its
-  message.
+  Text and numbers in figures should have the \emph{same} size as normal text. Illegible numbers on axes usually ruin a chart and its message.
 \end{itemize}
 
-
-
-
 \subsubsection{Interactive Elements}
 
-Ideally, during a presentation you would like to present your
-slides in a perfectly linear fashion, presumably by pressing the
-page-down-key once for each slide. However, there are different
-reasons why you might have to deviate from this linear order:
+Ideally, during a presentation you would like to present your slides in a perfectly linear fashion, presumably by pressing the page-down-key once for each slide. However, there are different reasons why you might have to deviate from this linear order:
 \begin{itemize}
 \item
-  Your presentation may contain ``different levels of detail'' that
-  may or may not be skipped or expanded, depending on the audience's
-  reaction.
+  Your presentation may contain ``different levels of detail'' that may or may not be skipped or expanded, depending on the audience's reaction.
 \item
   You are asked questions and wish to show supplementary slides.
 \item
-  You present a complicated picture and you have to ``zoom out''
-  different parts to explain details.
+  You present a complicated picture and you have to ``zoom out'' different parts to explain details.
 \item
-  You are asked questions about an earlier slide, which forces you to 
-  find and then jump to that slide.
+  You are asked questions about an earlier slide, which forces you to find and then jump to that slide.
 \end{itemize}
-You cannot really prepare against the last kind of questions. In this
-case, you can use the navigation bars and symbols to find the slide
-you are interested in, see \ref{section-navigation-bars}.
 
-Concerning the first three kinds of deviations, there are several
-things you can do to prepare ``planned detours'' or ``planned
-short cuts''.
+You cannot really prepare against the last kind of questions. In this case, you can use the navigation bars and symbols to find the slide you are interested in, see \ref{section-navigation-bars}.
+
+Concerning the first three kinds of deviations, there are several things you can do to prepare ``planned detours'' or ``planned short cuts''.
 \begin{itemize}
 \item
-  You can add ``skip buttons.'' When such a button
-  is pressed, you jump over a well-defined part of your talk. Skip
-  button have two advantages over just pressing the forward key
-  is rapid succession: first, you immediately end up at the correct
-  position and, second, the button's label can give the audience a
-  visual feedback of what exactly will be skipped. For example, when
-  you press a skip button labeled ``Skip proof'' nobody will start
-  puzzling over what he or she has missed.
-\item
-  You can add an appendix to your talk. The appendix is kept
-  ``perfectly separated'' from the main talk. Only once you ``enter''
-  the appendix part (presumably by hyperjumping into it), does the
-  appendix structure become visible. You can put all frames that you
-  do not intend to show during the normal course of your talk, but
-  which you would like to have handy in case someone asks, into this
-  appendix.
-\item
-  You can add ``goto buttons'' and ``return buttons'' to create
-  detours. Pressing a goto button will jump to a certain part of the
-  presentation where extra details can be shown. In this part, there
-  is a return button present on each slide that will jump back to the
-  place where the goto button was pressed.
-\item
-  In \beamer, you can use the |\againframe| command to ``continue''
-  frames that you previously started somewhere, but where certain
-  details have been suppressed. You can use the |\againframe| command
-  at a much later point, for example only in the appendix to show
-  additional slides there.
-\item
-  In \beamer, you can use the |\framezoom| command to create links to
-  zoomed out parts of a complicated slide.
+  You can add ``skip buttons.'' When such a button is pressed, you jump over a well-defined part of your talk. Skip button have two advantages over just pressing the forward key is rapid succession: first, you immediately end up at the correct position and, second, the button's label can give the audience a visual feedback of what exactly will be skipped. For example, when you press a skip button labeled ``Skip proof'' nobody will start puzzling over what he or she has missed.
+\item
+  You can add an appendix to your talk. The appendix is kept ``perfectly separated'' from the main talk. Only once you ``enter'' the appendix part (presumably by hyperjumping into it), does the appendix structure become visible. You can put all frames that you do not intend to show during the normal course of your talk, but which you would like to have handy in case someone asks, into this appendix.
+\item
+  You can add ``goto buttons'' and ``return buttons'' to create detours. Pressing a goto button will jump to a certain part of the presentation where extra details can be shown. In this part, there is a return button present on each slide that will jump back to the place where the goto button was pressed.
+\item
+  In \beamer, you can use the |\againframe| command to ``continue'' frames that you previously started somewhere, but where certain details have been suppressed. You can use the |\againframe| command at a much later point, for example only in the appendix to show additional slides there.
+\item
+  In \beamer, you can use the |\framezoom| command to create links to zoomed out parts of a complicated slide.
 \end{itemize}
 
-
-
-
-
 \subsection{Using Graphics}
 
-Graphics often convey concepts or ideas much more efficiently than
-text: A picture can say more than a thousand words. (Although,
-sometimes a word can say more than a thousand pictures.) 
-
+Graphics often convey concepts or ideas much more efficiently than text: A picture can say more than a thousand words. (Although, sometimes a word can say more than a thousand pictures.)
 \begin{itemize}
 \item
-  Put (at least) one graphic on each slide, whenever
-  possible. Visualizations help an audience enormously.
-\item
-  Usually, place graphics to the left of the text. (Use the
-  |columns| environment.) In a left-to-right reading culture, we look
-  at the left first.
-\item
-  Graphics should have the same typographic parameters as the
-  text: Use the same fonts (at the same size) in graphics as in the
-  main text. A small dot in a graphic should have exactly the same 
-  size as a small dot in a text. The line width should be the same as
-  the stroke width used in creating the glyphs of the font. For
-  example, an 11pt non-bold Computer Modern font has a stroke width of
-  0.4pt.
-\item
-  While bitmap graphics, like photos, can be much more colorful than the
-  rest of the text, vector graphics should follow the same ``color
-  logic'' as the main text (like black~= normal lines, red~= hilighted
-  parts, green~= examples, blue~= structure).
-\item
-  Like text, you should explain everything that is shown on a
-  graphic. Unexplained details make the audience puzzle whether this
-  was something important that they have missed. Be careful when
-  importing graphics from a paper or some other source. They usually
-  have much more detail than you will be able to explain and should be
-  radically simplified.
-\item
-  Sometimes the complexity of a graphic is intensional and you
-  are willing to spend much time explaining the graphic in great
-  detail. In this case, you will often run into the problem that fine
-  details of the graphic are hard to discern for the audience. In this
-  case you should use a command like |\framezoom| to create
-  anticipated zoomings of interesting parts of the graphic, see
-  Section~\ref{section-zooming}. 
+  Put (at least) one graphic on each slide, whenever possible. Visualizations help an audience enormously.
+\item
+  Usually, place graphics to the left of the text. (Use the |columns| environment.) In a left-to-right reading culture, we look at the left first.
+\item
+  Graphics should have the same typographic parameters as the text: Use the same fonts (at the same size) in graphics as in the main text. A small dot in a graphic should have exactly the same size as a small dot in a text. The line width should be the same as the stroke width used in creating the glyphs of the font. For example, an 11pt non-bold Computer Modern font has a stroke width of 0.4pt.
+\item
+  While bitmap graphics, like photos, can be much more colorful than the rest of the text, vector graphics should follow the same ``color logic'' as the main text (like black~= normal lines, red~= highlighted parts, green~= examples, blue~= structure).
+\item
+  Like text, you should explain everything that is shown on a graphic. Unexplained details make the audience puzzle whether this was something important that they have missed. Be careful when importing graphics from a paper or some other source. They usually have much more detail than you will be able to explain and should be radically simplified.
+\item
+  Sometimes the complexity of a graphic is intentional and you are willing to spend much time explaining the graphic in great detail. In this case, you will often run into the problem that fine details of the graphic are hard to discern for the audience. In this case you should use a command like |\framezoom| to create anticipated zoomings of interesting parts of the graphic, see Section~\ref{section-zooming}.
 \end{itemize}
 
 
-
 \subsection{Using Animations and Transitions}
 
 \begin{itemize}
 \item
   Use animations to explain the dynamics of systems, algorithms, etc.
 \item
-  Do \emph{not} use animations just to attract the attention of your
-  audience. This often distracts attention away from the main topic of the
-  slide. No matter how cute a rotating,
-  flying theorem seems to look and no matter how badly you feel your
-  audience needs some action to keep it happy, most people in the
-  audience will typically feel you are making fun of them. 
-\item
-  Do \emph{not} use distracting special effects like ``dissolving''
-  slides unless you have a very good reason for using them. If you use
-  them, use them sparsely. 
-  They \emph{can} be useful in some situations: For example, you might
-  show a   young boy on a slide and might wish to dissolve this slide
-  into   slide showing a grown man instead. In this case, the
-  dissolving  gives the audience visual feedback that the young boy
-  ``slowly becomes'' the man. 
+  Do \emph{not} use animations just to attract the attention of your audience. This often distracts attention away from the main topic of the slide. No matter how cute a rotating, flying theorem seems to look and no matter how badly you feel your audience needs some action to keep it happy, most people in the audience will typically feel you are making fun of them.
+\item
+  Do \emph{not} use distracting special effects like ``dissolving'' slides unless you have a very good reason for using them. If you use them, use them sparsely. They \emph{can} be useful in some situations: For example, you might show a young boy on a slide and might wish to dissolve this slide into slide showing a grown man instead. In this case, the dissolving  gives the audience visual feedback that the young boy ``slowly becomes'' the man.
 \end{itemize}
 
 
-
-
 \subsection{Choosing Appropriate Themes}
 
-\beamer\ comes with a number of different themes. When choosing a
-theme, keep the following in mind:
-
+\beamer\ comes with a number of different themes. When choosing a theme, keep the following in mind:
 \begin{itemize}
 \item
-  Different themes are appropriate for different occasions. Do not
-  become too attached to a favorite theme; choose a 
-  theme according to occasion.
-\item
-  A longer talk is more likely to require navigational hints
-  than a short one. When you give a 90 minute lecture to students, you
-  should choose a theme that always shows a sidebar with the current
-  topic hilighted so that everyone always knows exactly what's the
-  current ``status'' of your talk is; when you give a ten-minute
-  introductory speech, a table of contents is likely to just seem
-  silly.
-\item
-  A theme showing the author's name and affiliation is appropriate in
-  situation where the audience is likely not to know you (like during
-  a conference). If everyone knows you, having your name on each slide
-  is just vanity. 
-\item
-  First choose a presentation theme that has a layout that is
-  appropriate for your talk.
-\item
-  Next you might wish to change the colors by installing a different
-  color theme. This can drastically change the appearance of your
-  presentation. A ``colorful'' theme like |Berkeley| will look much
-  less flashy if you use the color themes |seahorse| and |lily|. 
-\item
-  You might also wish to change the fonts by installing a different
-  font theme.
+  Different themes are appropriate for different occasions. Do not become too attached to a favorite theme; choose a theme according to occasion.
+\item
+  A longer talk is more likely to require navigational hints than a short one. When you give a 90 minute lecture to students, you should choose a theme that always shows a sidebar with the current topic highlighted so that everyone always knows exactly what's the current ``status'' of your talk is; when you give a ten-minute introductory speech, a table of contents is likely to just seem silly.
+\item
+  A theme showing the author's name and affiliation is appropriate in situations where the audience is likely not to know you (like during a conference). If everyone knows you, having your name on each slide is just vanity.
+\item
+  First choose a presentation theme that has a layout that is appropriate for your talk.
+\item
+  Next you might wish to change the colors by installing a different color theme. This can drastically change the appearance of your presentation. A ``colorful'' theme like |Berkeley| will look much less flashy if you use the color themes |seahorse| and |lily|.
+\item
+  You might also wish to change the fonts by installing a different font theme.
 \end{itemize}
 
 
-
 \subsection{Choosing Appropriate Colors}
 
 \begin{itemize}
 \item
-  Use colors sparsely. The prepared themes are already quite
-  colorful (blue~= structure, red~= alert, green~= example). If you
-  add more colors for things like code, math text, etc., you should
-  have a \emph{very} good reason. 
-\item
-  Be careful when using bright colors on white background,
-  \emph{especially} when using green. What looks good on your monitor
-  may look bad during a presentation due to the different ways
-  monitors, beamers, and printers reproduce colors. Add lots of black
-  to pure colors when you use them on bright backgrounds.
-\item
-  Maximize contrast. Normal text should be black on white or at least
-  something very dark on something very bright. \emph{Never} do things
-  like ``light green text on not-so-light green background.''
-\item
-  Background shadings decrease the legibility without increasing the
-  information content. Do not add a background shading just because it
-  ``somehow looks nicer.'' 
-\item
-  Inverse video (bright text on dark background) can be a problem
-  during presentations in bright environments since only a small
-  percentage of the presentation area is light up by the
-  beamer. Inverse video is harder to reproduce on printouts and on
-  transparencies. 
+  Use colors sparsely. The prepared themes are already quite colorful (blue~= structure, red~= alert, green~= example). If you add more colors for things like code, math text, etc., you should have a \emph{very} good reason.
+\item
+  Be careful when using bright colors on white background, \emph{especially} when using green. What looks good on your monitor may look bad during a presentation due to the different ways monitors, beamers, and printers reproduce colors. Add lots of black to pure colors when you use them on bright backgrounds.
+\item
+  Maximize contrast. Normal text should be black on white or at least something very dark on something very bright. \emph{Never} do things like ``light green text on not-so-light green background.''
+\item
+  Background shadings decrease the legibility without increasing the information content. Do not add a background shading just because it ``somehow looks nicer.''
+\item
+  Inverse video (bright text on dark background) can be a problem during presentations in bright environments since only a small percentage of the presentation area is light up by the beamer. Inverse video is harder to reproduce on printouts and on transparencies.
 \end{itemize}
 
 
+\subsection{Choosing Appropriate Fonts and Font Attributes}
 
+Text and fonts literally surround us constantly. Try to think of the last time when there was no text around you within ten meters. Likely, this has never happened in your life! (Whenever you wear clothing, even a swim suit, there is a lot of text right next to your body.) The history of fonts is nearly as long as the history of civilization itself. There are tens of thousands of fonts available these days, some of which are the product of hundreds of years of optimization.
 
+Choosing the right fonts for a presentation is by no means trivial and wrong choices will either just ``look bad'' or, worse, make the audience have trouble reading your slides. This user's guide cannot replace a good book on typography, but in the present section you'll find several hints that should help you setup fonts for a \beamer\ presentation that look good. A font has numerous attributes like weight, family, or size. All of these have an impact on the usability of the font in presentations. In the following, these attributes are described and advantages and disadvantages of the different choices are sketched.
 
+\subsubsection{Font Size}
+\label{section-sizes}
 
-\subsection{Choosing Appropriate Fonts and Font Attributes}
-
-Text and fonts literally surround us constantly. Try to think of the
-last time when  there was no text around you within ten
-meters. Likely, this has never happened in your life! 
-(Whenever you wear clothing, even a swim suit, there is a lot of text
-right next to your body.) The history of fonts is nearly as long as
-the history of civilization itself. There are tens of thousands of fonts
-available these days, some of which are the product of hundreds of
-years of optimization.
-
-Choosing the right fonts for a presentation is by no means
-trivial and wrong choices will either just ``look bad'' or, worse,
-make the audience having trouble reading your slides.
-This user's guide cannot replace a good book on typography, but in the
-present section you'll find several hints that should help you setup 
-fonts for a \beamer\ presentation that look good.
-A font has numerous attributes like weight, family, or size. All of
-these have an impact on the usability of the font in
-presentations. In the following, these attributes are described and
-advantages and disadvantages of the different choices are sketched.
+Perhaps the most obvious attribute of a font is its size. Fonts are traditionally measured in ``points.'' How much a point is depends on whom you ask. \TeX\ thinks a point is the 72.27th part of an inch, which is 2.54 cm. On the other hand, PostScript and Adobe think a point is the 72th part of an inch (\TeX\ calls this a big point). There are differences between American and European points. Once it is settled how much a point is, claiming that a text is in ``11pt'' means that the ``height'' of the letters in the font are 11pt. However, this ``height'' stems from the time when letters where still cast in lead and refers to the the vertical size of the lead letters. It thus does not need to have any correlation with the actual height of, say, the letter x or even the letter M. The letter x of an 11pt Times from Adobe will have a height that is different from the height of the letter x of an 11pt Times from UTC and the letter x of an 11pt Helvetica from Adobe will have yet another height.
 
+Summing up, the font size has little to do with the actual size of letters. Rather, these days it is a convention that 10pt or 11pt is the size a font should be printed for ``normal reading.'' Fonts are designed so that they can optimally be read at these sizes.
 
-\subsubsection{Font Size}
+In a presentation the classical font sizes obviously lose their meaning. Nobody could read a projected text if it were actually 11pt. Instead, the projected letters need to be several centimeters high. Thus, it does not really make sense to specify ``font sizes'' for presentations in the usual way. Instead, you should try to think of the number of lines that will fit on a slide if you were to fill the whole slide with line-by-line text (you are never going to do that in practice, though). Depending on how far your audience is removed from the projection and on how large the projection is, between 10 and 20 lines should fit on each slide. The less lines, the more readable your text will be.
 
-\label{section-sizes}
+In \beamer, the default sizes of the fonts are chosen in a way that makes it difficult to fit ``too much'' onto a slide. Also, it will ensure that your slides are readable even under bad conditions like a large room and a small only a small projection area. However, you may wish to enlarge or shrink the fonts a bit if you know this to be more appropriate in your presentation environment.
 
-Perhaps the most obvious attribute of a font is its size. Fonts are
-traditionally measured in ``points.'' How much a point is depends on
-whom you ask. \TeX\ thinks a point is the 72.27th part of an inch,
-which is 2.54 cm. On the other hand, PostScript and Adobe think a
-point is the 72th part of an inch (\TeX\ calls this a big point). The
-are differences between American and European points. Once it is
-settled how much a point is, claiming that a text is in ``11pt'' means
-that the ``height'' of the letters in the font are 11pt. However, this
-``height'' stems from the time when letters where still cast in lead
-and refers to the the vertical size of the lead letters. It thus does
-not need to have any correlation with the actual height of, say, the
-letter x or even the letter M. The letter x of an 11pt Times from
-Adobe will have a height that is different from the height of the
-letter x of an 11pt Times from UTC and the letter x of an 11pt
-Helvetica from Adobe will have yet another height.
-
-Summing up, the font size has little to do with the actual size of
-letters. Rather, these days it is a convention that 10pt or 11pt is
-the size a font should be printed for ``normal reading.'' Fonts are
-designed so that they can optimally be read at these sizes.
-
-In a presentation the classical font sizes obviously loose their
-meaning. Nobody could read a projected text if it were actually
-11pt. Instead, the projected letters need to be several centimeters
-high. Thus, it does not really make sense to specify ``font sizes''
-for presentations in the usual way. Instead, you should try to think
-of the number of lines that will fit on a slide if you were to fill
-the whole slide with line-by-line text (you are never going to do that
-in practice, though). Depending on how far your audience is removed
-from the projection and on how large the projection is, between 10 and
-20 lines should fit on each slide. The less lines, the more readable
-your text will be.
-
-In \beamer, the default sizes of the fonts are chosen in a way that
-makes it difficult to fit ``too much'' onto a slide. Also, it will
-ensure that your slides are readable even under bad conditions like a
-large room and a small only a small projection area. However, you may
-wish to enlarge or shrink the fonts a bit if you know this to be more
-appropriate in your presentation environment.
-
-Once the size of the normal text is settled, all other sizes are
-usually defined relative to that size. For this reason, \LaTeX\ has 
-commands like |\large| or |\small|. The actual size these commands
-select depends on the size of normal text.
-
-In a presentation, you will want to use a very small font for text in
-headlines, footlines, or sidebars since the text shown there is not
-vital and is read at the audience's leasure. Naturally, the text should
-still be large enough that it actually \emph{can} be read without
-binoculars. However, in a normal presentation environment the audience
-will still be able to read even |\tiny| text when necessary.
-
-However, using small fonts can be tricky. Many PostScript fonts are
-just scaled down when used at small sizes. When a font is
-used at less than its normal size, the characters should actually be
-stroked using a slightly thicker ``pen'' than the one resulting from
-just scaling things. For this reason, high quality 
-multiple master fonts or the Computer Modern fonts use different
-fonts for small characters and for normal characters. However, when
-you use a normal Helvetica or Times font, the characters are just
-scaled down. A similar problem arises when you use a light font on a
-dark background. Even when printed on paper in high resolution,
-light-on-dark text tends to be ``overflooded'' by the dark
-background. When light-on-dark text is rendered in a presentation this
-effect can be much worse, making the text almost impossible to read.
-
-You can counter both negative effects by using a bold versions for
-small text.
-
-In the other direction, you can use larger text for titles. However,
-using a larger font does not always have the desired effect. Just
-because a frame title is printed in large letters does not
-mean that it is read first. Indeed, have a look at the cover of your
-favorite magazine. Most likely, the magazine's name is the typeset in the
-largest font, but you your attention will nevertheless first go to the
-topics advertised on the cover. Likewise, in the table of contents you
-are likely to first focus on the entries, not on the words ``Table of
-Contents.'' Most likely, you would not spot a spelling mistake there
-(a friend of mine actually managed to misspell \emph{his own name} on
-the cover of his master's thesis and nobody noticed until a year
-later). In essence, large text at the top of a page signals
-``unimportant since I know what to expect.'' So, instead of using a
-very large frame title, also consider using a normal size frame title
-that is typeset in bold or in italics. 
+Once the size of the normal text is settled, all other sizes are usually defined relative to that size. For this reason, \LaTeX\ has commands like |\large| or |\small|. The actual size these commands select depends on the size of normal text.
 
+In a presentation, you will want to use a very small font for text in headlines, footlines, or sidebars since the text shown there is not vital and is read at the audience's leasure. Naturally, the text should still be large enough that it actually \emph{can} be read without binoculars. However, in a normal presentation environment the audience will still be able to read even |\tiny| text when necessary.
 
+However, using small fonts can be tricky. Many PostScript fonts are just scaled down when used at small sizes. When a font is used at less than its normal size, the characters should actually be stroked using a slightly thicker ``pen'' than the one resulting from just scaling things. For this reason, high quality multiple master fonts or the Computer Modern fonts use different fonts for small characters and for normal characters. However, when you use a normal Helvetica or Times font, the characters are just scaled down. A similar problem arises when you use a light font on a dark background. Even when printed on paper in high resolution, light-on-dark text tends to be ``overflooded'' by the dark background. When light-on-dark text is rendered in a presentation this effect can be much worse, making the text almost impossible to read.
 
+You can counter both negative effects by using a bold versions for small text.
 
+In the other direction, you can use larger text for titles. However, using a larger font does not always have the desired effect. Just because a frame title is printed in large letters does not mean that it is read first. Indeed, have a look at the cover of your favorite magazine. Most likely, the magazine's name is the typeset in the largest font, but you your attention will nevertheless first go to the topics advertised on the cover. Likewise, in the table of contents you are likely to first focus on the entries, not on the words ``Table of Contents.'' Most likely, you would not spot a spelling mistake there (a friend of mine actually managed to misspell \emph{his own name} on the cover of his master's thesis and nobody noticed until a year later). In essence, large text at the top of a page signals ``unimportant since I know what to expect.'' So, instead of using a very large frame title, also consider using a normal size frame title that is typeset in bold or in italics.
 
 \subsubsection{Font Families}
-
 \label{section-guidelines-serif}
 
-The other central property of any font is its family. Examples of font
-families are Times or Helvetica or Futura. As the name suggests, a lot
-of different fonts can belong to the same family. For example, Times
-comes in different sizes, there is a bold version of Times, an
-italics version, and so on. To confuse matters, font families like
-Times are often just called the ``font Times.''
-
-The are two large classes of font families: serif fonts and
-sans-serif fonts. A sans-serif font is a font in
-which the letters do not have serifs (from French \emph{sans}, which
-means ``without''). Serifs are the little hooks at the ending of the
-strokes that make up a letter. The font you are currently reading is a
-serif font. \textsf{By comparison, this text is in a sans-serif font.}
-Sans-serif fonts are (generally considered to be) easier to read
-when used in a presentation. In low resolution rendering, serifs
-decrease the legibility of a font. However, on projectors with very
-high resolution serif text is just as readable as sans-serif text. A
-presentation typeset in a serif font creates a more conservative
-impression, which might be exactly what you wish to create. 
-
-Most likely, you'll have a lot of different font families preinstalled
-on you system. The default font used by \TeX\ (and \beamer) is the
-Computer Modern font. It  is the original font family designed by Donald
-Knuth himself for the \TeX\ program. It is a mature font that comes
-with just about everything you could wish for: extensive mathematical
-alphabets, outline PostScript versions, real small caps, real oldstyle
-numbers, specially designed small and large letters, and so on.
-
-However, there are reasons for using font families other than Computer
-Modern: 
+The other central property of any font is its family. Examples of font families are Times or Helvetica or Futura. As the name suggests, a lot of different fonts can belong to the same family. For example, Times comes in different sizes, there is a bold version of Times, an italics version, and so on. To confuse matters, font families like Times are often just called the ``font Times.''
+
+There are two large classes of font families: serif fonts and sans-serif fonts. A sans-serif font is a font in which the letters do not have serifs (from French \emph{sans}, which means ``without''). Serifs are the little hooks at the ending of the strokes that make up a letter. The font you are currently reading is a serif font. \textsf{By comparison, this text is in a sans-serif font.} Sans-serif fonts are (generally considered to be) easier to read when used in a presentation. In low resolution rendering, serifs decrease the legibility of a font. However, on projectors with very high resolution serif text is just as readable as sans-serif text. A presentation typeset in a serif font creates a more conservative impression, which might be exactly what you wish to create.
+
+Most likely, you'll have a lot of different font families preinstalled on your system. The default font used by \TeX\ (and \beamer) is the Computer Modern font. It  is the original font family designed by Donald Knuth himself for the \TeX\ program. It is a mature font that comes with just about everything you could wish for: extensive mathematical alphabets, outline PostScript versions, real small caps, real oldstyle numbers, specially designed small and large letters, and so on.
+
+However, there are reasons for using font families other than Computer Modern:
 \begin{itemize}
 \item
-  The Computer Modern fonts are a bit boring if you have seen them too
-  often. Using another font (but not Times!) can give a fresh look.
+  The Computer Modern fonts are a bit boring if you have seen them too often. Using another font (but not Times!) can give a fresh look.
 \item
-  Other fonts, especially Times and Helvetica, are sometime rendered
-  better since they seem to have better internal hinting.
+  Other fonts, especially Times and Helvetica, are sometime rendered better since they seem to have better internal hinting.
 \item
-  The sans-serif version of Computer Modern is not nearly as
-  well-designed as the serif version. Indeed, the sans-serif version
-  is, in essence, the serif version with different design parameters,
-  not an independent design.
+  The sans-serif version of Computer Modern is not nearly as well-designed as the serif version. Indeed, the sans-serif version is, in essence, the serif version with different design parameters, not an independent design.
 \item
-  Computer modern needs much more space than more economic fonts like
-  Times (this explains why Times is so popular with people who need
-  to squeeze their great paper into just twelve pages). To be fair,
-  Times was specifically designed to be economic (the newspaper
-  company publishing The Times needed robust, but space-economic font).
+  Computer modern needs much more space than more economic fonts like Times (this explains why Times is so popular with people who need to squeeze their great paper into just twelve pages). To be fair, Times was specifically designed to be economic (the newspaper company publishing The Times needed robust, but space-economic font).
 \end{itemize}
 
 A small selection of alternatives to Computer Modern:
 \begin{itemize}
 \item
-  Helvetica is an often used alternative. However, Helvetica also
-  tends to look boring (since we see it everywhere) and it has a very
-  large x-height (the height of the letter~x in comparison to a letter
-  like~M). A large x-height is usually considered good for languages
-  (like English) that use uppercase letters seldomly and not-so-good
-  for languages (like German) that use uppercase letters a lot. (I
-  have never been quite convinced by the argument for this, though.)
-  Be warned: the x-height of Helvetica is so different from the
-  x-height of Times that mixing the two in a single line looks
-  strange. The packages for loading Times and Helvetica provide
-  options for fixing this, though.
-\item
-  Futura is, in my opinion, a beautiful font that is very well-suited
-  for presentations. Its thick letters make it robust against
-  scaling, inversion, and low contrast. Unfortunately, while it is
-  most likely installed on your system somewhere in some form, getting
-  \TeX\ to work with it is a complicated process.
-\item
-  Times is a possible alternative to Computer Modern. Its main
-  disadvantage is that it is a serif font, which requires a
-  high-resolution projector. Naturally, it also used very often, so we
-  all know it very well.
+  Latin Modern is a Computer Modern derivate that provides more characters, so it's not considered a real alternative. It's recommended over Computer Modern, though.
+\item
+  Helvetica is an often used alternative. However, Helvetica also tends to look boring (since we see it everywhere) and it has a very large x-height (the height of the letter~x in comparison to a letter like~M). A large x-height is usually considered good for languages (like English) that use uppercase letters seldom and not-so-good for languages (like German) that use uppercase letters a lot. (We have never been quite convinced by the argument for this, though.) Be warned: the x-height of Helvetica is so different from the x-height of Times that mixing the two in a single line looks strange. The packages for loading Times and Helvetica provide options for fixing this, though.
+\item
+  Futura is, in our opinion, a beautiful font that is very well-suited for presentations. Its thick letters make it robust against scaling, inversion, and low contrast. Unfortunately, while it is most likely installed on your system somewhere in some form, getting \TeX\ to work with it is a complicated process. However, it has been made a lot simpler with modern typesetting engines such as |luatex| and |xetex|.
+\item
+  Times is a possible alternative to Computer Modern. Its main disadvantage is that it is a serif font, which requires a high-resolution projector. Naturally, it also used very often, so we all know it very well.
+\item
+  DejaVu, a derivate of Bitstream Vera is also a very good and free alternative. TrueType version that comes with OpenOffice.org is complicated to get to work with \TeX, but |arev| \LaTeX\ package provides an easy way to use Type 1 version named Bera. It has both sans-serif and serif versions; |arev| provides both.
 \end{itemize}
 
 Families that you should \emph{not} use for normal text include:
@@ -816,162 +373,51 @@ Families that you should \emph{not} use for normal text include:
 \item
   All monospaced fonts (like Courier).
 \item
-  Script fonts (which look like handwriting). Their stroke width is
-  way too small for a presentation.
+  Script fonts (which look like handwriting). Their stroke width is way too small for a presentation.
 \item
-  More delicate serif fonts like Stempel and possibly even Garamond
-  (though Garamond is really a beautiful font for books).
+  More delicate serif fonts like Stempel and possibly even Garamond (though Garamond is really a beautiful font for books).
 \item
-  Gothic fonts. Only a small fraction of your audience will be able to
-  read them fluently. 
+  Gothic fonts. Only a small fraction of your audience will be able to read them fluently.
 \end{itemize}
 
-There is one popular font that is a bit special: Microsoft's Comic
-Sans. On the one hand, there is a website lobbying for banning the use
-of this font. Indeed, the main trouble with the font is that it is not
-particularly well-readable and that math typeset partly using this
-font looks terrible. On the other hand, this font \emph{does} create
-the impression of a slide ``written by hand,'' which gives the
-presentation a natural look. Think twice before using this font, but
-do not let yourself be intimidated.
-
-One of the most important rules of typography is that you should use
-as little fonts as possible in a text. In particular, typographic
-wisdom dictates that you should not use more than two different
-families on one page. However, when typesetting
-mathematical text, it is often necessary and useful to use different
-font families. For example, it used to be common practice to use
-Gothic letters do denote vectors. Also, program texts are often
-typeset in monospace fonts. If your audience is used to a certain font
-family for a certain type of text, use that family, regardless of what
-typographic wisdom says.
-
-A common practice in typography is to use a sans serif fonts for
-titles and serif fonts for normal text (check your favorite
-magazine). You can \emph{also} use two different sans serif fonts or
-two different serif fonts, but you then have to make sure that the
-fonts look ``sufficiently different.'' If they look only slightly
-different, the page will look ``somehow strange,'' but the audience
-will not be able to tell why. For example, do not mix Arial and
-Helvetica (they are almost identical) or Computer Modern and
-Baskerville (they are quite similar). A combination of Gills Sans and
-Helvetica is dangerous but perhaps possible. A combination like Futura
-and Optima is certainly ok, at least with respect to the fonts being
-very different.
-
+There is one popular font that is a bit special: Microsoft's Comic Sans. On the one hand, there is a website lobbying for banning the use of this font. Indeed, the main trouble with the font is that it is not particularly well-readable and that math typeset partly using this font looks terrible. On the other hand, this font \emph{does} create the impression of a slide ``written by hand,'' which gives the presentation a natural look. Think twice before using this font, but do not let yourself be intimidated.
 
+One of the most important rules of typography is that you should use as little fonts as possible in a text. In particular, typographic wisdom dictates that you should not use more than two different families on one page. However, when typesetting mathematical text, it is often necessary and useful to use different font families. For example, it used to be common practice to use Gothic letters to denote vectors. Also, program texts are often typeset in monospace fonts. If your audience is used to a certain font family for a certain type of text, use that family, regardless of what typographic wisdom says.
 
+A common practice in typography is to use a sans-serif fonts for titles and serif fonts for normal text (check your favorite magazine). You can \emph{also} use two different sans-serif fonts or two different serif fonts, but you then have to make sure that the fonts look ``sufficiently different.'' If they look only slightly different, the page will look ``somehow strange,'' but the audience will not be able to tell why. For example, do not mix Arial and Helvetica (they are almost identical) or Computer Modern and Baskerville (they are quite similar). A combination of Gills Sans and Helvetica is dangerous but perhaps possible. A combination like Futura and Optima is certainly OK, at least with respect to the fonts being very different.
 
 \subsubsection{Font Shapes: Italics and Small Capitals}
-
 \label{section-italics}
 \label{section-smallcaps}
 
-\LaTeX\ introduces the concept of the \emph{shape} of a font. The only
-really important ones are italic and small caps.
-An \emph{italic} font is a font in which the text is slightly slanted
-to the right \emph{like this}. Things to know about
-italics:
+\LaTeX\ introduces the concept of the \emph{shape} of a font. The only really important ones are italic and small caps. An \emph{italic} font is a font in which the text is slightly slanted to the right \emph{like this}. Things to know about italics:
 \begin{itemize}
 \item
-  Italics are commonly used in novels to express emphasis. However,
-  especially with sans-serif fonts, italics are typically not ``strong
-  enough'' and the emphasis gets lost in a presentation. Using a
-  different color or bold text seems better suited for presentations
-  to create emphasis. 
-\item
-  If you look closely, you will notice that italic text is not only
-  slanted but that different letters are actually used (compare a and
-  \emph{a}, for example). However, this is only true for serif text,
-  not for sans-serif text. Text that is only slanted without using
-  different characters is called  ``slanted'' instead of ``italic.''
-  Sometimes, the word ``oblique'' is also used for slanted, but it
-  sometimes also used for italics, so it is perhaps best to avoid
-  it. Using slanted serif text is very much frowned upon by
-  typographers and is considered ``cheap computer typography.''
-  However, people who use slanted text in their books include Donald
-  Knuth.
-
-  In a presentation, if you go into the trouble of using a serif font
-  for some part of it, you should also use italics, not slanted text.
-\item
-  The different characters used for serif italics have changed much
-  less  from the original handwritten letters they are based on than
-  normal serif text. For this reason, serif italics creates the
-  impression of handwritten text, which may be desirable to give a
-  presentation a more ``personal touch'' (although you can't get very
-  personal using Times italics, which everyone has seen a thousand
-  times). However, it is harder to read than normal text, so do not
-  use it for text more than a line long.
-\end{itemize}
+  Italics are commonly used in novels to express emphasis. However, especially with sans-serif fonts, italics are typically not ``strong enough'' and the emphasis gets lost in a presentation. Using a different color or bold text seems better suited for presentations to create emphasis.
+\item
+  If you look closely, you will notice that italic text is not only slanted but that different letters are actually used (compare a and \emph{a}, for example). However, this is only true for serif text, not for sans-serif text. Text that is only slanted without using different characters is called ``slanted'' instead of ``italic.'' Sometimes, the word ``oblique'' is also used for slanted, but it sometimes also used for italics, so it is perhaps best to avoid it. Using slanted serif text is very much frowned upon by typographers and is considered ``cheap computer typography.'' However, people who use slanted text in their books include Donald Knuth.
 
-The second font shape supported by \TeX\ are small capital
-letters. Using them can create a conservative, even formal
-impression, but some words of caution:
+  In a presentation, if you go to the trouble of using a serif font for some part of it, you should also use italics, not slanted text.
+\item
+  The different characters used for serif italics have changed much less from the original handwritten letters they are based on than normal serif text. For this reason, serif italics creates the impression of handwritten text, which may be desirable to give a presentation a more ``personal touch'' (although you can't get very personal using Times italics, which everyone has seen a thousand times). However, it is harder to read than normal text, so do not use it for text more than a line long.
+\end{itemize}
 
+The second font shape supported by \TeX\ are small capital letters. Using them can create a conservative, even formal impression, but some words of caution:
 \begin{itemize}
 \item
-  Small capitals are different from all-uppercase text. A small caps
-  text leaves normal uppercase letters unchanged and uses smaller
-  versions of the uppercase letters for normal typesetting lowercase
-  letters. Thus the word ``German'' is typeset as \textsc{German}
-  using small caps, but as \uppercase{German} using all uppercase
-  letters.
-\item
-  Small caps either come as ``faked'' small caps or as ``real''
-  small caps. Faked small caps are created by just scaling down
-  normal uppercase letters. This leads to letters the look too
-  thin. Real small caps are specially designed smaller versions of
-  the uppercase letters that have the same stroke width as normal
-  text.
-\item
-  Computer Modern fonts and expert version of PostScript fonts come
-  with real small caps (though the small caps of Computer Modern are
-  one point size too large for some unfathomable reason---but your
-  audience is going to pardon this since it will not notice
-  anyway). ``Simple'' PostScript fonts like out-of-the-box Helvetica
-  or Times only come with faked small caps.
-\item
-  Text typeset in small caps is harder to read than normal text. The
-  reason is that we read by seeing the ``shape'' of words. For
-  example, the word ``shape'' is mainly recognized by seing one
-  normal letter, one ascending letter, a normal letter, one
-  descending letter, and a normal letter. One has much more trouble
-  spotting a misspelling like ``shepe''  than ``spape''. Small caps
-  destroy the shape of words since \textsc{shape}, \textsc{shepe}
-  and \textsc{spape} all have the same shape, thus making it much
-  harder to tell them apart. Your audience will read small caps more
-  slowly than normal text. This is, by the way, why legal
-  disclaimers are often written in uppercase letters: not to make
-  them appear more important to you, but to make them much harder to
-  actually read.
+  Small capitals are different from all-uppercase text. A small caps text leaves normal uppercase letters unchanged and uses smaller versions of the uppercase letters for normal typesetting lowercase letters. Thus the word ``German'' is typeset as \textsc{German} using small caps, but as \uppercase{German} using all uppercase letters.
+\item
+  Small caps either come as ``faked'' small caps or as ``real'' small caps. Faked small caps are created by just scaling down normal uppercase letters. This leads to letters the look too thin. Real small caps are specially designed smaller versions of the uppercase letters that have the same stroke width as normal text.
+\item
+  Computer Modern fonts and expert version of PostScript fonts come with real small caps (though the small caps of Computer Modern are one point size too large for some unfathomable reason---but your audience is going to pardon this since it will not notice anyway). ``Simple'' PostScript fonts like out-of-the-box Helvetica or Times only come with faked small caps.
+\item
+  Text typeset in small caps is harder to read than normal text. The reason is that we read by seeing the ``shape'' of words. For example, the word ``shape'' is mainly recognized by seing one normal letter, one ascending letter, a normal letter, one descending letter, and a normal letter. One has much more trouble spotting a misspelling like ``shepe''  than ``spape''. Small caps destroy the shape of words since \textsc{shape}, \textsc{shepe} and \textsc{spape} all have the same shape, thus making it much harder to tell them apart. Your audience will read small caps more slowly than normal text. This is, by the way, why legal disclaimers are often written in uppercase letters: not to make them appear more important to you, but to make them much harder to actually read.
 \end{itemize}
 
-
-
 \subsubsection{Font Weight}
 
-The ``weight'' of a font refers to the thickness of the
-letters. Usually, fonts come as regular or as bold fonts. There often
-also exist semibold, ultrabold (or black), thin, or ultrathin (or hair)
-versions.
-
-In typography, using a bold font to create emphasis, especially within
-normal text, is frowned upon (bold words in the middle of a normal
-text are referred to as ``dirt''). For presentations this rule of not
-using bold text does not really apply. On a presentation slide there
-is usually very little text and there are numerous elements that try
-to attract the viewer's attention. Using the traditional italics to
-create emphasis will often be overlooked. So, using bold text, seems a
-good alternative in a presentation. However, an even better
-alternative is using a bright color like red to attract attention.
-
-As pointed out earlier, you should use bold text for small text
-unless you use an especially robust font like Futura.
-
+The ``weight'' of a font refers to the thickness of the letters. Usually, fonts come as regular or as bold fonts. There often also exist semibold, ultrabold (or black), thin, or ultrathin (or hair) versions.
 
+In typography, using a bold font to create emphasis, especially within normal text, is frowned upon (bold words in the middle of a normal text are referred to as ``dirt''). For presentations this rule of not using bold text does not really apply. On a presentation slide there is usually very little text and there are numerous elements that try to attract the viewer's attention. Using the traditional italics to create emphasis will often be overlooked. So, using bold text, seems a good alternative in a presentation. However, an even better alternative is using a bright color like red to attract attention.
 
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+As pointed out earlier, you should use bold text for small text unless you use an especially robust font like Futura or DejaVu.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex
index 9c75b37c3f3..278cb12a07a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-installation.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,33 +8,24 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-installation.tex,v 1.12 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Installation}
-
 \label{section-installation}
 
-There are different ways of installing the \beamer\ class, depending
-on your installation and needs. When installing the class, you may
-need to install some other packages as well as described below. Before
-installing, you may wish to review the licenses under
-which the class is distributed, see Section~\ref{section-license}.
+There are different ways of installing the \beamer\ class, depending on your installation and needs. When installing the class, you may have to install some other packages as well as described below. Before installing, you may wish to review the licenses under which the class is distributed, see Section~\ref{section-license}.
 
-Fortunately, most likely your system will already have \beamer\
-preinstalled, so you can skip this section.
+Fortunately, most likely your system will already have \beamer\ preinstalled, so you can skip this section.
 
 
 \subsection{Versions and Dependencies}
 
-This documentation is part of version \version\ of the \beamer\
-class. \beamer\ needs a reasonably recent version of several standard
-packages to run and also the following versions of two special
-packages (later versions should work, but not necessarily): 
+This documentation is part of version \beamerugversion\ of the \beamer\ class. \beamer\ needs a reasonably recent version of several standard packages to run and also the following versions of two special packages (later versions should work, but not necessarily):
 \begin{itemize}
 \item
-  |pgf.sty| version \pgfversion,
+  |pgf.sty| version \beamerugpgfversion,
 \item
-  |xcolor.sty| version \xcolorversion.
+  |xcolor.sty| version \beamerugxcolorversion.
 \end{itemize}
 
 If you use |pdflatex| or |lyx|, which are optional, you need
@@ -41,147 +33,105 @@ If you use |pdflatex| or |lyx|, which are optional, you need
 \item
   |lyx| version 1.3.3. Other versions might work.
 \item
-  |pdflatex| version 0.14 or higher. Earlier versions do not work. 
+  |pdflatex| version 0.14 or higher. Earlier versions do not work.
 \end{itemize}
 
 
+\subsection{Installation of Pre-bundled Packages}
+
+We do not create or manage pre-bundled packages of \beamer, but, fortunately, other nice people do. We cannot give detailed instructions on how to install these packages, since we do not manage them, but we \emph{can} tell you were to find them and we can tell you what these nice people told us on how to install them. If you have a problem with installing, you might wish to have a look at the following first.
+
+
+\subsubsection{\TeX\ Live and Mac\TeX}
 
-\subsection{Installation of Prebundled Packages}
+In \TeX\ Live, use the |tlmgr| tool to install the packages called |beamer|, |pgf|, and |xcolor|. If you have a fairly recent version of \TeX\ Live, and you have done full installation, \beamer\ is included.
 
-I do not create or manage prebundled packages of \beamer, but,
-fortunately, nice other people do. I cannot give detailed instructions
-on how to install these packages, since I do not manage them, but I
-\emph{can} tell you were to find them and I can tell you what these
-nice people told me on how to install them. If you have a problem with
-installing, you might wish to have a look at the Debian page or MikTeX
-page first.
+\subsubsection{MiK\TeX and pro\TeX t}
 
+For MiK\TeX and pro\TeX t, use the update wizard or package manager to install the (latest versions of the) packages called |beamer|, |pgf|, and |xcolor|.
 
-\subsubsection{Debian}
+\subsubsection{Debian and Ubuntu}
 
-The command ``|aptitude install latex-beamer|'' should do the
-trick. If necessary, the packages |pgf| and |latex-xcolor| will be
-automatically installed. Sit back and relax. In detail, the following
-packages are installed: 
+The command ``|aptitude install latex-beamer|'' should do the trick. If necessary, the packages |pgf| and |latex-xcolor| will be automatically installed. Sit back and relax. In detail, the following packages are installed:
 \begin{verbatim}
 http://packages.debian.org/latex-beamer
 http://packages.debian.org/pgf
 http://packages.debian.org/latex-xcolor
 \end{verbatim}
 
+Debian 5.0 ``lenny'' includes \TeX\ Live 2007, and version 6.0 ``squeeze'' will include \TeX\ Live 2009. This also allows you to manually install newer versions of \beamer\ (into your local directory, see below) without having to update any other \LaTeX\ packages.
 
-\subsubsection{MiKTeX}
-
-For MiK\TeX, use the update wizard to install the (latest versions of
-the) packages called |latex-beamer|, |pgf|, and |xcolor|. 
+Ubuntu 8.04, 9.04 and 9.10 include \TeX\ Live 2007, and version 10.04 includes \TeX\ Live 2009.
 
+\subsubsection{Fedora}
 
+Fedora 12 and 13 include \TeX\ Live 2007, which includes \beamer. It can be installed by running the command ``|yum install texlive-texmf-latex|''. Jindrich Novy provides |rpm| packages for newer versions of \TeX\ Live for Fedora 12 and 13, at
+\begin{verbatim}
+http://fedoraproject.org/wiki/Features/TeXLive
+\end{verbatim}
+and it's also very likely that these packages will be a part of Fedora 14 once it's released.
 
 
 \subsection{Installation in a texmf Tree}
 
-If, for whatever reason, you do not wish to use a prebundled package,
-the ``right'' way to install \beamer\ is to put it in a so-called
-|texmf| tree. In the following, I explain how to do this.
+If, for whatever reason, you do not wish to use a prebundled package, the ``right'' way to install \beamer\ is to put it in a so-called |texmf| tree. In the following, we explain how to do this.
 
-Obtain the latest source version (ending |.tar.gz| or |.zip|) of the \beamer\
-package from
+Obtain the latest source version (ending |.tar.gz| or |.zip|) of the \beamer\ package from
 \begin{verbatim}
-http://sourceforge.net/projects/latex-beamer/
+http://bitbucket.org/rivanvx/beamer
 \end{verbatim}
-(most likely, you have already done this). Next, you also need the
-\textsc{pgf} package and the \textsc{xcolor} packages, 
-which you need to install separately (see their installation
-instructions). 
-
-The package contains a bunch of files; |beamer.cls| is one of
-these files and happens to be the most important one. You now need to
-put these files in an appropriate |texmf| tree. 
-
-When you ask \TeX\ to use a certain class or package, it usually looks
-for the necessary files in so-called |texmf| trees. These trees
-are simply huge directories that contain these files. By default,
-\TeX\ looks for files in three different |texmf| trees:
+(most likely, you have already done this). Next, you also need the \textsc{pgf} package and the \textsc{xcolor} packages, which you need to install separately (see their installation instructions).
+
+The package contains a bunch of files; |beamer.cls| is one of these files and happens to be the most important one. You now need to put these files in an appropriate |texmf| tree.
+
+When you ask \TeX\ to use a certain class or package, it usually looks for the necessary files in so-called |texmf| trees. These trees are simply huge directories that contain these files. By default, \TeX\ looks for files in three different |texmf| trees:
 \begin{itemize}
 \item
-  The root |texmf| tree, which is usually located at
-  |/usr/share/texmf/|, |c:\texmf\|, or\\
-  |c:\Program Files\TeXLive\texmf\|.
+  The root |texmf| tree, which is usually located at |/usr/share/texmf/|, |/usr/local/texlive/texmf/|, |c:\texmf\|, or\\ |c:\texlive\texmf\|.
 \item
-  The local  |texmf| tree, which is usually located at
-  |/usr/local/share/texmf/|, |c:\localtexmf\|, or\\
-  |c:\Program Files\TeXLive\texmf-local\|.
+  The local  |texmf| tree, which is usually located at |/usr/local/share/texmf/|, |/usr/local/texlive/texmf-local/| |c:\localtexmf\|, or\\ |c:\texlive\texmf-local\|.
 \item
-  Your personal  |texmf| tree, which is usually located in your home
-  directory at |~/texmf/| or |~/Library/texmf/|.   
+  Your personal |texmf| tree, which is usually located in your home directory at |~/texmf/| or |~/Library/texmf/|.
 \end{itemize}
 
-You should install the packages either in the local tree or in
-your personal tree, depending on whether you have write access to the
-local tree. Installation in the root tree can cause problems, since an
-update of the whole \TeX\ installation will replace this whole tree.
+You should install the packages either in the local tree or in your personal tree, depending on whether you have write access to the local tree. Installation in the root tree can cause problems, since an update of the whole \TeX\ installation will replace this whole tree.
 
-Inside whatever |texmf| directory you have chosen, create
-the sub-sub-sub-directory
+Inside whatever |texmf| directory you have chosen, create the sub-sub-sub-directory
 \begin{verbatim}
-texmf/tex/latex/beamer 
-\end{verbatim} 
+texmf/tex/latex/beamer
+\end{verbatim}
 and place all files of the package in this directory.
 
-Finally, you need to rebuild \TeX's filename database. This done by
-running the command  |texhash| or |mktexlsr| (they are
-the same). In MiK\TeX, there is a menu option to do this.
+Finally, you need to rebuild \TeX's filename database. This is done by running the command |texhash| or |mktexlsr| (they are the same). In MiK\TeX package manager and \TeX\ Live |tlmgr|, there is a menu option to do this.
 
 \lyxnote
-For usage of the \beamer\ class with \LyX, you have to do all of the
-above. You also have to make \LyX\ aware of the file
-|beamer.layout|. This file is \emph{not part of the beamer package}
-since it is updated and managed by the \LyX\ development team. This
-means that in reasonbaly up-to-date \LyX\ versions this file will
-already be installed and nothing needs to be done. 
+For usage of the \beamer\ class with \LyX, you have to do all of the above. You also have to make \LyX\ aware of the file |beamer.layout|. This file is \emph{not part of the \beamer\ package} since it is updated and managed by the \LyX\ development team. This means that in reasonably up-to-date \LyX\ versions this file will already be installed and nothing needs to be done.
 
 \vskip1em
-For a more detailed explanation of the standard installation process
-of packages, you might wish to consult
-\href{http://www.ctan.org/installationadvice/}{|http://www.ctan.org/installationadvice/|}.
-However, note that the \beamer\ package does not come with a
-|.ins| file (simply skip that part).
-
-
+For a more detailed explanation of the standard installation process of packages, you might wish to consult \href{http://www.ctan.org/installationadvice/}{|http://www.ctan.org/installationadvice/|}. However, note that the \beamer\ package does not come with a |.ins| file (simply skip that part).
 
 
 \subsection{Updating the Installation}
 
-To update your installation from a previous version, simply replace
-everything in the directory
+To update your installation from a previous version, simply replace everything in the directory
 \begin{verbatim}
 texmf/tex/latex/beamer
 \end{verbatim}
-with the files of the new version. The easiest way to do this is to
-first delete the old version and then proceed as described above.
+with the files of the new version. The easiest way to do this is to first delete the old version and then to proceed as described above.
+
+Note that if you have two versions installed, one in |texmf| and other in |texmf-local| directory, \TeX\ distribution will prefer one in |texmf-local| directory. This generally allows you to update packages manually without administrator privileges.
 
 
 \subsection{Testing the Installation}
 
-To test your installation, copy the file
-|generic-ornate-15min-45min.en.tex| from the directory
+To test your installation, copy the file |generic-ornate-15min-45min.en.tex| from the directory
 \begin{verbatim}
 beamer/solutions/generic-talks
 \end{verbatim}
-to some place where you usually
-create presentations. Then run the command |pdflatex| several times on
-the file and check whether the resulting \textsc{pdf} file looks
-correct. If so, you are all set. 
+to some place where you usually create presentations. Then run the command |pdflatex| several times on the file and check whether the resulting \pdf\ file looks correct. If so, you are all set.
 
 \lyxnote
-To test the \LyX\ installation, create a new file from the
-template |generic-ornate-15min-45min.en.lyx|, which is located in the directory
-|beamer/solutions/generic-talks|.
+To test the \LyX\ installation, create a new file from the template |generic-ornate-15min-45min.en.lyx|, which is located in the directory |beamer/solutions/generic-talks|.
 
 
 \input{beamerug-compatibility}
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-interaction.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-interaction.tex
index 2fa2afdadd0..7f6be1cd3a1 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-interaction.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-interaction.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,43 +8,26 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-interaction.tex,v 1.9 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Structuring a Presentation: The Interactive Global Structure}
-
 \label{section-nonlinear}
 
-
 \subsection{Adding Hyperlinks and Buttons}
 
-To create anticipated nonlinear jumps in your talk structure, you
-can add hyperlinks to your presentation. A hyperlink is a text
-(usually rendered as a button) that, when you click on it, jumps the
-presentation to some other slide. Creating such a button is a
-three-step process: 
+To create anticipated nonlinear jumps in your talk structure, you can add hyperlinks to your presentation. A hyperlink is a text (usually rendered as a button) that, when you click on it, jumps the presentation to some other slide. Creating such a button is a three-step process:
 \begin{enumerate}
 \item
-  You specify a target using the command |\hypertarget| or (easier)
-  the command |\label|. In some cases, see below, this step may be
-  skipped. 
+  You specify a target using the command |\hypertarget| or (easier) the command |\label|. In some cases, see below, this step may be skipped.
 \item
-  You render the button using |\beamerbutton| or a similar
-  command. This will \emph{render} the button, but clicking it will
-  not yet have any effect. 
+  You render the button using |\beamerbutton| or a similar command. This will \emph{render} the button, but clicking it will not yet have any effect.
 \item
-  You put the button inside a |\hyperlink| command. Now clicking it
-  will jump to the target of the link.  
+  You put the button inside a |\hyperlink| command. Now clicking it will jump to the target of the link.
 \end{enumerate}
 
-\begin{command}{\hypertarget\sarg{overlay specification}%
-    \marg{target name}\marg{text}}
-  If the \meta{overlay specification} is present, the \meta{text} is
-  the target for hyper jumps to \meta{target name} only on the
-  specified slide. On all other slides, the text is shown
-  normally. Note that you \emph{must} add an overlay specification to
-  the |\hypertarget| command whenever you use it on frames that have
-  multiple slides (otherwise |pdflatex| rightfully complains
-  that you have defined the same target on different slides).
+\begin{command}{\hypertarget\sarg{overlay specification}\marg{target name}\marg{text}}
+  If the \meta{overlay specification} is present, the \meta{text} is the target for hyper jumps to \meta{target name} only on the specified slide. On all other slides, the text is shown normally. Note that you \emph{must} add an overlay specification to the |\hypertarget| command whenever you use it on frames that have multiple slides (otherwise |pdflatex| rightfully complains that you have defined the same target on different slides).
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -59,15 +43,10 @@ three-step process:
 \end{verbatim}
 
   \articlenote
-  You must say |\usepackage{hyperref}| in your preamble to use this
-  command in |article| mode.
+  You must say |\usepackage[hyperref]{beamerarticle}| or |\usepackage{hyperref}| in your preamble to use this command in |article| mode.
 \end{command}
 
-The |\label| command creates a hypertarget as a side-effect and the
-|label=|\meta{name} option of the |\frame| command creates a label
-named \meta{name}|<|\meta{slide number}|>| for each slide of the frame
-as a side-effect. Thus the above example could be written more easily
-as: 
+The |\label| command creates a hypertarget as a side-effect and the |label=|\meta{name} option of the |\frame| command creates a label named \meta{name}|<|\meta{slide number}|>| for each slide of the frame as a side-effect. Thus the above example could be written more easily as:
 \begin{verbatim}
 \begin{frame}[label=threeitems]
   \begin{itemize}
@@ -80,71 +59,51 @@ as:
 \end{frame}
 \end{verbatim}
 
-
-
-The following commands can be used to specify in an abstract way what
-a button will be used for.
+The following commands can be used to specify in an abstract way what a button will be used for.
 
 \begin{command}{\beamerbutton\marg{button text}}
   Draws a button with the given \meta{button text}.
-  \example |\hyperlink{somewhere}{\beamerbutton{Go somewhere}}|
+
+  \example
+  |\hyperlink{somewhere}{\beamerbutton{Go somewhere}}|
 
   \articlenote
-  This command (and the following) just insert their argument in
-  |article| mode.
+  This command (and the following) just insert their argument in |article| mode.
 
   \begin{element}{button}\yes\yes\yes
-    When the |\beamerbutton| command is called, this template is used
-    to render the button. Inside the template you can use the command
-    |\insertbuttontext| to insert the argument that was passed to
-    |\beamerbutton|.
+    When the |\beamerbutton| command is called, this template is used to render the button. Inside the template you can use the command |\insertbuttontext| to insert the argument that was passed to |\beamerbutton|.
     \begin{templateoptions}
       \itemoption{default}{}
-      Typesets the button with rounded corners. The fore- and
-      background of the \beamer-color |button| are used and also the
-      \beamer-font |button|. The border of the button gets the
-      foreground of the \beamer-color |button border|.
+      Typesets the button with rounded corners. The fore- and background of the \beamer-color |button| are used and also the \beamer-font |button|. The border of the button gets the foreground of the \beamer-color |button border|.
     \end{templateoptions}
     The following inserts are useful for this element:
     \begin{itemize}
-      \iteminsert{\insertbuttontext} inserts the text of the current
-      button. Inside ``Goto-Buttons'' (see below) this text is
-      prefixed by the insert |\insertgotosymbol| and similarly for
-      skip and return buttons.
-
-      \iteminsert{\insertgotosymbol} This text is inserted at the
-      beginning of goto buttons. Redefine this command to change the
-      symbol.
+      \iteminsert{\insertbuttontext} inserts the text of the current button. Inside ``Goto-Buttons'' (see below) this text is prefixed by the insert |\insertgotosymbol| and similarly for skip and return buttons.
+
+      \iteminsert{\insertgotosymbol} This text is inserted at the beginning of goto buttons. Redefine this command to change the symbol.
       \example
       |\renewcommand{\insertgotosymbol}{\somearrowcommand}|
 
-      \iteminsert{\insertskipsymbol} This text is inserted at the
-      beginning of skip buttons.
+      \iteminsert{\insertskipsymbol} This text is inserted at the beginning of skip buttons.
 
-      \iteminsert{\insertreturnsymbol} This text is inserted at the
-      beginning of return buttons.
+      \iteminsert{\insertreturnsymbol} This text is inserted at the beginning of return buttons.
     \end{itemize}
   \end{element}
 
   \begin{element}{button border}\no\yes\no
-    The foreground of this color is used to render the border of
-    buttons. 
+    The foreground of this color is used to render the border of buttons.
   \end{element}
 \end{command}
 
 \begin{command}{\beamergotobutton\marg{button text}}
-  Draws a button with the given \meta{button text}. Before the text, a
-  small symbol (usually a right-pointing arrow) is inserted that
-  indicates that pressing this button will jump to another ``area'' of
-  the presentation.
+  Draws a button with the given \meta{button text}. Before the text, a small symbol (usually a right-pointing arrow) is inserted that indicates that pressing this button will jump to another ``area'' of the presentation.
 
-  \example |\hyperlink{detour}{\beamergotobutton{Go to detour}}|
+  \example
+  |\hyperlink{detour}{\beamergotobutton{Go to detour}}|
 \end{command}
 
 \begin{command}{\beamerskipbutton\marg{button text}}
-  The symbol drawn for this button is usually a double right
-  arrow. Use this button if pressing it will skip over a
-  well-defined part of your talk.
+  The symbol drawn for this button is usually a double right arrow. Use this button if pressing it will skip over a well-defined part of your talk.
 
   \example
 \begin{verbatim}
@@ -166,8 +125,7 @@ a button will be used for.
 \end{command}
 
 \begin{command}{\beamerreturnbutton\marg{button text}}
-  The symbol drawn for this button is usually a left-pointing
-  arrow. Use this button if pressing it will return from a detour. 
+  The symbol drawn for this button is usually a left-pointing arrow. Use this button if pressing it will return from a detour.
 
   \example
 \begin{verbatim}
@@ -192,26 +150,13 @@ a button will be used for.
 \end{verbatim}
 \end{command}
 
-To make a button ``clickable'' you must place it in a command like
-|\hyperlink|. The command |\hyperlink| is a standard command of the
-|hyperref| package. The \beamer\ class defines a whole bunch of other
-hyperlink commands that you can also use.
-
-\begin{command}{\hyperlink\sarg{overlay specification}\marg{target
-      name}\marg{link text}\sarg{overlay specification}}
-  Only one \meta{overlay specification} may be given.
-  The \meta{link text} is typeset in the usual way. If you click
-  anywhere on this text, you will jump to the slide on which the
-  |\hypertarget| command was used with the parameter \meta{target
-    name}. If an \meta{overlay specification} is present, the
-    hyperlink (including the \meta{link text}) is completely
-    suppressed on the non-specified slides.
+To make a button ``clickable'' you must place it in a command like |\hyperlink|. The command |\hyperlink| is a standard command of the |hyperref| package. The \beamer\ class defines a whole bunch of other hyperlink commands that you can also use.
+
+\begin{command}{\hyperlink\sarg{overlay specification}\marg{target name}\marg{link text}\sarg{overlay specification}}
+  Only one \meta{overlay specification} may be given. The \meta{link text} is typeset in the usual way. If you click anywhere on this text, you will jump to the slide on which the |\hypertarget| command was used with the parameter \meta{target name}. If an \meta{overlay specification} is present, the hyperlink (including the \meta{link text}) is completely suppressed on the non-specified slides.
 \end{command}
 
-The following commands have a predefined target; otherwise they behave
-exactly like |\hyperlink|. In particular, they all also accept an
-overlay specification and they also accept it at the end, rather than
-at the beginning.
+The following commands have a predefined target; otherwise they behave exactly like |\hyperlink|. In particular, they all also accept an overlay specification and they also accept it at the end, rather than at the beginning.
 
 \begin{command}{\hyperlinkslideprev\sarg{overlay specification}\marg{link text}}
   Clicking the text jumps one slide back.
@@ -220,7 +165,7 @@ at the beginning.
 \begin{command}{\hyperlinkslidenext\sarg{overlay specification}\marg{link text}}
   Clicking the text jumps one slide forward.
 \end{command}
-  
+
 \begin{command}{\hyperlinkframestart\sarg{overlay specification}\marg{link text}}
   Clicking the text jumps to the first slide of the current frame.
 \end{command}
@@ -237,22 +182,18 @@ at the beginning.
   Clicking the text jumps to the last slide of the previous frame.
 \end{command}
 
-The previous four command exist also with ``|frame|'' replaced by
-``|subsection|'' everywhere, and also again with  ``|frame|'' replaced
-by ``|section|''.
+The previous four command exist also with ``|frame|'' replaced by ``|subsection|'' everywhere, and also again with  ``|frame|'' replaced by ``|section|''.
 
 \begin{command}{\hyperlinkpresentationstart\sarg{overlay specification}\marg{link text}}
   Clicking the text jumps to the first slide of the presentation.
 \end{command}
 
 \begin{command}{\hyperlinkpresentationend\sarg{overlay specification}\marg{link text}}
-  Clicking the text jumps to the last slide of the presentation. This
-  \emph{excludes} the appendix.
+  Clicking the text jumps to the last slide of the presentation. This \emph{excludes} the appendix.
 \end{command}
 
 \begin{command}{\hyperlinkappendixstart\sarg{overlay specification}\marg{link text}}
-  Clicking the text jumps to the first slide of the appendix. If there
-  is no appendix, this will jump to the last slide of the document.
+  Clicking the text jumps to the first slide of the appendix. If there is no appendix, this will jump to the last slide of the document.
 \end{command}
 
 \begin{command}{\hyperlinkappendixend\sarg{overlay specification}\marg{link text}}
@@ -264,32 +205,17 @@ by ``|section|''.
 \end{command}
 
 \begin{command}{\hyperlinkdocumentend\sarg{overlay specification}\marg{link text}}
-  Clicking the text jumps to the last slide of the presentation or, if
-  an appendix is present, to the last slide of the appendix.
+  Clicking the text jumps to the last slide of the presentation or, if an appendix is present, to the last slide of the appendix.
 \end{command}
 
 
-
-
 \subsection{Repeating a Frame at a Later Point}
 
-Sometimes you may wish some slides of a frame to be shown in your main
-talk, but wish some ``supplementary'' slides of the frame to be shown
-only in the the appendix. In this case, the |\againframe| commands is
-useful. 
+Sometimes you may wish some slides of a frame to be shown in your main talk, but wish some ``supplementary'' slides of the frame to be shown only in the the appendix. In this case, the |\againframe| command is useful.
 
-
-\begin{command}{\againframe\sarg{overlay
-      specification}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{options}\marg{name}}
+\begin{command}{\againframe\sarg{overlay specification}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{options}\marg{name}}
   \beamernote
-  Resumes a frame that was previously created using |\frame|
-  with the option |label=|\meta{name}. You must have used this option,
-  just placing a label inside a frame ``by hand'' is not enough. You
-  can use this command to ``continue'' a frame that has been
-  interrupted by another frame. The effect of this command is to call
-  the |\frame| command with the given \meta{overlay specification},
-  \meta{default overlay specification} (if present), and
-  \meta{options} (if present) and with the original frame's contents. 
+  Resumes a frame that was previously created using |\frame| with the option |label=|\meta{name}. You must have used this option, just placing a label inside a frame ``by hand'' is not enough. You can use this command to ``continue'' a frame that has been interrupted by another frame. The effect of this command is to call the |\frame| command with the given \meta{overlay specification}, \meta{default overlay specification} (if present), and \meta{options} (if present) and with the original frame's contents.
 
   \example
 \begin{verbatim}
@@ -309,11 +235,8 @@ useful.
 
 \againframe<3>{myframe}
 \end{verbatim}
-  The effect of the above code is to create four slides. In the first
-  two, the items 1 and~2 are hilighted. The third slide contains the
-  text ``Some stuff explaining more on the second matter.'' The fourth
-  slide is identical to the first two slides, except that the third
-  point is now hilighted.
+
+  The effect of the above code is to create four slides. In the first two, the items 1 and~2 are highlighted. The third slide contains the text ``Some stuff explaining more on the second matter.'' The fourth slide is identical to the first two slides, except that the third point is now highlighted.
 
   \example
 \begin{verbatim}
@@ -344,105 +267,45 @@ useful.
 
 \againframe<2>{Cantor}
 \end{verbatim}
-  In this example, the proof details are deferred to a slide in the
-  appendix. Hyperlinks are setup, so that one can jump to the proof
-  and go back.
+
+  In this example, the proof details are deferred to a slide in the appendix. Hyperlinks are setup, so that one can jump to the proof and go back.
 
   \articlenote
   This command is ignored in |article| mode.
 
   \lyxnote
-  Use the style ``AgainFrame'' to insert an |\againframe| command. The
-  \meta{label name} is the text on following the style name
-  and is \emph{not} put in \TeX-mode. However, an overlay specification
-  must be given in \TeX-mode and it must precede the label name.
+  Use the style ``AgainFrame'' to insert an |\againframe| command. The \meta{label name} is the text on following the style name and is \emph{not} put in \TeX-mode. However, an overlay specification must be given in \TeX-mode and it must precede the label name.
 \end{command}
 
 
-
 \subsection{Adding Anticipated Zooming}
-
 \label{section-zooming}
 
+Anticipated zooming is necessary when you have a very complicated graphic that you are not willing to simplify since, indeed, all the complex details merit an explanation. In this case, use the command |\framezoom|. It allows you to specify that clicking on a certain area of a frame should zoom out this area. You can then explain the details. Clicking on the zoomed out picture will take you back to the original one.
+
+\begin{command}{\framezoom\ssarg{button overlay specification}\ssarg{zoomed overlay specification}\oarg{options}\\|(|\meta{upper left x}|,|\meta{upper left y}|)(|\meta{zoom area width}|,|\meta{zoom area depth}|)|}
+  This command should be given somewhere at the beginning of a frame. When given, two different things will happen, depending on whether the \meta{button overlay specification} applies to the current slide of the frame or whether the \meta{zoomed overlay specification} applies. These overlay specifications should not overlap.
 
-Anticipated zooming is necessary when you have a very complicated
-graphic that you are not willing to simplify since, indeed, all the
-complex details merit an explanation. In this case, use the command
-|\framezoom|. It allows you to specify that clicking on a certain area
-of a frame should zoom out this area. You can then explain the
-details. Clicking on the zoomed out picture will take you back to the
-original one. 
-
-\begin{command}{\framezoom\ssarg{button overlay
-      specification}\ssarg{zoomed overlay
-      specification}\oarg{options}\\|(|\meta{upper left x}|,|\meta{upper
-      left y}|)(|\meta{zoom area width}|,|\meta{zoom area depth}|)|}
-  This command should be given somewhere at the beginning of a
-  frame. When given, two different things will happen, depending on
-  whether the \meta{button overlay specification} applies to the
-  current slide of the frame or whether the \meta{zoomed overlay
-    specification} applies. These overlay specifications should not
-  overlap.
-
-  If the \meta{button overlay specification} applies, a clickable area
-  is created inside the frame. The size of this area is given by
-  \meta{zoom area width} and \meta{zoom area depth}, which are two
-  normal \TeX\ dimensions (like |1cm| or |20pt|). The upper left
-  corner of this area is given by \meta{upper left x} and \meta{upper
-  left y}, which are also \TeX\ dimensions. They are measures
-  \emph{relative to the place where the first normal text of a
-    frame would go}. Thus, the location |(0pt,0pt)| is at the
-  beginning of the normal text (which excludes the headline and also
-  the frame title).
-
-  By default, the button is clickable, but it will not be indicated in
-  any special way. You can draw a border around the button by using
-  the following \meta{option}:
+  If the \meta{button overlay specification} applies, a clickable area is created inside the frame. The size of this area is given by \meta{zoom area width} and \meta{zoom area depth}, which are two normal \TeX\ dimensions (like |1cm| or |20pt|). The upper left corner of this area is given by \meta{upper left x} and \meta{upper left y}, which are also \TeX\ dimensions. They are measures \emph{relative to the place where the first normal text of a frame would go}. Thus, the location |(0pt,0pt)| is at the beginning of the normal text (which excludes the headline and also the frame title).
+
+  By default, the button is clickable, but it will not be indicated in any special way. You can draw a border around the button by using the following \meta{option}:
   \begin{itemize}
-  \item \declare{|border|}\opt{|=|\meta{width in pixels}} will draw
-    a border around the specified button area. The default width is 1
-    pixel. The color of this  button is the |linkbordercolor| of
-    |hyperref|. \beamer\ sets this color to a 50\% gray by default. To
-    change this, you can use the command
-    |\hypersetup{linkbordercolor={|\meta{red}| |\meta{green}| |\meta{blue}|}}|, 
-    where \meta{red}, \meta{green}, and \meta{blue} are values between
-    0 and 1.
+  \item
+    \declare{|border|}\opt{|=|\meta{width in pixels}} will draw a border around the specified button area. The default width is 1 pixel. The color of this  button is the |linkbordercolor| of |hyperref|. \beamer\ sets this color to a 50\% gray by default. To change this, you can use the command |\hypersetup{linkbordercolor={|\meta{red}| |\meta{green}| |\meta{blue}|}}|, where \meta{red}, \meta{green}, and \meta{blue} are values between 0 and 1.
   \end{itemize}
 
-  When you press the button created in this way, the viewer
-  application will hyperjump to the first of the frames specified by
-  the \meta{zoomed overlay specification}. For the slides to which
-  this overlay specification applies, the following happens:
-
-  The exact same area as the one specified before is ``zoomed out'' to
-  fill the whole normal text area of the frame. Everything else,
-  including the sidebars, the headlines and footlines, and even the
-  frame title retain their normal size. The zooming is performed in
-  such a way that the whole specified area is completely shown. The
-  aspect ratio is kept correct and the zoomed area will possibly show
-  more than just the specified area if the aspect ratio of this area
-  and the aspect ratio of the available text area do not agree.
-
-  Behind the whole text area (which contains the zoomed area) a big
-  invisible ``Back'' button is put. Thus clicking anywhere on the text
-  area will jump back to the original (unzoomed) picture.
-
-  You can specify several zoom areas for a single frame. In this case,
-  you should specify different \meta{zoomed overlay specification},
-  but you can specify the same \meta{button overlay
-  specification}. You cannot nest zoomings in the sense that you
-  cannot have a zoom button on a slide that is in some \meta{zoomed
-  overlay specification}. However, you can have overlapping and even
-  nested \meta{button overlay specification}. When clicking on an area
-  that belongs to several buttons, the one given last will ``win'' (it
-  should hence be the smallest one).
-
-  If you do not wish to have the frame title shown on a zoomed slide,
-  you can add an overlay specification to the |\frametitle| command
-  that simply suppresses the title for the slide. Also, by using the
-  |plain| option, you can have the zoomed slide fill the whole page. 
-
-  \example A simple case
+  When you press the button created in this way, the viewer application will hyperjump to the first of the frames specified by the \meta{zoomed overlay specification}. For the slides to which this overlay specification applies, the following happens:
+
+  The exact same area as the one specified before is ``zoomed out'' to fill the whole normal text area of the frame. Everything else, including the sidebars, the headlines and footlines, and even the frame title retain their normal size. The zooming is performed in such a way that the whole specified area is completely shown. The aspect ratio is kept correct and the zoomed area will possibly show more than just the specified area if the aspect ratio of this area and the aspect ratio of the available text area do not agree.
+
+  Behind the whole text area (which contains the zoomed area) a big invisible ``Back'' button is put. Thus clicking anywhere on the text area will jump back to the original (unzoomed) picture.
+
+  You can specify several zoom areas for a single frame. In this case, you should specify different \meta{zoomed overlay specification}, but you can specify the same \meta{button overlay specification}. You cannot nest zoomings in the sense that you cannot have a zoom button on a slide that is in some \meta{zoomed overlay specification}. However, you can have overlapping and even nested \meta{button overlay specification}. When clicking on an area that belongs to several buttons, the one given last will ``win'' (it should hence be the smallest one).
+
+  If you do not wish to have the frame title shown on a zoomed slide, you can add an overlay specification to the |\frametitle| command that simply suppresses the title for the slide. Also, by using the |plain| option, you can have the zoomed slide fill the whole page.
+
+  \example
+  A simple case
 \begin{verbatim}
 \begin{frame}
   \frametitle{A Complicated Picture}
@@ -455,8 +318,8 @@ original one.
 \end{frame}
 \end{verbatim}
 
-  \example A more complicate case in which the zoomed parts completely
-  fill the frames.
+  \example
+  A more complicate case in which the zoomed parts completely fill the frames.
 \begin{verbatim}
 \begin{frame}<1>[label=zooms]
   \frametitle<1>{A Complicated Picture}
@@ -470,13 +333,3 @@ original one.
 \againframe<2->[plain]{zooms}
 \end{verbatim}
 \end{command}
-
-
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-introduction.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-introduction.tex
index cf0c286edce..732be2919e2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-introduction.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-introduction.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,163 +8,79 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-introduction.tex,v 1.17 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Introduction}
 
-\beamer\ is a \LaTeX\ class for creating presentations that are 
-held using a projector, but it can also be used to create transparency
-slides. Preparing presentations with \beamer\ is different from
-preparing them with \textsc{wysiwyg} programs like OpenOffice's Impress, 
-Apple's Keynotes, or KOffice's KPresenter. A \beamer\ presentation is
-created like any other \LaTeX\ document: It has a preamble and a body,
-the body contains |\section|s and |\subsection|s, the different
-slides (called \emph{frames} in \beamer) are put in environments, they
-are structured using |itemize| and |enumerate| environments, and so
-on. The obvious disadvantage of this approach is that you have to know
-\LaTeX\ in order to use \beamer. The advantage is that if you know
-\LaTeX, you can use your knowledge of \LaTeX\ also when creating a
-presentation, not only when writing papers.
+\beamer\ is a \LaTeX\ class for creating presentations that are held using a projector, but it can also be used to create transparency slides. Preparing presentations with \beamer\ is different from preparing them with \textsc{wysiwyg} programs like OpenOffice.org Impress, Apple Keynote, KOffice KPresenter or Microsoft PowerPoint. A \beamer\ presentation is created like any other \LaTeX\ document: It has a preamble and a body, the body contains |\section|s and |\subsection|s, the different slides (called \emph{frames} in \beamer) are put in environments, they are structured using |itemize| and |enumerate| environments, and so on. The obvious disadvantage of this approach is that you have to know \LaTeX\ in order to use \beamer. The advantage is that if you know \LaTeX, you can use your knowledge of \LaTeX\ also when creating a presentation, not only when writing papers.
 
 
 \subsection{Main Features}
 
-The list of features supported by \beamer\ is quite long
-(unfortunately, so is presumably the list of bugs supported by
-\beamer). The most important features, in my opinion, are:
+The list of features supported by \beamer\ is quite long (unfortunately, so is presumably the list of bugs supported by \beamer). The most important features, in our opinion, are:
 \begin{itemize}
 \item
-  You can use \beamer\ both with |pdflatex| and |latex|+|dvips|.
+  You can use \beamer\ with |pdflatex|, |latex|+|dvips|, |lualatex| and |xelatex|. |latex|+|dvipdfm| isn't supported (but we accept patches!).
 \item
-  The standard commands of \LaTeX\ still work. A |\tableofcontents| will
-  still create a table of contents, |\section| is still used to create
-  structure, and |itemize| still creates a list.
+  The standard commands of \LaTeX\ still work. A |\tableofcontents| will still create a table of contents, |\section| is still used to create structure, and |itemize| still creates a list.
 \item
   You can easily create overlays and dynamic effects.
 \item
-  Themes allow you to change the appearance of your presentation to
-  suit you purposes.
+  Themes allow you to change the appearance of your presentation to suit your purposes.
 \item
-  The themes are designed to be usable in practice, they are not just
-  for show. You will not find such nonsense as a green body text on
-  a picture of a green meadow.
+  The themes are designed to be usable in practice, they are not just for show. You will not find such nonsense as a green body text on a picture of a green meadow.
 \item
-  The layout, the colors, and the fonts used in a presentation can
-  easily be changed globally, but you still also have control over
-  the most minute detail.
+  The layout, the colors, and the fonts used in a presentation can easily be changed globally, but you still also have control over the most minute detail.
 \item
-  A special style file allows you to use the \LaTeX-source of a
-  presentation directly in other \LaTeX\ classes like |article| or
-  |book|. This makes it easy to create presentations out of lecture
-  notes or lecture notes out of presentations.
+  A special style file allows you to use the \LaTeX-source of a presentation directly in other \LaTeX\ classes like |article| or |book|. This makes it easy to create presentations out of lecture notes or lecture notes out of presentations.
 \item
-  The final output is typically a \textsc{pdf}-file. Viewer
-  applications for this format exist for virtually every
-  platform. When bringing your presentation to a conference on a
-  memory stick, you do not have to worry about which version of the
-  presentation program might be installed there. Also, your
-  presentation is going to look exactly the way it looked on your
-  computer. 
+  The final output is typically a \textsc{pdf}-file. Viewer applications for this format exist for virtually every platform. When bringing your presentation to a conference on a memory stick, you do not have to worry about which version of the presentation program might be installed there. Also, your presentation is going to look exactly the way it looked on your computer.
 \end{itemize}
 
 
-
-
 \subsection{History}
 
-I created \beamer\ mainly in my spare time. Many other people have
-helped by writing me emails containing suggestions for improvement or
-corrections or patches or whole new themes (by now I have gotten over a
-thousand emails concerning \beamer). Indeed, most of the
-development was only initiated by feature requests and bug
-reports. Without this feedback, \beamer\ would still be what it was
-originally intended to be: a small private collection of macros that
-make using the |seminar| class easier. I created the first version of
-\beamer\ for my PhD defense presentation in February 2003. Month
-later, I put the package on \textsc{ctan} at the request of some
-colleagues. After that, things somehow got out of hand.
+Till Tantau created \beamer\ mainly in his spare time. Many other people have helped by sending him emails containing suggestions for improvement or corrections or patches or whole new themes (by now, this amounts to over a thousand emails concerning \beamer). Indeed, most of the development was only initiated by feature requests and bug reports. Without this feedback, \beamer\ would still be what it was originally intended to be: a small private collection of macros that make using the |seminar| class easier. Till created the first version of \beamer\ for his PhD defense presentation in February 2003. A month later, he put the package on \textsc{ctan} at the request of some colleagues. After that, things somehow got out of hand.
 
+After being unmaintained since 2007, in April 2010 Till handed over the maintenance to Joseph Wright and Vedran Mileti\'c, who are still maintaining it: improving code, fixing bugs, adding new features and helping users.
 
 
 \subsection{Acknowledgments}
 
-Where to begin? \beamer's development depends not only on me, but on
-the feedback I get from other people. Many features have been
-implemented because someone requested them and I thought that these
-features would be nice to have and reasonably easy to implement. Other
-people have given valuable feedback on themes, on the user's guide,
-on features of the class, on the internals of the implementation, on
-special \LaTeX\ features, and on life in general. A small selection of
-these people includes (in no particular order and I have surely
-forgotten to name lots of people who really, really deserve being in
-this list): Carsten (for everything), Birgit (for being the first
-person to use \beamer\ besides me), Tux (for his silent criticism),
-Rolf Niepraschk (for showing me how to program \LaTeX\ correctly),
-Claudio Beccari (for writing part of the documentation  on font
-encodings), Thomas Baumann (for the emacs stuff), Stefan M\"uller (for
-not loosing hope), Uwe Kern (for \textsc{xcolor}), Hendri Adriaens
-(for \textsc{ha-prosper}), Ohura Makoto (for spotting typos). People
-who have contributed to the themes include Paul Gomme, Manuel Carro,
-and Marlon R�gis Schmitz.  
+Till Tantau: \emph{``Where to begin? \beamer's development depends not only on me, but on the feedback I get from other people. Many features have been implemented because someone requested them and I thought that these features would be nice to have and reasonably easy to implement. Other people have given valuable feedback on themes, on the user's guide, on features of the class, on the internals of the implementation, on special \LaTeX\ features, and on life in general. A small selection of these people includes (in no particular order and I have surely forgotten to name lots of people who really, really deserve being in this list): Carsten (for everything), Birgit (for being the first person to use \beamer\ besides me), Tux (for his silent criticism), Rolf Niepraschk (for showing me how to program \LaTeX\ correctly), Claudio Beccari (for writing part of the documentation  on font encodings), Thomas Baumann (for the emacs stuff), Stefan M\"uller (for not loosing hope), Uwe Kern (for \textsc{xcolor}), Hendri Adriaens (for \textsc{ha-prosper}), Ohura Makoto (for spotting typos). People who have contributed to the themes include Paul Gomme, Manuel Carro, and Marlon R\'egis Schmitz.''}
+
+Joseph Wright: \emph{``Thanks to Till Tantau for the huge development effort in creating \beamer. Sincere thanks to Vedran Mileti\'c for taking the lead in continuing development.''}
 
+Vedran Mileti\'c: \emph{``First, I would like to thank Karl Berry and Sanda Buja\v ci\'c for encouragement, without which I wouldn't ever be anything but a \LaTeX\ user. I would also like to thank Ana Me\v strovi\'c, my colleague, who was excited by the prospect of using \beamer\ for preparing class material; Ivona Frankovi\'c and Marina Rajnovi\'c, my students at Department of Informatics, who were the first to hear about \LaTeX, \beamer\ and how it can help in preparing class material. I would like to thank Heiko Oberdiek (for \textsc{hyperref}), Johannes Braams (for \textsc{babel}) and Philipp Lehman (for \textsc{biblatex}). Above all, I owe a lot to Till Tantau for developing \beamer\ in the first place and to Joseph Wright for developing \textsc{siunitx} and for helping me develop \beamer\ further.''}
 
 
+\subsection{How to Read this User's Guide}
 
+You should start with the first part. If you have not yet installed the package, please read Section~\ref{section-installation} first. If you are new to \beamer, you should next read the tutorial in Section~\ref{section-tutorial}. When you sit down to create your first real presentation using \beamer, read Section~\ref{section-workflow} where the technical details of a possible workflow are discussed. If you are still new to creating presentations in general, you might find Section~\ref{section-guidelines} helpful, where many guidelines are given on what to do and what not to do. Finally, you should browse through Section~\ref{section-solutions}, where you will find ready-to-use solution templates for creating talks, possibly even in the language you intend to use.
 
+The second part of this user's guide goes into the details of all the commands defined in \beamer, but it also addresses  other technical issues having to do with creating presentations (like how to include graphics or animations).
 
-\subsection{How to Read this User's Guide}
+The third part explains how you can change the appearance of your presentation easily either using themes or by specifying colors or fonts for specific elements of a presentation (like, say, the font used for the numbers in an enumeration).
+
+The fourth part talks about handouts and lecture notes, so called ``support material''. You will frequently have create some kind of support material to give to your audience during the talk or after it, and this part will explain how to do it using the same source that you created your presentation from.
 
-You should start with the first part. If you have not yet installed
-the package, please read Section~\ref{section-installation} first. If 
-you are new to \beamer, you should next read the tutorial in
-Section~\ref{section-tutorial}. When you set down to create your first
-real presentation using \beamer, read Section~\ref{section-workflow}
-where the technical details of a possible workflow are
-discussed. If you are still new to creating presentations in general, you
-might find Section~\ref{section-guidelines} helpful, where many
-guidelines are given on what to do and what not to do. Finally, you
-should browse through Section~\ref{section-solutions}, where you will
-find ready-to-use solution templates for creating talks, possibly even
-in the language you intend to use.
-
-The second part of this user's guide goes into the details of all the
-commands defined in \beamer, but it also addresses  other technical
-issues having to do with creating presentations (like how to include
-graphics or animations).
-
-The third part explains how you can change the appearance of your
-presentation easily either using themes or by specifying colors or
-fonts for specific elements of a presentation (like, say, the font
-used for the numbers in an enumerate). 
-
-The last part contains ``howtos,'' which are explanations of how to
-get certain things done using \beamer.
+The last part contains ``howtos,'' which are explanations of how to get certain things done using \beamer.
 
 \medskip
 \noindent
-This user's guide contains descriptions of all ``public''
-commands, environments, and concepts defined by the \beamer-class. The
-following examples show how things are documented. As a general rule,
-red text is \emph{defined}, green text is \emph{optional}, blue text
-indicates special mode considerations.
+This user's guide contains descriptions of all ``public'' commands, environments, and concepts defined by the \beamer-class. The following examples show how things are documented. As a general rule, red text is \emph{defined}, green text is \emph{optional}, blue text indicates special mode considerations.
 
 \begingroup
 \noindexing
-\begin{command}{\somebeamercommand\oarg{optional arguments}\marg{first
-      argument}\marg{second argument}}
-  Here you will find the explanation of what the command
-  |\somebeamercommand| does. The green argument(s) is optional. The
-  command of this example takes two parameters.
+\begin{command}{\somebeamercommand\oarg{optional arguments}\marg{first argument}\marg{second argument}}
+  Here you will find the explanation of what the command |\somebeamercommand| does. The green argument(s) is optional. The command of this example takes two parameters.
 
   \example
   |\somebeamercommand[opt]{my arg}{xxx}|
 \end{command}
 
-\begin{environment}{{somebeamerenvironment}\oarg{optional arguments}\marg{first
-      argument}}
-  Here you will find the explanation of the effect of the environment
-  |somebeamerenvironment|. As with commands, the green arguments are
-  optional.
+\begin{environment}{{somebeamerenvironment}\oarg{optional arguments}\marg{first argument}}
+  Here you will find the explanation of the effect of the environment |somebeamerenvironment|. As with commands, the green arguments are optional.
 
   \example
 \begin{verbatim}
@@ -174,40 +91,23 @@ indicates special mode considerations.
 \end{environment}
 
 \begin{element}{some beamer element}\yes\yes\yes
-  Here you will find an explanation of the template, color,
-  and/or font |some beamer element|.
-  A ``\beamer-element'' is a concept that is explained in more detail
-  in Section~\ref{section-elements}. Roughly, an \emph{element}
-  is a part of a presentation that is potentially typeset in some
-  special way. Examples of elements are frame titles, the author's
-  name, or the footnote sign. For most elements there exists a
-  \emph{template}, see Section~\ref{section-elements} once more, and
-  also a \beamer-color and a \beamer-font.
-
-  For each element, it is indicated whether a template, a
-  \beamer-color, and/or a \beamer-font of the  
-  name |some beamer element| exist. Typically, all three exist and are
-  employed together when the element needs to be typeset, that is,
-  when the template is inserted the \beamer-color and -font are
-  installed first. However, sometimes templates do not have a color or
-  font associated with them (like parent templates). Also, there exist
-  \beamer-colors and -fonts that do not have an underlying template.
-
-  Using and changing templates is explained in
-  Section~\ref{section-templates}. Here is the essence: To change a
-  template, you can say 
+  Here you will find an explanation of the template, color, and/or font |some beamer element|. A ``\beamer-element'' is a concept that is explained in more detail in Section~\ref{section-elements}. Roughly speaking, an \emph{element} is a part of a presentation that is potentially typeset in some special way. Examples of elements are frame titles, the author's name, or the footnote sign. For most elements there exists a \emph{template}, see Section~\ref{section-elements} once more, and also a \beamer-color and a \beamer-font.
+
+  For each element, it is indicated whether a template, a \beamer-color, and/or a \beamer-font of the name |some beamer element| exist. Typically, all three exist and are employed together when the element needs to be typeset, that is, when the template is inserted the \beamer-color and -font are installed first. However, sometimes templates do not have a color or font associated with them (like parent templates). Also, there exist \beamer-colors and -fonts that do not have an underlying template.
+
+  Using and changing templates is explained in Section~\ref{section-templates}. Here is the essence: To change a template, you can say
 \begin{verbatim}
 \setbeamertemplate{some beamer element}{your definition for this template}
 \end{verbatim}
-  Unfortunately, it is not quite trivial to come up with a good definition for
-  some templates. Fortunately, there are often \emph{predefined options}
-  for a template. These are indicated like this:
+
+  Unfortunately, it is not quite trivial to come up with a good definition for some templates. Fortunately, there are often \emph{predefined options} for a template. These are indicated like this:
   \begin{itemize}
     \itemoption{square}{}
     causes a small square to be used to render the template.
     \itemoption{circle}{\marg{radius}}
     causes circles of the given radius to be used to render the template.
   \end{itemize}
+
   You can install such a predefined option like this:
 \begin{verbatim}
 \setbeamertemplate{some beamer element}[square]
@@ -216,92 +116,54 @@ indicates special mode considerations.
 \setbeamertemplate{some beamer element}[cirlce]{3pt}
 %% New a circle is used
 \end{verbatim}
-  
-  \beamer-colors are explained in Section~\ref{section-colors}. Here
-  is the essence: To change the foreground of the color to, say, red, use
+
+  \beamer-colors are explained in Section~\ref{section-colors}. Here is the essence: To change the foreground of the color to, say, red, use
 \begin{verbatim}
 \setbeamercolor{some beamer element}{fg=red}
 \end{verbatim}
+
   To change the background to, say, black, use:
 \begin{verbatim}
 \setbeamercolor{some beamer element}{bg=black}
 \end{verbatim}
-  You can also change them together using |fg=red,bg=black|. The
-  background will not always be ``honoured,'' since it is difficult to
-  show a colored background correctly and an extra effort must be made
-  by the templates (while the foreground color is usually used
-  automatically). 
-
-  \beamer-fonts are explained in Section~\ref{section-fonts}. Here is
-  the essence: To change the size of the font to, say, large, use:
+
+  You can also change them together using |fg=red,bg=black|. The background will not always be ``honoured,'' since it is difficult to show a colored background correctly and an extra effort must be made by the templates (while the foreground color is usually used automatically).
+
+  \beamer-fonts are explained in Section~\ref{section-fonts}. Here is the essence: To change the size of the font to, say, large, use:
 \begin{verbatim}
 \setbeamerfont{some beamer element}{size=\large}
 \end{verbatim}
-  In addition to the size, you can use things like |series=\bfseries|
-  to set the series, |shape=\itshape| to change the shape, 
-  |family=\sffamily| to change the family, and you can use them in
-  conjunction. Add a star to the command to first ``reset'' the font.
-\end{element}
 
+  In addition to the size, you can use things like |series=\bfseries| to set the series, |shape=\itshape| to change the shape, |family=\sffamily| to change the family, and you can use them in conjunction. Add a star to the command to first ``reset'' the font.
+\end{element}
 
 \beamernote
-As next to this paragraph, you will sometimes find the word
-\textsc{presentation} in blue next to some paragraph. This means that
-the paragraph applies only when you ``normally typeset your
-presentation using \LaTeX\ or pdf\LaTeX.''
+As next to this paragraph, you will sometimes find the word \textsc{presentation} in blue next to some paragraph. This means that the paragraph applies only when you ``normally typeset your presentation using \LaTeX\ or pdf\LaTeX.''
 
 \articlenote
-Opposed to this, a paragraph with \textsc{article} next to it
-describes some behaviour that is special for the |article| mode. This
-special mode is used to create lecture notes out of a presentation
-(the two can coexist in one file).
+Opposed to this, a paragraph with \textsc{article} next to it describes some behaviour that is special for the |article| mode. This special mode is used to create lecture notes out of a presentation (the two can coexist in one file).
 
 \lyxnote
-A paragraph with \textsc{lyx} next to it describes behaviour that is
-special when you use \LyX\ to prepare your presentation.
+A paragraph with \textsc{lyx} next to it describes behaviour that is special when you use \LyX\ to prepare your presentation.
 \endgroup
 
 
-
 \subsection{Getting Help}
 
 When you need help with \beamer, please do the following:
-
 \begin{enumerate}
 \item
-  Read the manual, at least the part that has to do with your problem.
+  Read the user guide, at least the part that has to do with your problem.
 \item
-  If that does not solve the problem, try having a look at the
-  sourceforge development page for \beamer\ (see the
-  title of this document). Perhaps someone has already reported a
-  similar problem and someone has found a solution.
+  If that does not solve the problem, try having a look at the bitbucket development page for \beamer\ (see the title of this document). Perhaps someone has already reported a similar problem and someone has found a solution.
 \item
-  On the website you will find numerous forums for getting
-  help. There, you can write to help forums, file bug reports, join
-  mailing lists, and so on.
+  On the website you will find numerous links to forums and mailing lists for getting help. There, you can write to help forums, file bug reports, join mailing lists, and so on.
 \item
-  Before you file a bug report, especially a bug report concerning the
-  installation, make sure that this is really a bug. In particular,
-  have a look at the |.log| file that results when you \TeX\ your
-  files. This |.log| file should show that all the right files are
-  loaded from the right directories. Nearly all installation problems
-  can be resolved by looking at the |.log| file.
+  Before you file a bug report, especially a bug report concerning the installation, make sure that this is really a bug. In particular, have a look at the |.log| file that results when you \TeX\ your files. This |.log| file should show that all the right files are loaded from the right directories. Nearly all installation problems can be resolved by looking at the |.log| file.
+
+  If you can, before reporting the bug, retest using latest version of \beamer\ with latest version of \TeX\ Live. This can help isolate bugs from other packages that might affect \beamer.
 \item
-  \emph{As a last resort} you can try to email me (the author). I do
-  not mind getting emails, I simply get way too many of them. Because
-  of this, I cannot guarantee that your emails will be answered timely
-  or even at all. Your chances that your problem will be fixed are
-  somewhat higher if you mail to the \beamer\ mailing list
-  (naturally, I read this list and answer questions when I have the
-  time).
+  \emph{As a last resort} you can try emailing authors. We do not mind getting emails, we simply get way too many of them. Because of this, we cannot guarantee that your emails will be answered timely or even at all. Your chances that your problem will be fixed are somewhat higher if you mail to the \beamer\ mailing list linked at bitbucket development page (naturally, we read this list and answer questions when we have the time).
 \item
-  Please, do not phone me in my office. If you need a hotline, buy a
-  commercial product.
+  Please, do not phone authors in the office. If you need a hotline, buy a commercial product.
 \end{enumerate}
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-license.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-license.tex
index 9a289ec1254..0a57e89ee42 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-license.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-license.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,1313 +8,339 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-license.tex,v 1.4 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Licenses and Copyright}
 \label{section-license}
 
-
 \subsection{Which License Applies?}
 
-Different parts of the \beamer\ package are distributed under
-different licenses:
-
+Different parts of the \beamer\ package are distributed under different licenses:
 \begin{enumerate}
-\item The \emph{code} of the package is dual-license. This
-  means that you can decide which license you wish to use when using the
-  \beamer\ package. The two options are:
+\item
+  The \emph{code} of the package is dual-license. This means that you can decide which license you wish to use when using the \beamer\ package. The two options are:
   \begin{enumerate}
-  \item You can use the \textsc{gnu} Public License, version 2.
-  \item You can use the \LaTeX\ Project Public License, version 1.3c.
+  \item
+    You can use the \textsc{gnu} General Public License, Version 2 or any later version published by the Free Software Foundation.
+  \item
+    You can use the \LaTeX\ Project Public License, version 1.3c or (at your option) any later version.
   \end{enumerate}
-\item The \emph{documentation} of the package is also dual-license. Again,
-  you can choose between two options:
+\item 
+  The \emph{documentation} of the package is also dual-license. Again, you can choose between two options:
   \begin{enumerate}
-  \item You can use the \textsc{gnu} Free Documentation License, version 1.2.
-  \item You can use the \LaTeX\ Project Public License, version 1.3c.
+  \item
+    You can use the \textsc{gnu} Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation.
+  \item
+    You can use the \LaTeX\ Project Public License, version 1.3c or (at your option) any later version.
   \end{enumerate}
 \end{enumerate}
 
-The ``documentation of the package'' refers to all files in the
-subdirectory |doc| of the \beamer\ package. A detailed listing can be
-found in the file |doc/licenses/manifest-documentation.txt|.
-All files in other directories are part of the ``code of the
-package.'' A detailed listing can be found in the file
-|doc/licenses/manifest-code.txt|.
+The ``documentation of the package'' refers to all files in the subdirectory |doc| of the \beamer\ package. A detailed listing can be found in the file |doc/licenses/manifest-documentation.txt|. All files in other directories are part of the ``code of the package.'' A detailed listing can be found in the file |doc/licenses/manifest-code.txt|.
 
-In the resest of this section, the licenses are presented. The
-following text is copyrighted, see the plain text versions of these
-licenses in the directory |doc/licenses| for details. 
+In the resest of this section, the licenses are presented. The following text is copyrighted, see the plain text versions of these licenses in the directory |doc/licenses| for details.
 
 
-\subsection{The GNU Public License, Version 2}
+\subsection{The GNU General Public License, Version 2}
 
 \subsubsection{Preamble}
 
-The licenses for most software are designed to take away your freedom to
-share and change it.  By contrast, the \textsc{gnu} General Public License is
-intended to guarantee your freedom to share and change free software---to
-make sure the software is free for all its users.  This General Public
-License applies to most of the Free Software Foundation's software and to
-any other program whose authors commit to using it.  (Some other Free
-Software Foundation software is covered by the \textsc{gnu} Library
-General Public License instead.)  You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this service
-if you wish), that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free programs;
-and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights.  These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have.  You
-must make sure that they, too, receive or can get the source code.  And
-you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If
-the software is modified by someone else and passed on, we want its
-recipients to know that what they have is not the original, so that any
-problems introduced by others will not reflect on the original authors'
-reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary.  To prevent this, we have made it clear that any patent must
-be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-\subsubsection{Terms and Conditions For Copying, Distribution and
-  Modification}
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the \textsc{gnu} General Public License is intended to guarantee your freedom to share and change free software---to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the \textsc{gnu} Library General Public License instead.) You can apply it to your programs, too.
 
-\begin{enumerate}
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
 
-\addtocounter{enumi}{-1}
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
 
-\item 
-This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the
-terms of this General Public License.  The ``Program'', below, refers to
-any such program or work, and a ``work based on the Program'' means either
-the Program or any derivative work under copyright law: that is to say, a
-work containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language.  (Hereinafter,
-translation is included without limitation in the term ``modification''.)
-Each licensee is addressed as ``you''.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-\item You may copy and distribute verbatim copies of the Program's source
-  code as you receive it, in any medium, provided that you conspicuously
-  and appropriately publish on each copy an appropriate copyright notice
-  and disclaimer of warranty; keep intact all the notices that refer to
-  this License and to the absence of any warranty; and give any other
-  recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
 
-\item
-You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
 
-\begin{enumerate}
-
-\item 
-You must cause the modified files to carry prominent notices stating that
-you changed the files and the date of any change.
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
 
-\item
-You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
 
-\item
-If the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
-
-\end{enumerate}
+The precise terms and conditions for copying, distribution and modification follow.
 
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-\item
-You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+\subsubsection{Terms and Conditions For Copying, Distribution and Modification}
 
 \begin{enumerate}
-
+\addtocounter{enumi}{-1}
 \item
-Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+  This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The ``Program'', below, refers to any such program or work, and a ``work based on the Program'' means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term ``modification''.) Each licensee is addressed as ``you''.
 
+  Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
 \item
-Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+  You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
 
+  You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
 \item
-Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsubsection b above.)
+  You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+  \begin{enumerate}
+  \item
+    You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+  \item
+    You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+  \item
+    If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+  \end{enumerate}
 
-\end{enumerate}
+  These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
 
+  Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+\item
+  You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+  \begin{enumerate}
+  \item
+    Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+  \item
+    Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+  \item
+    Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsubsection b above.)
+  \end{enumerate}
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
 
+  If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
 \item
-You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
+  You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
 \item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
+  You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
 \item
-Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
+  Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
 \item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
 
-\item
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+  If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
 
-\item
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and ``any
-later version'', you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
 
+  This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
 \item
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+\item
+  The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
 
+  Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and ``any later version'', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+\item
+  If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
 \end{enumerate}
 
 \subsubsection{No Warranty}
 
 \begin{enumerate}
-
 \addtocounter{enumi}{9}
-
 \item
-Because the program is licensed free of charge, there is no warranty
-for the program, to the extent permitted by applicable law.  Except when
-otherwise stated in writing the copyright holders and/or other parties
-provide the program ``as is'' without warranty of any kind, either expressed
-or implied, including, but not limited to, the implied warranties of
-merchantability and fitness for a particular purpose.  The entire risk as
-to the quality and performance of the program is with you.  Should the
-program prove defective, you assume the cost of all necessary servicing,
-repair or correction.
-
+  Because the program is licensed free of charge, there is no warranty for the program, to the extent permitted by applicable law. Except when otherwise stated in writing the copyright holders and/or other parties provide the program ``as is'' without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose. The entire risk as to the quality and performance of the program is with you. Should the program prove defective, you assume the cost of all necessary servicing, repair or correction.
 \item
-In no event unless required by applicable law or agreed to in writing
-will any copyright holder, or any other party who may modify and/or
-redistribute the program as permitted above, be liable to you for damages,
-including any general, special, incidental or consequential damages arising
-out of the use or inability to use the program (including but not limited
-to loss of data or data being rendered inaccurate or losses sustained by
-you or third parties or a failure of the program to operate with any other
-programs), even if such holder or other party has been advised of the
-possibility of such damages.
+  In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the program as permitted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.
 \end{enumerate}
 
 
-\providecommand{\LPPLsection}{\subsection}
-\providecommand{\LPPLsubsection}{\subsubsection}
-\providecommand{\LPPLsubsubsection}{\subsubsection}
-\providecommand{\LPPLparagraph}{\paragraph}
+\subsection{The GNU Free Documentation License, Version 1.3, 3 November 2008}
+\label{label_fdl}
 
 
-% The file lppl.tex, some minor typographic changes:
+  \begin{quote}
+    \textbf{Copyright \copyright 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.}
 
-%
-% $Id: beamerug-license.tex,v 1.4 2007/01/28 20:48:21 tantau Exp $
-%
-% Copyright 1999 2002-2006 LaTeX3 Project
-%    Everyone is allowed to distribute verbatim copies of this
-%    license document, but modification of it is not allowed.
-%
-%
-% If you wish to load it as part of a ``doc'' source, you have to
-% ensure that a) % is a comment character and b) that short verb
-% characters are being turned off, i.e.,
-%
-%   \DeleteShortVerb{\'}   % or whatever was made a shorthand
-%   \MakePercentComment
-%   \input{lppl}
-%   \MakePercentIgnore
-%   \MakeShortVerb{\'}     % turn it on again if necessary
-%
-%
-% By default the license is produced with \section* as the highest
-% heading level. If this is not appropriate for the document in which
-% it is included define the commands listed below before loading this
-% document, e.g., for inclusion as a separate chapter define:
-%
-%  \providecommand{\LPPLsection}{\chapter*}
-%  \providecommand{\LPPLsubsection}{\section*}
-%  \providecommand{\LPPLsubsubsection}{\subsection*}
-%  \providecommand{\LPPLparagraph}{\subsubsection*}
-%
-% 
-% To allow cross-referencing the headings \label's have been attached
-% to them, all starting with ``LPPL:''. As by default headings without
-% numbers are produced, this will only allow page references.
-% However, you can use the titleref package to produce textual
-% references or you change the definitions of \LPPLsection, and
-% friends to generated numbered headings.
-%
-%
-% We want it to be possible that this file can be processed by
-% (pdf)LaTeX on its own, or that this file can be included in another
-% LaTeX document without any modification whatsoever.
-% Hence the little test below.
-%
-%
-\makeatletter
-\ifx\@preamblecmds\@notprerr
-  % In this case the preamble has already been processed so this file
-  % is loaded as part of another document; just enclose everything in
-  % a group
-  \let\LPPLicense\bgroup
-  \let\endLPPLicense\egroup
-\else
-  % In this case the preamble has not been processed yet so this file
-  % is processed by itself.
-  \documentclass{article}
-  \let\LPPLicense\document
-  \let\endLPPLicense\enddocument
-\fi
-\makeatother
-
-
-\begin{LPPLicense}
-  \providecommand{\LPPLsection}{\section*}
-  \providecommand{\LPPLsubsection}{\subsection*}
-  \providecommand{\LPPLsubsubsection}{\subsubsection*}
-  \providecommand{\LPPLparagraph}{\paragraph*}
-  \providecommand*{\LPPLfile}[1]{\texttt{#1}}
-  \providecommand*{\LPPLdocfile}[1]{`\LPPLfile{#1.tex}'}
-  \providecommand*{\LPPL}{\textsc{lppl}}
-
-  \LPPLsection{The \LaTeX\ Project Public License, Version 1.3c 2006-05-20}
-  \label{LPPL:LPPL}
-
-%  \textbf{Copyright 1999, 2002--2006 \LaTeX3 Project}
-%  \begin{quotation}
-%    Everyone is allowed to distribute verbatim copies of this
-%    license document, but modification of it is not allowed.
-%  \end{quotation}
-
-  \LPPLsubsection{Preamble}
-  \label{LPPL:Preamble}
-  
-  The \LaTeX\ Project Public License (\LPPL) is the primary license
-  under which the the \LaTeX\ kernel and the base \LaTeX\ packages are
-  distributed.
-
-  You may use this license for any work of which you hold the
-  copyright and which you wish to distribute.  This license may be
-  particularly suitable if your work is \TeX-related (such as a
-  \LaTeX\ package), but it is written in such a way that you can use 
-  it even if your work is unrelated to \TeX.
-
-  The section `\textsc{wheter and how to distribute works under this
-    license}', below, gives instructions, examples, and
-  recommendations 
-  for authors who are considering distributing their works under this
-  license.
-
-  This license gives conditions under which a work may be distributed
-  and modified, as well as conditions under which modified versions of
-  that work may be distributed.
-
-  We, the \LaTeX3 Project, believe that the conditions below give you
-  the freedom to make and distribute modified versions of your work
-  that conform with whatever technical specifications you wish while
-  maintaining the availability, integrity, and reliability of that
-  work.  If you do not see how to achieve your goal while meeting
-  these conditions, then read the document \LPPLdocfile{cfgguide} and
-  \LPPLdocfile{modguide} in the base \LaTeX\ distribution for suggestions.
-
-
-  \LPPLsubsection{Definitions}
-  \label{LPPL:Definitions}
-
-  In this license document the following terms are used:
-
-  \begin{description}
-  \item[Work] Any work being distributed under this License.
-
-  \item[Derived Work] Any work that under any applicable law is
-    derived from the Work.
-
-  \item[Modification] Any procedure that produces a Derived Work under
-    any applicable law -- for example, the production of a file
-    containing an original file associated with the Work or a
-    significant portion of such a file, either verbatim or with
-    modifications and/or translated into another language.
-
-  \item[Modify] To apply any procedure that produces a Derived Work
-    under any applicable law.
-    
-  \item[Distribution] Making copies of the Work available from one
-    person to another, in whole or in part.  Distribution includes
-    (but is not limited to) making any electronic components of the
-    Work accessible by file transfer protocols such as \textsc{ftp} or
-    \textsc{http} or by shared file systems such as Sun's Network File
-    System (\textsc{nfs}).
-
-  \item[Compiled Work] A version of the Work that has been processed
-    into a form where it is directly usable on a computer system.
-    This processing may include using installation facilities provided
-    by the Work, transformations of the Work, copying of components of
-    the Work, or other activities.  Note that modification of any
-    installation facilities provided by the Work constitutes
-    modification of the Work.
-
-  \item[Current Maintainer] A person or persons nominated as such
-    within the Work.  If there is no such explicit nomination then it
-    is the `Copyright Holder' under any applicable law.
-
-  \item[Base Interpreter] A program or process that is normally needed
-    for running or interpreting a part or the whole of the Work.
-    
-    A Base Interpreter may depend on external components but these are
-    not considered part of the Base Interpreter provided that each
-    external component clearly identifies itself whenever it is used
-    interactively.  Unless explicitly specified when applying the
-    license to the Work, the only applicable Base Interpreter is a
-    `\LaTeX-Format' or in the case of files belonging to the
-    `\LaTeX-format' a program implementing the `\TeX{} language'.
-  \end{description}
-
-  \LPPLsubsection{Conditions on Distribution and Modification}
-  \label{LPPL:Conditions}
+    \url{http://fsf.org/}
 
-  \begin{enumerate}
-  \item Activities other than distribution and/or modification of the
-    Work are not covered by this license; they are outside its scope.
-    In particular, the act of running the Work is not restricted and
-    no requirements are made concerning any offers of support for the
-    Work.
-
-  \item\label{LPPL:item:distribute} You may distribute a complete, unmodified
-    copy of the Work as you received it.  Distribution of only part of
-    the Work is considered modification of the Work, and no right to
-    distribute such a Derived Work may be assumed under the terms of
-    this clause.
-
-  \item You may distribute a Compiled Work that has been generated
-    from a complete, unmodified copy of the Work as distributed under
-    Clause~\ref{LPPL:item:distribute} above, as long as that Compiled Work is
-    distributed in such a way that the recipients may install the
-    Compiled Work on their system exactly as it would have been
-    installed if they generated a Compiled Work directly from the
-    Work.
-
-  \item\label{LPPL:item:currmaint} If you are the Current Maintainer of the
-    Work, you may, without restriction, modify the Work, thus creating
-    a Derived Work.  You may also distribute the Derived Work without
-    restriction, including Compiled Works generated from the Derived
-    Work.  Derived Works distributed in this manner by the Current
-    Maintainer are considered to be updated versions of the Work.
-
-  \item If you are not the Current Maintainer of the Work, you may
-    modify your copy of the Work, thus creating a Derived Work based
-    on the Work, and compile this Derived Work, thus creating a
-    Compiled Work based on the Derived Work.
-
-  \item\label{LPPL:item:conditions} If you are not the Current Maintainer of the
-    Work, you may distribute a Derived Work provided the following
-    conditions are met for every component of the Work unless that
-    component clearly states in the copyright notice that it is exempt
-    from that condition.  Only the Current Maintainer is allowed to
-    add such statements of exemption to a component of the Work.
-    \begin{enumerate}
-    \item If a component of this Derived Work can be a direct
-      replacement for a component of the Work when that component is
-      used with the Base Interpreter, then, wherever this component of
-      the Work identifies itself to the user when used interactively
-      with that Base Interpreter, the replacement component of this
-      Derived Work clearly and unambiguously identifies itself as a
-      modified version of this component to the user when used
-      interactively with that Base Interpreter.
-     
-    \item Every component of the Derived Work contains prominent
-      notices detailing the nature of the changes to that component,
-      or a prominent reference to another file that is distributed as
-      part of the Derived Work and that contains a complete and
-      accurate log of the changes.
-  
-    \item No information in the Derived Work implies that any persons,
-      including (but not limited to) the authors of the original
-      version of the Work, provide any support, including (but not
-      limited to) the reporting and handling of errors, to recipients
-      of the Derived Work unless those persons have stated explicitly
-      that they do provide such support for the Derived Work.
-
-    \item You distribute at least one of the following with the Derived Work:
-      \begin{enumerate}
-      \item A complete, unmodified copy of the Work; if your
-        distribution of a modified component is made by offering
-        access to copy the modified component from a designated place,
-        then offering equivalent access to copy the Work from the same
-        or some similar place meets this condition, even though third
-        parties are not compelled to copy the Work along with the
-        modified component;
-
-      \item Information that is sufficient to obtain a complete,
-        unmodified copy of the Work.
-      \end{enumerate}
-    \end{enumerate}
-  \item If you are not the Current Maintainer of the Work, you may
-    distribute a Compiled Work generated from a Derived Work, as long
-    as the Derived Work is distributed to all recipients of the
-    Compiled Work, and as long as the conditions of
-    Clause~\ref{LPPL:item:conditions}, above, are met with regard to the Derived
-    Work.
-
-  \item The conditions above are not intended to prohibit, and hence
-    do not apply to, the modification, by any method, of any component
-    so that it becomes identical to an updated version of that
-    component of the Work as it is distributed by the Current
-    Maintainer under Clause~\ref{LPPL:item:currmaint}, above.
-
-  \item Distribution of the Work or any Derived Work in an alternative
-    format, where the Work or that Derived Work (in whole or in part)
-    is then produced by applying some process to that format, does not
-    relax or nullify any sections of this license as they pertain to
-    the results of applying that process.
-     
-  \item \null
-    \begin{enumerate}
-    \item A Derived Work may be distributed under a different license
-      provided that license itself honors the conditions listed in
-      Clause~\ref{LPPL:item:conditions} above, in regard to the Work, though it
-      does not have to honor the rest of the conditions in this
-      license.
-      
-    \item If a Derived Work is distributed under a different license,
-      that Derived Work must provide sufficient documentation as part
-      of itself to allow each recipient of that Derived Work to honor
-      the restrictions in Clause~\ref{LPPL:item:conditions} above, concerning
-      changes from the Work.
-    \end{enumerate}
-  \item This license places no restrictions on works that are
-    unrelated to the Work, nor does this license place any
-    restrictions on aggregating such works with the Work by any means.
-
-  \item Nothing in this license is intended to, or may be used to,
-    prevent complete compliance by all parties with all applicable
-    laws.
-  \end{enumerate}
-
-  \LPPLsubsection{No Warranty}
-  \label{LPPL:Warranty}
-
-  There is no warranty for the Work.  Except when otherwise stated in
-  writing, the Copyright Holder provides the Work `as is', without
-  warranty of any kind, either expressed or implied, including, but
-  not limited to, the implied warranties of merchantability and
-  fitness for a particular purpose.  The entire risk as to the quality
-  and performance of the Work is with you.  Should the Work prove
-  defective, you assume the cost of all necessary servicing, repair,
-  or correction.
-
-  In no event unless required by applicable law or agreed to in
-  writing will The Copyright Holder, or any author named in the
-  components of the Work, or any other party who may distribute and/or
-  modify the Work as permitted above, be liable to you for damages,
-  including any general, special, incidental or consequential damages
-  arising out of any use of the Work or out of inability to use the
-  Work (including, but not limited to, loss of data, data being
-  rendered inaccurate, or losses sustained by anyone as a result of
-  any failure of the Work to operate with any other programs), even if
-  the Copyright Holder or said author or said other party has been
-  advised of the possibility of such damages.
-
-  \LPPLsubsection{Maintenance of The Work}
-  \label{LPPL:Maintenance}
-
-  The Work has the status `author-maintained' if the Copyright Holder
-  explicitly and prominently states near the primary copyright notice
-  in the Work that the Work can only be maintained by the Copyright
-  Holder or simply that it is `author-maintained'.
-
-  The Work has the status `maintained' if there is a Current
-  Maintainer who has indicated in the Work that they are willing to
-  receive error reports for the Work (for example, by supplying a
-  valid e-mail address). It is not required for the Current Maintainer
-  to acknowledge or act upon these error reports.
-
-  The Work changes from status `maintained' to `unmaintained' if there
-  is no Current Maintainer, or the person stated to be Current
-  Maintainer of the work cannot be reached through the indicated means
-  of communication for a period of six months, and there are no other
-  significant signs of active maintenance.
-
-  You can become the Current Maintainer of the Work by agreement with
-  any existing Current Maintainer to take over this role.
-
-  If the Work is unmaintained, you can become the Current Maintainer
-  of the Work through the following steps:
-  \begin{enumerate}
-  \item Make a reasonable attempt to trace the Current Maintainer (and
-    the Copyright Holder, if the two differ) through the means of an
-    Internet or similar search.
-  \item If this search is successful, then enquire whether the Work is
-    still maintained.
-    \begin{enumerate}
-    \item If it is being maintained, then ask the Current Maintainer
-      to update their communication data within one month.
-     
-    \item\label{LPPL:item:intention} If the search is unsuccessful or
-      no action to resume active maintenance is taken by the Current
-      Maintainer, then announce within the pertinent community your
-      intention to take over maintenance.  (If the Work is a \LaTeX{}
-      work, this could be done, for example, by posting to
-      \texttt{comp.text.tex}.)
-    \end{enumerate}
-  \item {}
-    \begin{enumerate}
-    \item If the Current Maintainer is reachable and agrees to pass
-      maintenance of the Work to you, then this takes effect
-      immediately upon announcement.
-     
-    \item\label{LPPL:item:announce} If the Current Maintainer is not
-      reachable and the Copyright Holder agrees that maintenance of
-      the Work be passed to you, then this takes effect immediately
-      upon announcement.
-    \end{enumerate}
-  \item\label{LPPL:item:change} If you make an `intention
-    announcement' as described in~\ref{LPPL:item:intention} above and
-    after three months your intention is challenged neither by the
-    Current Maintainer nor by the Copyright Holder nor by other
-    people, then you may arrange for the Work to be changed so as to
-    name you as the (new) Current Maintainer.
-     
-  \item If the previously unreachable Current Maintainer becomes
-    reachable once more within three months of a change completed
-    under the terms of~\ref{LPPL:item:announce}
-    or~\ref{LPPL:item:change}, then that Current Maintainer must
-    become or remain the Current Maintainer upon request provided they
-    then update their communication data within one month.
-  \end{enumerate}
-  A change in the Current Maintainer does not, of itself, alter the
-  fact that the Work is distributed under the \LPPL\ license.
-
-  If you become the Current Maintainer of the Work, you should
-  immediately provide, within the Work, a prominent and unambiguous
-  statement of your status as Current Maintainer.  You should also
-  announce your new status to the same pertinent community as
-  in~\ref{LPPL:item:intention} above.
-
-  \LPPLsubsection{Whether and How to Distribute Works under This License}
-  \label{LPPL:Distribute}
-
-  This section contains important instructions, examples, and
-  recommendations for authors who are considering distributing their
-  works under this license.  These authors are addressed as `you' in
-  this section.
-
-  \LPPLsubsubsection{Choosing This License or Another License}
-  \label{LPPL:Choosing}
-
-  If for any part of your work you want or need to use
-  \emph{distribution} conditions that differ significantly from those
-  in this license, then do not refer to this license anywhere in your
-  work but, instead, distribute your work under a different license.
-  You may use the text of this license as a model for your own
-  license, but your license should not refer to the \LPPL\ or
-  otherwise give the impression that your work is distributed under
-  the \LPPL.
-
-  The document \LPPLdocfile{modguide} in the base \LaTeX\ distribution
-  explains the motivation behind the conditions of this license.  It
-  explains, for example, why distributing \LaTeX\ under the
-  \textsc{gnu} General Public License (\textsc{gpl}) was considered
-  inappropriate.  Even if your work is unrelated to \LaTeX, the
-  discussion in \LPPLdocfile{modguide} may still be relevant, and authors
-  intending to distribute their works under any license are encouraged
-  to read it.
-
-  \LPPLsubsubsection{A Recommendation on Modification Without Distribution}
-  \label{LPPL:WithoutDistribution}
-
-  It is wise never to modify a component of the Work, even for your
-  own personal use, without also meeting the above conditions for
-  distributing the modified component.  While you might intend that
-  such modifications will never be distributed, often this will happen
-  by accident -- you may forget that you have modified that component;
-  or it may not occur to you when allowing others to access the
-  modified version that you are thus distributing it and violating the
-  conditions of this license in ways that could have legal
-  implications and, worse, cause problems for the community.  It is
-  therefore usually in your best interest to keep your copy of the
-  Work identical with the public one.  Many works provide ways to
-  control the behavior of that work without altering any of its
-  licensed components.
-
-  \LPPLsubsubsection{How to Use This License}
-  \label{LPPL:HowTo}
-
-  To use this license, place in each of the components of your work
-  both an explicit copyright notice including your name and the year
-  the work was authored and/or last substantially modified.  Include
-  also a statement that the distribution and/or modification of that
-  component is constrained by the conditions in this license.
-
-  Here is an example of such a notice and statement:
-\begin{verbatim}
-  %% pig.dtx
-  %% Copyright 2005 M. Y. Name
-  %
-  % This work may be distributed and/or modified under the
-  % conditions of the LaTeX Project Public License, either version 1.3
-  % of this license or (at your option) any later version.
-  % The latest version of this license is in
-  %   http://www.latex-project.org/lppl.txt
-  % and version 1.3 or later is part of all distributions of LaTeX
-  % version 2005/12/01 or later.
-  %
-  % This work has the LPPL maintenance status `maintained'.
-  % 
-  % The Current Maintainer of this work is M. Y. Name.
-  %
-  % This work consists of the files pig.dtx and pig.ins
-  % and the derived file pig.sty.
-\end{verbatim}
-  
-  Given such a notice and statement in a file, the conditions given in
-  this license document would apply, with the `Work' referring to the
-  three files `\LPPLfile{pig.dtx}', `\LPPLfile{pig.ins}', and
-  `\LPPLfile{pig.sty}' (the last being generated from
-  `\LPPLfile{pig.dtx}' using `\LPPLfile{pig.ins}'), the `Base
-  Interpreter' referring to any `\LaTeX-Format', and both `Copyright
-  Holder' and `Current Maintainer' referring to the person `M. Y.
-  Name'.
-
-  If you do not want the Maintenance section of \LPPL\ to apply to
-  your Work, change `maintained' above into `author-maintained'.
-  However, we recommend that you use `maintained' as the Maintenance
-  section was added in order to ensure that your Work remains useful
-  to the community even when you can no longer maintain and support it
-  yourself.
-
-  \LPPLsubsubsection{Derived Works That Are Not Replacements}
-  \label{LPPL:NotReplacements}
-
-  Several clauses of the \LPPL\ specify means to provide reliability
-  and stability for the user community. They therefore concern
-  themselves with the case that a Derived Work is intended to be used
-  as a (compatible or incompatible) replacement of the original
-  Work. If this is not the case (e.g., if a few lines of code are
-  reused for a completely different task), then clauses 6b and 6d
-  shall not apply.
-
-  \LPPLsubsubsection{Important Recommendations}
-  \label{LPPL:Recommendations}
-
-  \LPPLparagraph{Defining What Constitutes the Work}
-
-  The \LPPL\ requires that distributions of the Work contain all the
-  files of the Work.  It is therefore important that you provide a way
-  for the licensee to determine which files constitute the Work.  This
-  could, for example, be achieved by explicitly listing all the files
-  of the Work near the copyright notice of each file or by using a
-  line such as:
-\begin{verbatim}
-    % This work consists of all files listed in manifest.txt.
-\end{verbatim}
-  in that place.  In the absence of an unequivocal list it might be
-  impossible for the licensee to determine what is considered by you
-  to comprise the Work and, in such a case, the licensee would be
-  entitled to make reasonable conjectures as to which files comprise
-  the Work.
-
-\end{LPPLicense}
-
-
-
-
-\subsection{GNU Free Documentation License, Version 1.2, November 2002}
-\label{label_fdl}
+    Everyone is allowed to distribute verbatim copies of this license document, but modification of it is not allowed.
+  \end{quote}
 
+\subsubsection{Preamble}
 
-%  \textbf{Copyright  2000,2001,2002  Free Software Foundation, Inc.}\par
-%  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-%  \begin{quotation}
-%    Everyone is allowed to distribute verbatim copies of this
-%    license document, but modification of it is not allowed.
-%  \end{quotation}
+The purpose of this License is to make a manual, textbook, or other functional and useful document ``free'' in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without modifying it, either commercially or noncommercially. Secondarily, this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others.
 
-\subsubsection{Preamble}
+This License is a kind of ``copyleft'', which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software.
 
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document ``free'' in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
+We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the software does. But this License is not limited to software manuals; it can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference.
 
 \subsubsection{Applicability and definitions}
 
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The \textbf{``Document''}, below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as \textbf{``you''}.  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A \textbf{``Modified Version''} of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A \textbf{``Secondary Section''} is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The \textbf{``Invariant Sections''} are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The \textbf{``Cover Texts''} are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A \textbf{``Transparent''} copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not ``Transparent'' is called \textbf{``Opaque''}.
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The \textbf{``Title Page''} means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section \textbf{``Entitled XYZ''} means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as \textbf{``Acknowledgements''},
-\textbf{``Dedications''}, \textbf{``Endorsements''}, or \textbf{``History''}.)  
-To \textbf{``Preserve the Title''}
-of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
+This License applies to any manual or other work, in any medium, that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. Such a notice grants a world-wide, royalty-free license, unlimited in duration, to use that work under the conditions stated herein. The \textbf{``Document''}, below, refers to any such manual or work. Any member of the public is a licensee, and is addressed as \textbf{``you''}. You accept the license if you copy, modify or distribute the work in a way requiring permission under copyright law.
+
+A \textbf{``Modified Version''} of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language.
+
+A \textbf{``Secondary Section''} is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly within that overall subject. (Thus, if the Document is in part a textbook of mathematics, a Secondary Section may not explain any mathematics.)  The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them.
+
+The \textbf{``Invariant Sections''} are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. If a section does not fit the above definition of Secondary then it is not allowed to be designated as Invariant. The Document may contain zero Invariant Sections. If the Document does not identify any Invariant Sections then there are none.
+
+The \textbf{``Cover Texts''} are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. A Front-Cover Text may be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A \textbf{``Transparent''} copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, that is suitable for revising the document straightforwardly with generic text editors or (for images composed of pixels) generic paint programs or (for drawings) some widely available drawing editor, and that is suitable for input to text formatters or for automatic translation to a variety of formats suitable for input to text formatters. A copy made in an otherwise Transparent file format whose markup, or absence of markup, has been arranged to thwart or discourage subsequent modification by readers is not Transparent. An image format is not Transparent if used for any substantial amount of text. A copy that is not ``Transparent'' is called \textbf{``Opaque''}.
+
+Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple HTML, PostScript or PDF designed for human modification. Examples of transparent image formats include PNG, XCF and JPG. Opaque formats include proprietary formats that can be read and edited only by proprietary word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the machine-generated HTML, PostScript or PDF produced by some word processors for output purposes only.
+
+The \textbf{``Title Page''} means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, ``Title Page'' means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text.
+
+The \textbf{``publisher''} means any person or entity that distributes copies of the Document to the public.
+
+A section \textbf{``Entitled XYZ''} means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a specific section name mentioned below, such as \textbf{``Acknowledgements''}, \textbf{``Dedications''}, \textbf{``Endorsements''}, or \textbf{``History''}.) To \textbf{``Preserve the Title''} of such a section when you modify the Document means that it remains a section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which states that this License applies to the Document. These Warranty Disclaimers are considered to be included by reference in this License, but only as regards disclaiming warranties: any other implication that these Warranty Disclaimers may have is void and has no effect on the meaning of this License.
 
 \subsubsection{Verbatim Copying}
 
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
+You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced in all copies, and that you add no other conditions whatsoever to those of this License. You may not use technical measures to obstruct or control the reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3.
 
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
+You may also lend copies, under the same conditions stated above, and you may publicly display copies.
 
 \subsubsection{Copying in Quantity}
 
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
+If you publish printed copies (or copies in media that commonly have printed covers) of the Document, numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present the full title with all words of the title equally prominent and visible. You may add other material on the covers in addition. Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages.
+
+If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a computer-network location from which the general network-using public has access to download using public-standard network protocols a complete Transparent copy of the Document, free of added material. If you use the latter option, you must take reasonably prudent steps, when you begin distribution of Opaque copies in quantity, to ensure that this Transparent copy will remain thus accessible at the stated location until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public.
+
+It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document.
 
 \subsubsection{Modifications}
 
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
+You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version:
 
 \begin{itemize}
-\item[A.] 
-   Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-   
+\item[A.]
+  Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the same title as a previous version if the original publisher of that version gives permission.
+
 \item[B.]
-   List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-   
+  List on the Title Page, as authors, one or more persons or entities responsible for authorship of the modifications in the Modified Version, together with at least five of the principal authors of the Document (all of its principal authors, if it has fewer than five), unless they release you from this requirement.
+
 \item[C.]
-   State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-   
+  State on the Title page the name of the publisher of the Modified Version, as the publisher.
+
 \item[D.]
-   Preserve all the copyright notices of the Document.
-   
+  Preserve all the copyright notices of the Document.
+
 \item[E.]
-   Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-   
+  Add an appropriate copyright notice for your modifications adjacent to the other copyright notices.
+
 \item[F.]
-   Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-   
+  Include, immediately after the copyright notices, a license notice giving the public permission to use the Modified Version under the terms of this License, in the form shown in the Addendum below.
+
 \item[G.]
-   Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-   
+  Preserve in that license notice the full lists of Invariant Sections and required Cover Texts given in the Document's license notice.
+
 \item[H.]
-   Include an unaltered copy of this License.
-   
+  Include an unaltered copy of this License.
+
 \item[I.]
-   Preserve the section Entitled ``History'', Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled ``History'' in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-   
+  Preserve the section Entitled ``History'', Preserve its Title, and add to it an item stating at least the title, year, new authors, and publisher of the Modified Version as given on the Title Page. If there is no section Entitled ``History'' in the Document, create one stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the previous sentence.
+
 \item[J.]
-   Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the ``History'' section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-   
+  Preserve the network location, if any, given in the Document for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions it was based on. These may be placed in the ``History'' section. You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission.
+
 \item[K.]
-   For any section Entitled ``Acknowledgements'' or ``Dedications'',
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-   
+  For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve the Title of the section, and preserve in the section all the substance and tone of each of the contributor acknowledgements and/or dedications given therein.
+
 \item[L.]
-   Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-   
+  Preserve all the Invariant Sections of the Document, unaltered in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles.
+
 \item[M.]
-   Delete any section Entitled ``Endorsements''.  Such a section
-   may not be included in the Modified Version.
-   
+  Delete any section Entitled ``Endorsements''. Such a section may not be included in the Modified Version.
+
 \item[N.]
-   Do not retitle any existing section to be Entitled ``Endorsements''
-   or to conflict in title with any Invariant Section.
-   
+  Do not retitle any existing section to be Entitled ``Endorsements'' or to conflict in title with any Invariant Section.
+
 \item[O.]
-   Preserve any Warranty Disclaimers.
+  Preserve any Warranty Disclaimers.
 \end{itemize}
 
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
+If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles.
 
-\subsubsection{Combining Documents}
+You may add a section Entitled ``Endorsements'', provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard.
 
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all sections
-Entitled ``Endorsements''.
+You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text may be added by (or through arrangements made by) any one entity. If the Document already includes a cover text for the same cover, previously added by you or by arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one.
 
+The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version.
 
-\subsubsection{Collection of Documents}
+\subsubsection{Combining Documents}
 
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
+You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice, and that you preserve all their Warranty Disclaimers.
 
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
+The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section unique by adding at the end of it, in parentheses, the name of the original author or publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work.
 
+In the combination, you must combine any sections Entitled ``History'' in the various original documents, forming one section Entitled ``History''; likewise combine any sections Entitled ``Acknowledgements'', and any sections Entitled ``Dedications''. You must delete all sections Entitled ``Endorsements''.
 
-\subsubsection{Aggregating with independent Works}
+\subsubsection{Collection of Documents}
 
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
+You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects.
 
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
+You may extract a single document from such a collection, and distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document.
 
+\subsubsection{Aggregating with independent Works}
+
+A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, is called an ``aggregate'' if the copyright resulting from the compilation is not used to limit the legal rights of the compilation's users beyond what the individual works permit. When the Document is included in an aggregate, this License does not apply to the other works in the aggregate which are not themselves derivative works of the Document.
 
+If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one half of the entire aggregate, the Document's Cover Texts may be placed on covers that bracket the Document within the aggregate, or the electronic equivalent of covers if the Document is in electronic form. Otherwise they must appear on printed covers that bracket the whole aggregate.
 
 \subsubsection{Translation}
 
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
+Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may include translations of some or all Invariant Sections in addition to the original versions of these Invariant Sections. You may include a translation of this License, and all the license notices in the Document, and any Warranty Disclaimers, provided that you also include the original English version of this License and the original versions of those notices and disclaimers. In case of a disagreement between the translation and the original version of this License or a notice or disclaimer, the original version will prevail.
 
+If a section in the Document is Entitled ``Acknowledgements'', ``Dedications'', or ``History'', the requirement (section 4) to Preserve its Title (section 1) will typically require changing the actual title.
 
 \subsubsection{Termination}
 
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
+You may not copy, modify, sublicense, or distribute the Document except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, or distribute it is void, and will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
 
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copise or rights from you under this License. If your rights have been terminated and not permanently reinstated, receipt of a copy of some or all of the same material does not give you any rights to use it.
 
 \subsubsection{Future Revisions of this License}
 
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
+The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License ``or any later version'' applies to it, you have the option of following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation. If the Document specifies that a proxy can decide which future versions of this
+License can be used, that proxy’s public statement of acceptance of a version permanently authorizes you to choose that version for the Document.
+
+\subsubsection{Relicensing}
+
+``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any World Wide Web server that publishes copyrightable works and also provides prominent facilities for anybody to edit those works. A public wiki that anybody can edit is an example of such a server. A ``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the site means any set of copyrightable works thus published on the MMC site.
 
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
+``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 license published by Creative Commons Corporation, a not-for-profit corporation with a principal place of business in San Francisco, California, as well as future copyleft versions of that license published by that same organization. 
 
+``Incorporate'' means to publish or republish a Document, in whole or in part, as part of another Document.
+
+An MMC is ``eligible for relicensing'' if it is licensed under this License, and if all works that were first published under this License somewhere other than this MMC, and subsequently incorporated in whole or in part into the MMC, (1) had no cover texts or invariant sections, and (2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site under CC-BY-SA on the same site at any time before August 1, 2009, provided the MMC is eligible for relicensing.
 
 \subsubsection{Addendum: How to use this License for your documents}
 
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
+To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page:
 
 \bigskip
 \begin{quote}
-    Copyright \copyright \textsc{year your name}.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled ``GNU
-    Free Documentation License''.
+  Copyright \copyright \textsc{year your name}.
+
+  Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''.
 \end{quote}
 \bigskip
-    
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with \dots\ Texts.'' line with this:
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, replace the ``with \dots\ Texts.'' line with this:
 
 \bigskip
 \begin{quote}
-    with the Invariant Sections being \textsc{list their titles}, with the
-    Front-Cover Texts being \textsc{list}, and with the Back-Cover
-    Texts being \textsc{list}. 
+  with the Invariant Sections being \textsc{list their titles}, with the Front-Cover Texts being \textsc{list}, and with the Back-Cover Texts being \textsc{list}.
 \end{quote}
 \bigskip
-    
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
 
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
+If you have Invariant Sections without Cover Texts, or some other combination of the three, merge those two alternatives to suit the situation.
+
+If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software.
 
 
+\providecommand{\LPPLsection}{\subsection}
+\providecommand{\LPPLsubsection}{\subsubsection}
+\providecommand{\LPPLsubsubsection}{\subsubsection}
+\providecommand{\LPPLparagraph}{\paragraph}
+
 
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+\input{lppl}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
index e770034fae1..c683b08de3a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-localstructure.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,34 +8,19 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-localstructure.tex,v 1.16 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Structuring a Presentation: The Local Structure}
 
-\LaTeX\ provides different commands for structuring text ``locally,''
-for example, via the |itemize| environment. These environments
-are also available in the \beamer\ class, although their appearance has
-been slightly changed. Furthermore, the \beamer\ class also defines
-some new commands and environments, see below, that may help you to
-structure your text.
+\LaTeX\ provides different commands for structuring text ``locally,'' for example, via the |itemize| environment. These environments are also available in the \beamer\ class, although their appearance has been slightly changed. Furthermore, the \beamer\ class also defines some new commands and environments, see below, that may help you to structure your text.
 
 
 \subsection{Itemizations, Enumerations, and Descriptions}
-
 \label{section-enumerate}
 
-There are three predefined environments for creating lists, namely
-|enumerate|, |itemize|, and |description|. The first
-two can be nested to depth three, but nesting them to this depth
-creates totally unreadable slides.
-
-The |\item| command is overlay-specification-aware. If an overlay
-specification is provided, the item will only be shown on the
-specified slides, see the following example. If the |\item|
-command is to take an optional argument and an overlay specification,
-the overlay specification can either come first as in |\item<1>[Cat]|
-or come last as in |\item[Cat]<1>|.
+There are three predefined environments for creating lists, namely |enumerate|, |itemize|, and |description|. The first two can be nested to depth three, but nesting them to this depth creates totally unreadable slides.
 
+The |\item| command is overlay-specification-aware. If an overlay specification is provided, the item will only be shown on the specified slides, see the following example. If the |\item| command is to take an optional argument and an overlay specification, the overlay specification can either come first as in |\item<1>[Cat]| or come last as in |\item[Cat]<1>|.
 \begin{verbatim}
 \begin{frame}
   There are three important points:
@@ -51,21 +37,10 @@ or come last as in |\item[Cat]<1>|.
 \end{frame}
 \end{verbatim}
 
-
 \begin{environment}{{itemize}\opt{|[<|\meta{default overlay specification}|>]|}}
-  Used to display a list of items that do not have a special
-  ordering. Inside the environment, use an |\item| command for
-  each topic.
-  
-  If the optional parameter \meta{default overlay specification} is
-  given, in every occurrence of an |\item| command that does not have
-  an overlay specification attached to it, the \meta{default overlay
-    specification} is used. By setting this specification to be an
-  incremental overlay specification, see
-  Section~\ref{section-incremental}, you can implement, for example, a
-  step-wise uncovering of the items. The \meta{default overlay
-    specification} is inherited by subenvironments. Naturally, in a
-  subenvironment you can reset it locally by setting it to |<1->|.
+  Used to display a list of items that do not have a special ordering. Inside the environment, use an |\item| command for each topic.
+
+  If the optional parameter \meta{default overlay specification} is given, in every occurrence of an |\item| command that does not have an overlay specification attached to it, the \meta{default overlay specification} is used. By setting this specification to be an incremental overlay specification, see Section~\ref{section-incremental}, you can implement, for example, a step-wise uncovering of the items. The \meta{default overlay specification} is inherited by subenvironments. Naturally, in a subenvironment you can reset it locally by setting it to |<1->|.
   \example
 \begin{verbatim}
 \begin{itemize}
@@ -73,7 +48,7 @@ or come last as in |\item[Cat]<1>|.
 \item This is also important.
 \end{itemize}
 \end{verbatim}
-  
+
   \example
 \begin{verbatim}
 \begin{itemize}[<+->]
@@ -81,10 +56,10 @@ or come last as in |\item[Cat]<1>|.
 \item This is shown from the second slide on.
 \item This is shown from the third slide on.
 \item<1-> This is shown from the first slide on.
-\item This is shown from the fourth slide on.    
+\item This is shown from the fourth slide on.
 \end{itemize}
 \end{verbatim}
-  
+
   \example
 \begin{verbatim}
 \begin{itemize}[<+-| alert@+>]
@@ -93,39 +68,26 @@ or come last as in |\item[Cat]<1>|.
 \item This is shown from the third slide on and alerted on the third slide.
 \end{itemize}
 \end{verbatim}
-  
+
   \example
 \begin{verbatim}
 \newenvironment{mystepwiseitemize}{\begin{itemize}[<+-| alert@+>]}{\end{itemize}}
 \end{verbatim}
 
   \lyxnote
-  Unfortunately, currently you cannot specify optional arguments with
-  the |itemize| environment. You can, however, use the command
-  |\beamerdefaultoverlayspecification| before the environment to get
-  the desired effect.
-
-  The appearance of an |itemize| list is governed by several
-  templates. The first template concerns the way the little marker
-  introducing each item is typeset:  
+  Unfortunately, currently you cannot specify optional arguments with the |itemize| environment. You can, however, use the command |\beamerdefaultoverlayspecification| before the environment to get the desired effect.
+
+  The appearance of an |itemize| list is governed by several templates. The first template concerns the way the little marker introducing each item is typeset:
   \begin{element}{itemize items}\semiyes\no\no
-    This template is a parent template, whose children are
-    |itemize item|, |itemize subitem|, and |itemize subsubitem|. This
-    means that if you use the |\setbeamertemplate| command on this
-    template, the command is instead called for all of these children
-    (with the same arguments). 
+    This template is a parent template, whose children are |itemize item|, |itemize subitem|, and |itemize subsubitem|. This means that if you use the |\setbeamertemplate| command on this template, the command is instead called for all of these children (with the same arguments).
 
     \begin{templateoptions}
       \itemoption{default}{}
-      The default item marker is a small triangle colored with the 
-      foreground of the \beamer-color |itemize item| (or, for
-      subitems, |itemize subitem| etc.). Note that these colors will
-      automatically change under certain circumstances such as inside
-      an example block or inside an |alertenv| environment. 
+      The default item marker is a small triangle colored with the foreground of the \beamer-color |itemize item| (or, for subitems, |itemize subitem| etc.). Note that these colors will automatically change under certain circumstances such as inside an example block or inside an |alertenv| environment.
       \itemoption{triangle}{}
       Alias for the default.
       \itemoption{circle}{}
-      Uses little circles (or dots) as item markers. 
+      Uses little circles (or dots) as item markers.
       \itemoption{square}{}
       Uses little squares as item markers.
       \itemoption{ball}{}
@@ -135,25 +97,16 @@ or come last as in |\item[Cat]<1>|.
 
   \begin{element}{itemize item}\yes\yes\yes
     \colorfontparents{item}
-    This template (with |item| instead of |items|) governs how the
-    marker in front of a first-level item is typeset. ``First-level''
-    refers to the level of nesting. See the |itemize items| template
-    for the \meta{options} that may be given.
-
-    When the template is inserted, the \beamer-font and -color
-    |itemize item| is installed. Typically, the font is ignored by the
-    template as some special symbol is drawn anyway, by the font may
-    be important if an optional argument is given to the
-    |\item| command as in |\item[First]|.
-
-    The font and color inherit from the |item| font and color, which
-    are explained at the end of this section.
+    This template (with |item| instead of |items|) governs how the marker in front of a first-level item is typeset. ``First-level'' refers to the level of nesting. See the |itemize items| template for the \meta{options} that may be given.
+
+    When the template is inserted, the \beamer-font and -color |itemize item| is installed. Typically, the font is ignored by the template as some special symbol is drawn anyway, by the font may be important if an optional argument is given to the |\item| command as in |\item[First]|.
+
+    The font and color inherit from the |item| font and color, which are explained at the end of this section.
   \end{element}
 
   \begin{element}{itemize subitem}\yes\yes\yes
     \colorfontparents{subitem}
-    Like |itemize item|, only for second-level items. An
-    item of an itemize inside an enumerate counts a second-level item.
+    Like |itemize item|, only for second-level items. An item of an itemize inside an enumerate counts as a second-level item.
   \end{element}
 
   \begin{element}{itemize subsubitem}\yes\yes\yes
@@ -162,40 +115,13 @@ or come last as in |\item[Cat]<1>|.
   \end{element}
 \end{environment}
 
+\begin{environment}{{enumerate}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{mini template}}
+  Used to display a list of items that are ordered. Inside the environment, use an |\item| command for each topic. By default, before each item increasing Arabic numbers followed by a dot are printed (as in ``1.'' and ``2.''). This can be changed by specifying a different template, see below.
 
+  The first optional argument \meta{default overlay specification} has exactly the same effect as for the |itemize| environment. It is ``detected'' by the opening |<|-sign in the \meta{default overlay specification}. Thus, if there is only one optional argument and if this argument does not start with |<|, then it is considered to be a \meta{mini template}.
 
+  The syntax of the \meta{mini template} is the same as the syntax of mini templates in the |enumerate| package (you do not need to include the |enumerate| package, this is done automatically). Roughly spoken, the text of the \meta{mini template} is printed before each item, but any occurrence of a |1| in the mini template is replaced by the current item number, an occurrence of the letter |A| is replaced by the $i$-th letter of the alphabet (in uppercase) for the $i$-th item, and the letters |a|, |i|, and |I| are replaced by the corresponding lowercase letters, lowercase Roman letters, and uppercase Roman letters, respectively. So the mini template |(i)| would yield the items (i), (ii), (iii), (iv), and so on. The mini template |A.)| would yield the items A.), B.), C.), D.) and so on. For more details on the possible mini templates, see the documentation of the |enumerate| package. Note that there is also a template that governs the appearance of the mini template.
 
-\begin{environment}{{enumerate}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{mini template}} 
-  Used to display a list of items that are ordered.  Inside the
-  environment, use an |\item| command for each topic. By default,
-  before each item increasing Arabic numbers  followed by a dot are
-  printed (as in ``1.'' and ``2.''). This can be changed by specifying
-  a different template,  see below.
-
-  The first optional argument \meta{default overlay specification} has
-  exactly the same effect as for the |itemize| environment. It is
-  ``detected'' by the opening |<|-sign in the \meta{default overlay
-    specification}. Thus, if there is only one optional argument and
-  if this argument does not start with |<|, then it is considered to
-  be a \meta{mini template}. 
-
-  The syntax of the \meta{mini template} is the same as
-  the syntax of mini templates in the |enumerate| package (you do not
-  need to include the 
-  |enumerate| package, this is done automatically). Roughly spoken,
-  the text of the \meta{mini template} is printed before each item,
-  but any occurrence of a |1| in the mini template is replaced by the
-  current item number, an occurrence of the letter |A| is replaced by
-  the $i$th letter of the alphabet (in uppercase) for the $i$th item,
-  and the letters |a|, |i|, and |I| are replaced by the corresponding
-  lowercase letters, lowercase Roman letters, and uppercase Roman
-  letters, respectively. So the mini template |(i)| would yield the
-  items (i), (ii), (iii), (iv), and so on. The mini template |A.)|
-  would yield the items A.), B.), C.), D.) and so on. For more details
-  on the possible mini templates, see the documentation of the
-  |enumerate| package. Note that there is also a template that governs
-  the appearance of the mini template.
-  
   \example
 \begin{verbatim}
 \begin{enumerate}
@@ -215,28 +141,19 @@ or come last as in |\item[Cat]<1>|.
 \end{verbatim}
 
   \articlenote
-  To use the \meta{mini template}, you have to include the package
-  |enumerate|.  
+  To use the \meta{mini template}, you have to include the package |enumerate|.
 
   \lyxnote
   The same constraints as for |itemize| apply.
-  
+
   \begin{element}{enumerate items}\semiyes\no\no
-    Similar to |itemize items|, this template is a parent template,
-    whose children are |enumerate item|, |enumerate subitem|,
-    |enumerate subsubitem|, and |enumerate mini template|. These
-    templates govern how the text (the number) of an enumeration is
-    typeset. 
-    
+    Similar to |itemize items|, this template is a parent template, whose children are |enumerate item|, |enumerate subitem|, |enumerate subsubitem|, and |enumerate mini template|. These templates govern how the text (the number) of an enumeration is typeset.
+
     \begin{templateoptions}
       \itemoption{default}{}
-      The default enumeration marker uses the scheme 1., 2., 3.\ for
-      the first level, 1.1, 1.2, 1.3 for the second level and 1.1.1,
-      1.1.2, 1.1.3 for the third level. 
+      The default enumeration marker uses the scheme 1., 2., 3.\ for the first level, 1.1, 1.2, 1.3 for the second level and 1.1.1, 1.1.2, 1.1.3 for the third level.
       \itemoption{circle}{}
-      Places the numbers inside little circles. The colors are taken
-      from |item projected| or |subitem projected| or
-      |subsubitem projected|.
+      Places the numbers inside little circles. The colors are taken from |item projected| or |subitem projected| or |subsubitem projected|.
       \itemoption{square}{}
       Places the numbers on little squares.
       \itemoption{ball}{}
@@ -245,31 +162,23 @@ or come last as in |\item[Cat]<1>|.
   \end{element}
 
   \begin{element}{enumerate item}\yes\yes\yes
-    This template governs how the number in front of a first-level
-    item is typeset. The level here refers to the level of enumeration
-    nesting only. Thus an enumerate inside an itemize is a first-level
-    enumerate (but it uses the second-level
-    |itemize/enumerate body|). 
+    This template governs how the number in front of a first-level item is typeset. The level here refers to the level of enumeration nesting only. Thus an enumerate inside an itemize is a first-level enumerate (but it uses the second-level |itemize/enumerate body|).
 
-    When the template is inserted, the \beamer-font and -color
-    |enumerate item| are installed.
+    When the template is inserted, the \beamer-font and -color |enumerate item| are installed.
 
     The following command is useful for this template:
     \begin{templateinserts}
       \iteminsert{\insertenumlabel}
-      inserts the current number of the top-level enumeration (as an
-      Arabic number). This insert is also available in the next two
-      templates. 
+      inserts the current number of the top-level enumeration (as an Arabic number). This insert is also available in the next two templates.
     \end{templateinserts}
   \end{element}
 
   \begin{element}{enumerate subitem}\yes\yes\yes
-    Like |enumerate item|, only for second-level items. 
+    Like |enumerate item|, only for second-level items.
 
     \begin{templateinserts}
       \iteminsert{\insertsubenumlabel}
-      inserts the current number of the second-level enumeration (as an
-      Arabic number). 
+      inserts the current number of the second-level enumeration (as an Arabic number).
     \end{templateinserts}
 
     \example
@@ -279,67 +188,45 @@ or come last as in |\item[Cat]<1>|.
   \end{element}
 
   \begin{element}{enumerate subsubitem}\yes\yes\yes
-    Like |enumerate item|, only for third-level items. 
+    Like |enumerate item|, only for third-level items.
 
     \begin{templateinserts}
       \iteminsert{\insertsubsubenumlabel}
-      inserts the current number of the second-level enumeration (as an
-      Arabic number). 
+      inserts the current number of the second-level enumeration (as an Arabic number).
     \end{templateinserts}
   \end{element}
 
   \begin{element}{enumerate mini template}\yes\yes\yes
-    This template is used to typeset the number that arises from a
-    mini template.
+    This template is used to typeset the number that arises from a mini template.
 
     \begin{templateinserts}
       \iteminsert{\insertenumlabel}
-      inserts the current number rendered by this mini template. For
-      example, if the \meta{mini template} is |(i)| and this command
-      is used in the fourth item, |\insertenumlabel| would yield
-      |(iv)|.
+      inserts the current number rendered by this mini template. For example, if the \meta{mini template} is |(i)| and this command is used in the fourth item, |\insertenumlabel| would yield |(iv)|.
     \end{templateinserts}
   \end{element}
 \end{environment}
 
-The following templates govern how the \emph{body} of an |itemize| or
-an |enumerate| is typeset.
+The following templates govern how the \emph{body} of an |itemize| or an |enumerate| is typeset.
 \begin{element}{itemize/enumerate body begin}\yes\no\no
-  This template is inserted at the beginning of a first-level
-  |itemize| or |enumerate| environment. Furthermore, before this
-  template is inserted, the \beamer-font and -color
-  |itemize/enumerate body| is used.
+  This template is inserted at the beginning of a first-level |itemize| or |enumerate| environment. Furthermore, before this template is inserted, the \beamer-font and -color |itemize/enumerate body| is used.
 \end{element}
 \begin{element}{itemize/enumerate body end}\yes\no\no
-  This template is inserted at the end of a first-level
-  |itemize| or |enumerate| environment.
+  This template is inserted at the end of a first-level |itemize| or |enumerate| environment.
 \end{element}
-There exist corresponding templates like
-|itemize/enumerate subbody being| from second- and third-level itemize
-or enumerates.
+There exist corresponding templates like |itemize/enumerate subbody begin| for second- and third-level itemize or enumerates.
 
 \begin{element}{items}\semiyes\no\no
-  This template is a parent template of |itemize items| and
-  |enumerate items|.
-  \example |\setbeamertemplate{items}[circle]| will cause all items in
-  |itemize| or |enumerate| environments to become circles (of the
-  appropriate size, color, and font).
+  This template is a parent template of |itemize items| and |enumerate items|.
+  \example
+  |\setbeamertemplate{items}[circle]| will cause all items in |itemize| or |enumerate| environments to become circles (of the appropriate size, color, and font).
 \end{element}
 
-
 \label{section-descriptions}
-  
-\begin{environment}{{description}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{long text}} 
-  Like |itemize|, but used to display a list that explains or defines
-  labels. The width of \meta{long text} is used to set the
-  indentation. Normally, you choose the widest label in the
-  description and copy it here. If you do not give this argument, the
-  default width is used, which can be changed using |\setbeamersize|
-  with the argument |description width=|\meta{width}.
-
-  As for |enumerate|, the \meta{default overlay specification} is
-  detected by an opening~|<|. The effect is the same as for
-  |enumerate| and |itemize|.
+
+\begin{environment}{{description}\opt{|[<|\meta{default overlay specification}|>]|}\oarg{long text}}
+  Like |itemize|, but used to display a list that explains or defines labels. The width of \meta{long text} is used to set the indentation. Normally, you choose the widest label in the description and copy it here. If you do not give this argument, the default width is used, which can be changed using |\setbeamersize| with the argument |description width=|\meta{width}.
+
+  As for |enumerate|, the \meta{default overlay specification} is detected by an opening~|<|. The effect is the same as for |enumerate| and |itemize|.
   \example
 \begin{verbatim}
 \begin{description}
@@ -354,7 +241,8 @@ or enumerates.
 \end{description}
 \end{verbatim}
 
-  \example The following has the same effect as the previous example:
+  \example
+  The following has the same effect as the previous example:
 \begin{verbatim}
 \begin{description}[<+->][longest label]
 \item[short] Some text.
@@ -364,9 +252,7 @@ or enumerates.
 \end{verbatim}
 
   \lyxnote
-  Since you cannot specify the optional argument in \LyX, if you wish
-  to specify the width, you may wish to use the following command
-  shortly before the environment:
+  Since you cannot specify the optional argument in \LyX, if you wish to specify the width, you may wish to use the following command shortly before the environment:
 
   |\setbeamersize{description width of={|\marg{text}|}}|
 
@@ -379,64 +265,45 @@ or enumerates.
 \item<3->[long label] Some text.
 \end{description}
 \end{verbatim}
-  
+
   \begin{element}{description item}\yes\yes\yes
-    This template is used to typeset the description items. When this
-    template is called, the \beamer-font and -color |description item|
-    are installed.
-    
+    This template is used to typeset the description items. When this template is called, the \beamer-font and -color |description item| are installed.
+
     \begin{templateoptions}
       \itemoption{default}{}
-      By default, the description item text is just inserted without
-      any modification.
+      By default, the description item text is just inserted without any modification.
     \end{templateoptions}
 
     The main insert that is useful inside this template is:
     \begin{templateinserts}
-      \iteminsert{\insertdescriptionitem} inserts the text of the
-      current description item.
+      \iteminsert{\insertdescriptionitem} inserts the text of the current description item.
     \end{templateinserts}
   \end{element}
 \end{environment}
 
-
-
-In order to simplify changing the color or font of items, the
-different kinds of items inherit form or just use the following
-``general'' \beamer-color and fonts:
+In order to simplify changing the color or font of items, the different kinds of items inherit from or just use the following ``general'' \beamer-color and fonts:
 
 \begin{element}{item}\no\yes\yes
   \colorparents{local structure}
   \fontparents{structure}
 
-  This color/font serves as a parent for the individual items of
-  |itemize| and |enumerate| environments, but also for items in the
-  table of contents. Since its color parent is the |local structure|,
-  a change of that color causes the color of items to change
-  accordingly.
+  This color/font serves as a parent for the individual items of |itemize| and |enumerate| environments, but also for items in the table of contents. Since its color parent is the |local structure|, a change of that color causes the color of items to change accordingly.
 \end{element}
 
 \begin{element}{item projected}\no\yes\yes
   \colorfontparents{item}
 
-  This is a special ``version'' of the |item| color and font that
-  should be used by templates that render items with text (as in an
-  enumeration) and which to ``project'' this text onto something like
-  a ball or a square or whatever. While the normal |item| color
-  typically has a transparent background, the |item projected|
-  typically has a colored background and, say, a white foreground. 
+  This is a special ``version'' of the |item| color and font that should be used by templates that render items with text (as in an enumeration) and which ``project'' this text onto something like a ball or a square or whatever. While the normal |item| color typically has a transparent background, the |item projected| typically has a colored background and, say, a white foreground.
 \end{element}
 
 \begin{element}{subitem}\no\yes\yes
   \colorfontparents{item}
-  Same as |item| for subitems, that is, for items on the second level of
-  indentation. 
+  Same as |item| for subitems, that is, for items on the second level of indentation.
 \end{element}
 
 \begin{element}{subitem projected}\no\yes\yes
   \colorfontparents{item projected}
-  Same as |item projected| for subitems, that is, for items on the
-  second level of indentation. 
+  Same as |item projected| for subitems, that is, for items on the second level of indentation.
 \end{element}
 
 \begin{element}{subsubitem}\no\yes\yes
@@ -448,76 +315,37 @@ different kinds of items inherit form or just use the following
 \end{element}
 
 
+\subsection{Highlighting}
 
+The \beamer\ class predefines commands and environments for highlighting text. Using these commands makes is easy to change the appearance of a document by changing the theme.
 
-\subsection{Hilighting}
-
-The \beamer\ class predefines commands and environments for
-hilighting text. Using these commands makes is easy to change the
-appearance of a document by changing the theme. 
+\begin{command}{\structure\sarg{overlay specification}\marg{text}}
+  The given text is marked as part of the structure, that is, it is supposed to help the audience see the structure of your presentation. If the \meta{overlay specification} is present, the command only has an effect on the specified slides.
+  \example
+  |\structure{Paragraph Heading.}|
 
+  Internally, this command just puts the \emph{text} inside a |structureenv| environment.
 
-\begin{command}{\structure\sarg{overlay specification}\marg{text}}
-  The given text is marked as part of the structure, that is, it is
-  supposed to help the audience see the structure of your
-  presentation. If the \meta{overlay specification} is present, the
-  command only has an effect on the specified slides.
-  \example|\structure{Paragraph Heading.}|
-
-  Internally, this command just puts the \emph{text} inside a
-  |structureenv| environment.
- 
   \articlenote
-  Structure text is typeset as bold text. This can be changed by
-  modifying the templates.
+  Structure text is typeset as bold text. This can be changed by modifying the templates.
 
   \lyxnote
   You need to use \TeX-mode to insert this command.
 
   \begin{element}{structure}\no\yes\yes
-    This color/font is used when structured text is typeset, but it is
-    also widely used as a base for many other colors including the
-    headings of blocks, item buttons, and titles. In most color
-    themes, the colors for navigational elements in the headline or
-    the footline are derived from the foreground color of
-    |structure|. By changing the structure color you can easily change
-    the ``basic color'' of your presentation, other than the color of
-    normal text. See also the related color |local structure| and the
-    related font |tiny structure|.
-    
-    Inside the |\structure| command, the background of the color is
-    ignored, but this is not necessarily true for elements that
-    inherit their color from |structure|. There is no template
-    |structure|, use |structure begin| and |structure end| instead.
+    This color/font is used when structured text is typeset, but it is also widely used as a base for many other colors including the headings of blocks, item buttons, and titles. In most color themes, the colors for navigational elements in the headline or the footline are derived from the foreground color of |structure|. By changing the structure color you can easily change the ``basic color'' of your presentation, other than the color of normal text. See also the related color |local structure| and the related font |tiny structure|.
+
+    Inside the |\structure| command, the background of the color is ignored, but this is not necessarily true for elements that inherit their color from |structure|. There is no template |structure|, use |structure begin| and |structure end| instead.
   \end{element}
- 
+
   \begin{element}{local structure}\no\yes\no
-    This color should be used to typeset structural elements that change
-    their color according to the ``local environment.'' For example, the
-    color of an item ``button'' in an |itemize| environment changes its
-    color according to circumstances. If it is used inside an example
-    block, it should have the |example text| color; if it is currently
-    ``alerted'' it should have the |alerted text| color. This color
-    will setup by certain environments to have the color that should be
-    used to typset things like item buttons. Since the color used for
-    items, |item|, inherits from this color by default, items
-    automatically change their color according to the current
-    situation.
-
-    If you write your own environment in which the item buttons are
-    similar structural elements should have a different color, you
-    should change the color |local structure| inside these
-    environments. 
+    This color should be used to typeset structural elements that change their color according to the ``local environment.'' For example, an item ``button'' in an |itemize| environment changes its color according to circumstances. If it is used inside an example block, it should have the |example text| color; if it is currently ``alerted'' it should have the |alerted text| color. This color is setup by certain environments to have the color that should be used to typset things like item buttons. Since the color used for items, |item|, inherits from this color by default, items automatically change their color according to the current situation.
+
+    If you write your own environment in which the item buttons and similar structural elements should have a different color, you should change the color |local structure| inside these environments.
   \end{element}
-  
+
   \begin{element}{tiny structure}\no\no\yes
-    This special font is used for ``tiny'' structural text. Basically,
-    this font should be used whenever a structural element uses a tiny
-    font. The idea is that the tiny versions of the |structure| font
-    often are not suitable. For example, it is often necessary to use a
-    boldface version for them. Also, one might wish to have serif smallcaps
-    structural text, but still retain normal sans-serif tiny structural
-    text.
+    This special font is used for ``tiny'' structural text. Basically, this font should be used whenever a structural element uses a tiny font. The idea is that the tiny versions of the |structure| font often are not suitable. For example, it is often necessary to use a boldface version for them. Also, one might wish to have serif smallcaps structural text, but still retain normal sans-serif tiny structural text.
   \end{element}
 \end{command}
 
@@ -525,8 +353,7 @@ appearance of a document by changing the theme.
   Environment version of the |\structure| command.
 
   \begin{element}{structure begin}\yes\no\no
-    This text is inserted at the beginning of a |structureenv|
-    environment.
+    This text is inserted at the beginning of a |structureenv| environment.
 
     \begin{templateoptions}
       \itemoption{default}{}
@@ -542,29 +369,21 @@ appearance of a document by changing the theme.
 \end{environment}
 
 
-\begin{command}{\alert\sarg{overlay specification}\marg{hilighted text}}
-  The given text is hilighted, typically by coloring the text red. If
-  the \meta{overlay specification} is present, the command only has an
-  effect on the specified slides.
-  \example |This is \alert{important}.|
+\begin{command}{\alert\sarg{overlay specification}\marg{highlighted text}}
+  The given text is highlighted, typically by coloring the text red. If the \meta{overlay specification} is present, the command only has an effect on the specified slides.
+  \example
+  |This is \alert{important}.|
+
+  Internally, this command just puts the \emph{highlighted text} inside an |alertenv|.
 
-  Internally, this command just puts the \emph{hilighted text} inside
-  an |alertenv|.
-  
   \articlenote
-  Alerted text is typeset as emphasized text. This can be changed by
-  modifying the templates, see below.
+  Alerted text is typeset as emphasized text. This can be changed by modifying the templates, see below.
 
   \lyxnote
-  You need to use \TeX-mode to insert this command (which is not very
-  convenient).
+  You need to use \TeX-mode to insert this command (which is not very convenient).
 
   \begin{element}{alerted text}\no\yes\yes
-    This color/font is used when alerted text is typeset. The
-    background is currently ignored. There is no template
-    |alerted text|, rather there are templates |alerted text begin|
-    and |alerted text end| that are inserted before and after alerted
-    text.
+    This color/font is used when alerted text is typeset. The background is currently ignored. There is no template |alerted text|, rather there are templates |alerted text begin| and |alerted text end| that are inserted before and after alerted text.
   \end{element}
 \end{command}
 
@@ -572,17 +391,13 @@ appearance of a document by changing the theme.
   Environment version of the |\alert| command.
 
   \begin{element}{alerted text begin}\yes\no\no
-    This text is inserted at the beginning of a an |alertenv|
-    environment.
+    This text is inserted at the beginning of a an |alertenv| environment.
 
     \begin{templateoptions}
       \itemoption{default}{}
 
       \beamernote
-      This changes the color |local structure| to |alerted text|. This
-      causes things like buttons or items to be colored in the same
-      color as the alerted text, which is often visually pleasing. See
-      also the |\structure| command.
+      This changes the color |local structure| to |alerted text|. This causes things like buttons or items to be colored in the same color as the alerted text, which is often visually pleasing. See also the |\structure| command.
 
       \articlenote
       The text is emphasized.
@@ -595,46 +410,30 @@ appearance of a document by changing the theme.
 \end{environment}
 
 
-
-
 \subsection{Block Environments}
 \label{predefined}
 
-The \beamer\ class predefines an environment for typesetting a
-``block'' of text that has a heading. The appearance of blocks can
-easily be changed using the following template:
+The \beamer\ class predefines an environment for typesetting a ``block'' of text that has a heading. The appearance of blocks can easily be changed using the following template:
 
 \begin{element}{blocks}\semiyes\no\no
-  Changining this parent template changes the templates of normal
-  blocks, alerted blocks, and example blocks.
+  Changining this parent template changes the templates of normal blocks, alerted blocks, and example blocks.
 
-  \example |\setbeamertemplate{blocks}[default]|
-  \example |\setbeamertemplate{blocks}[rounded][shadow=true]|
+  \example
+  |\setbeamertemplate{blocks}[default]|
+  \example
+  |\setbeamertemplate{blocks}[rounded][shadow=true]|
 
   \begin{templateoptions}
     \itemoption{default}{}
-    The default setting typesets the block title on its own line. If a
-    background is specified either for the |block title| or for the
-    |block body|, this background color is used as background of the
-    title or body, respectively. For alerted and example blocks, the
-    corresponding \beamer-colors and -fonts are used, instead.
+    The default setting typesets the block title on its own line. If a background is specified either for the |block title| or for the |block body|, this background color is used as background of the title or body, respectively. For alerted and example blocks, the corresponding \beamer-colors and -fonts are used, instead.
     \itemoption{rounded}{\oarg{shadow=true}}
-    Makes the blocks ``rounded.'' This means that the corners of the
-    backgrounds of the blocks are ``rounded off.'' If the
-    |shadow=true| option is given, a ``shadow'' is drawn behind the
-    block. 
+    Makes the blocks ``rounded.'' This means that the corners of the backgrounds of the blocks are ``rounded off.'' If the |shadow=true| option is given, a ``shadow'' is drawn behind the block.
   \end{templateoptions}
 \end{element}
 
 
-\begin{environment}{{block}\sarg{action specification}\marg{block
-      title}\sarg{action specification}}
-  Only one \meta{action specification} may be given.
-  Inserts a block, like a definition or a theorem, with the title
-  \meta{block title}. If the \meta{action specification} is present,
-  the given actions are taken on the specified slides, see
-  Section~\ref{section-action-specifications}. In the example, the 
-  definition is shown only from slide 3 onward.
+\begin{environment}{{block}\sarg{action specification}\marg{block title}\sarg{action specification}}
+  Only one \meta{action specification} may be given. Inserts a block, like a definition or a theorem, with the title \meta{block title}. If the \meta{action specification} is present, the given actions are taken on the specified slides, see Section~\ref{section-action-specifications}. In the example, the definition is shown only from slide 3 onward.
   \example
 \begin{verbatim}
   \begin{block}<3->{Definition}
@@ -646,25 +445,16 @@ easily be changed using the following template:
   The block name is typeset in bold.
 
   \lyxnote
-  The argument of the block must (currently) be given in
-  \TeX-mode. More precisely, there must be an opening brace in
-  \TeX-mode and a closing brace in \TeX-mode around it. The text
-  in between can also be typeset using \LyX. I hope to get rid of this
-  some day.
+  The argument of the block must (currently) be given in \TeX-mode. More precisely, there must be an opening brace in \TeX-mode and a closing brace in \TeX-mode around it. The text in between can also be typeset using \LyX. We hope to get rid of this some day.
 
   \begin{element}{block begin}\yes\no\no
-    This template is inserted at the beginning of a block before the
-    \meta{environment contents}. Inside this
-    template, the block title can be accessed via the following
-    insert:
+    This template is inserted at the beginning of a block before the \meta{environment contents}. Inside this template, the block title can be accessed via the following insert:
     \begin{itemize}
       \iteminsert{\insertblocktitle}
       Inserts the \meta{block title} into the template.
     \end{itemize}
 
-    When the template starts, no special color or font is installed
-    (for somewhat complicated reasons). Thus, this template should
-    install the correct colors and fonts for the title and the body itself.
+    When the template starts, no special color or font is installed (for somewhat complicated reasons). Thus, this template should install the correct colors and fonts for the title and the body itself.
   \end{element}
 
   \begin{element}{block end}\yes\no\no
@@ -672,27 +462,19 @@ easily be changed using the following template:
   \end{element}
 
   \begin{element}{block title}\no\yes\yes
-    This \beamer-color/-font should be used to typeset the title of
-    the block. Since neither the color nor the font are setup
-    automatically, the template |block begin| must do so itself.
+    This \beamer-color/-font should be used to typeset the title of the block. Since neither the color nor the font are setup automatically, the template |block begin| must do so itself.
 
-    The default block template and also the |rounded| version honor
-    the background of this color.
+    The default block template and also the |rounded| version honor the background of this color.
   \end{element}
 
   \begin{element}{block body}\no\yes\yes
-    This \beamer-color/-font should be used to typeset the body of the
-    block, that is, the \meta{environment contents}. As for
-    |block title|, the color and font must be setup by the template
-    |block begin|.
+    This \beamer-color/-font should be used to typeset the body of the block, that is, the \meta{environment contents}. As for |block title|, the color and font must be setup by the template |block begin|.
   \end{element}
 \end{environment}
 
-
 \begin{environment}{{alertblock}\sarg{action specification}\marg{block
-title}\sarg{action specification}} 
-  Inserts a block whose title is hilighted. Behaves like the |block|
-  environment otherwise.
+title}\sarg{action specification}}
+  Inserts a block whose title is highlighting. Behaves like the |block| environment otherwise.
   \example
 \begin{verbatim}
   \begin{alertblock}{Wrong Theorem}
@@ -723,13 +505,11 @@ title}\sarg{action specification}}
   \end{element}
 \end{environment}
 
-\begin{environment}{{exampleblock}\sarg{action
-specification}\marg{block title}\sarg{overlay specification}} 
-  Inserts a block that is supposed to be an example. Behaves like the
-  |block| environment otherwise.
-  
-  \example In the following example, the block is completely
-  suppressed on the first slide (it does not even occupy any space).
+\begin{environment}{{exampleblock}\sarg{action specification}\marg{block title}\sarg{overlay specification}}
+  Inserts a block that is supposed to be an example. Behaves like the |block| environment otherwise.
+
+  \example
+  In the following example, the block is completely suppressed on the first slide (it does not even occupy any space).
 \begin{verbatim}
   \begin{exampleblock}{Example}<only@2->
     The set $\{1,2,3,5\}$ has four elements.
@@ -760,25 +540,15 @@ specification}\marg{block title}\sarg{overlay specification}}
 \end{environment}
 
 \lyxnote
-Overlay specifications must be given right at the beginning of the
-environments and in \TeX-mode.
-
+Overlay specifications must be given right at the beginning of the environments and in \TeX-mode.
 
 
 \subsection{Theorem Environments}
 \label{section-theorems}
 
-The \beamer\ class predefines several environments, like |theorem| or
-|definition| or |proof|, that you can use to typeset things like,
-well, theorems, definitions, or proofs. The complete list is the
-following:  |theorem|, |corollary|, |definition|,
-|definitions|, |fact|, |example|, and |examples|. The following German
-block environments are also predefined: |Problem|, |Loesung|,
-|Definition|, |Satz|, |Beweis|, |Folgerung|, |Lemma|, |Fakt|,
-|Beispiel|, and |Beispiele|.
+The \beamer\ class predefines several environments, like |theorem| or |definition| or |proof|, that you can use to typeset things like, well, theorems, definitions, or proofs. The complete list is the following:  |theorem|, |corollary|, |definition|, |definitions|, |fact|, |example|, and |examples|. The following German block environments are also predefined: |Problem|, |Loesung|, |Definition|, |Satz|, |Beweis|, |Folgerung|, |Lemma|, |Fakt|, |Beispiel|, and |Beispiele|.
 
 Here is a typical example on how to use them:
-
 \begin{verbatim}
 \begin{frame}
   \frametitle{A Theorem on Infinite Sets}
@@ -797,33 +567,16 @@ Here is a typical example on how to use them:
 \end{frame}
 \end{verbatim}
 
-In the following, only the English versions are discussed. The German
-ones behave  analogously.
-
-\begin{environment}{{theorem}\sarg{action
-  specification}\oarg{additional text}\sarg{action specification}}
-  Inserts a theorem. Only one \meta{action specification} may be
-  given. If present, the \meta{additional text} is shown behind the
-  word ``Theorem'' in rounded brackets (although this can be changed by
-  the template).
-
-  The appearance of the theorem is governed by the templates
-  |theorem begin| and |theorem end|, see their description later on
-  for details on how to change these. Every theorem is put into a
-  |block| environment, thus the templates for blocks also apply.
-
-  The theorem style (a concept from |amsthm|) used for this
-  environment is |plain|. In this style, the body of a theorem should
-  be typeset in italics. The head of the theorem should be typeset in
-  a bold font, but this is usually overruled by the templates.
-
-  If the option |envcountsect| is given either as class option in one
-  of the |presentation| modes or as an option to the package
-  |beamerarticle| in |article| mode, then the numbering of the
-  theorems is local to each section with the section number prefixing
-  the theorem number; otherwise they are numbered consecutively
-  throughout the presentation or article. I recommend using this
-  option in |article| mode.
+In the following, only the English versions are discussed. The German ones behave analogously.
+
+\begin{environment}{{theorem}\sarg{action specification}\oarg{additional text}\sarg{action specification}}
+  Inserts a theorem. Only one \meta{action specification} may be given. If present, the \meta{additional text} is shown behind the word ``Theorem'' in rounded brackets (although this can be changed by the template).
+
+  The appearance of the theorem is governed by the templates |theorem begin| and |theorem end|, see their description later on for details on how to change these. Every theorem is put into a |block| environment, thus the templates for blocks also apply.
+
+  The theorem style (a concept from |amsthm|) used for this environment is |plain|. In this style, the body of a theorem should be typeset in italics. The head of the theorem should be typeset in a bold font, but this is usually overruled by the templates.
+
+  If the option |envcountsect| is given either as class option in one of the |presentation| modes or as an option to the package |beamerarticle| in |article| mode, then the numbering of the theorems is local to each section with the section number prefixing the theorem number; otherwise they are numbered consecutively throughout the presentation or article. We recommend using this option in |article| mode.
 
   By default, no theorem numbers are shown in the |presentation| modes.
 
@@ -839,68 +592,42 @@ ones behave  analogously.
 \end{verbatim}
 
   \lyxnote
-  If present, the optional argument and the action specification must
-  be given in \TeX-mode at the beginning of the environment.
+  If present, the optional argument and the action specification must be given in \TeX-mode at the beginning of the environment.
 \end{environment}
 
-The environments \declare{|corollary|}, \declare{|fact|}, and
-\declare{|lemma|} behave exactly the same way.
+The environments \declare{|corollary|}, \declare{|fact|}, and \declare{|lemma|} behave exactly the same way.
 
 \begin{classoption}{envcountsect}
-  Causes theorems, definitions, and so on to be numbered locally to
-  each section. Thus, the first theorem of the second section would be
-  Theorem~2.1 (assuming that there are no definitions, lemmas, or
-  corollaries earlier in the section).
+  Causes theorems, definitions, and so on to be numbered locally to each section. Thus, the first theorem of the second section would be Theorem~2.1 (assuming that there are no definitions, lemmas, or corollaries earlier in the section).
 \end{classoption}
 
-\begin{environment}{{definition}\sarg{action
-      specification}\oarg{additional text}\sarg{action specification}}
-  Behaves like the |theorem| environment, except that the theorem
-  style |definition| is used. In this style, the body of a theorem is
-  typeset in an upright font.
+\begin{environment}{{definition}\sarg{action specification}\oarg{additional text}\sarg{action specification}}
+  Behaves like the |theorem| environment, except that the theorem style |definition| is used. In this style, the body of a theorem is typeset in an upright font.
 \end{environment}
 
 The environment \declare{|definitions|} behaves exactly the same way.
 
-\begin{environment}{{example}\sarg{action
-      specification}\oarg{additional text}\sarg{action specification}}
-  Behaves like the |theorem| environment, except that the theorem
-  style |example| is used. A side-effect of using this theorem style
-  is that the \meta{environment contents} is put in an |exampleblock|
-  instead of a |block|.
+\begin{environment}{{example}\sarg{action specification}\oarg{additional text}\sarg{action specification}}
+  Behaves like the |theorem| environment, except that the theorem style |example| is used. A side-effect of using this theorem style is that the \meta{environment contents} is put in an |exampleblock| instead of a |block|.
 \end{environment}
 
 The environment \declare{|examples|} behaves exactly the same way.
 
 \beamernote
-The default template for typesetting theorems suppresses the theorem
-number, even if this number is ``available'' for typesetting (which it
-is by default in all predefined environments; but if you define your
-own environment using |\newtheorem*| no number will be available).
+The default template for typesetting theorems suppresses the theorem number, even if this number is ``available'' for typesetting (which it is by default in all predefined environments; but if you define your own environment using |\newtheorem*| no number will be available).
 
 \articlenote
-In |article| mode, theorems are automatically numbered. By specifying
-the class option |envcountsect|, theorems will be numbered locally to each
-section, which is usually a good idea, except for very short
-articles.
-
-\begin{environment}{{proof}\sarg{action specification}\oarg{proof
-name}\sarg{action specification}}
-  Typesets a proof. If the optional \meta{proof name} is given, it
-  completely replaces the word ``Proof.'' This is different from
-  normal theorems, where the optional argument is shown in brackets.
-
-  At the end of the theorem, a |\qed| symbol is shown, except if you
-  say |\qedhere| earlier in the proof (this is exactly as in
-  |amsthm|). The default |\qed| symbol is an open rectangle. To
-  completely suppress the symbol, write |\def\qedsymbol{}| in 
-  your preamble. To get an closed rectangle, say
+In |article| mode, theorems are automatically numbered. By specifying the class option |envcountsect|, theorems will be numbered locally to each section, which is usually a good idea, except for very short articles.
+
+\begin{environment}{{proof}\sarg{action specification}\oarg{proof name}\sarg{action specification}}
+  Typesets a proof. If the optional \meta{proof name} is given, it completely replaces the word ``Proof.'' This is different from normal theorems, where the optional argument is shown in brackets.
+
+  At the end of the theorem, a |\qed| symbol is shown, except if you say |\qedhere| earlier in the proof (this is exactly as in |amsthm|). The default |\qed| symbol is an open rectangle. To completely suppress the symbol, write |\def\qedsymbol{}| in your preamble. To get an closed rectangle, say
 \begin{verbatim}
 \setbeamertemplate{qed symbol}{\vrule width1.5ex height1.5ex depth0pt}
 \end{verbatim}
 
-  If you use |babel| and a different language, the text ``Proof'' is
-  replaced by whatever is appropriate in the selected language.
+  If you use |babel| and a different language, the text ``Proof'' is replaced by whatever is appropriate in the selected language.
 
   \example
 \begin{verbatim}
@@ -916,97 +643,61 @@ name}\sarg{action specification}}
 
 You can define new environments using the following command:
 
-\begin{command}{\newtheorem\opt{|*|}\marg{environment name}\oarg{numbered same
-      as}\marg{head text}\oarg{number within}}
-  This command is used exactly the same way as in the |amsthm| package
-  (as a matter of fact, it is the command from that package), see its
-  documentation. The only difference is that environments declared using
-  this command are overlay-specification-aware in \beamer\ and that,
-  when typeset, are typeset according to \beamer's templates.
+\begin{command}{\newtheorem\opt{|*|}\marg{environment name}\oarg{numbered same as}\marg{head text}\oarg{number within}}
+  This command is used exactly the same way as in the |amsthm| package (as a matter of fact, it is the command from that package), see its documentation. The only difference is that environments declared using this command are overlay-specification-aware in \beamer\ and that, when typeset, are typeset according to \beamer's templates.
 
   \articlenote
-  Environments declared using this command are also
-  overlay-specification-aware in |article| mode.
+  Environments declared using this command are also overlay-specification-aware in |article| mode.
 
-  \example |\newtheorem{observation}[theorem]{Observation}|
+  \example
+  |\newtheorem{observation}[theorem]{Observation}|
 \end{command}
 
-You can also use |amsthm|'s command |\newtheoremstyle| to define new
-theorem styles. Note that the default template for theorems will
-ignore any head font setting, but will honor the body font setting.
+You can also use |amsthm|'s command |\newtheoremstyle| to define new theorem styles. Note that the default template for theorems will ignore any head font setting, but will honor the body font setting.
 
-If you wish to define the environments like |theorem| differently (for
-example, have it numbered within each subsection), you can use the
-following class option to disable the definition of the predefined
-environments: 
+If you wish to define the environments like |theorem| differently (for example, have it numbered within each subsection), you can use the following class option to disable the definition of the predefined environments:
 
 \begin{classoption}{notheorems}
-  Switches off the definition of default blocks like |theorem|, but
-  still loads |amsthm| and makes theorems  
-  overlay-specificiation-aware.
+  Switches off the definition of default blocks like |theorem|, but still loads |amsthm| and makes theorems overlay-specificiation-aware.
 \end{classoption}
 
-The option is also available as a package option for
-|beamerarticle| and has the same effect.
+The option is also available as a package option for |beamerarticle| and has the same effect.
 
 \articlenote
-In the |article| version, the package |amsthm| sometimes clashes with
-the document class. In this case you can use the following option,
-which is once more available as a class option for \beamer\ and as a
-package option for |beamerarticle|, to switch off the loading of
-|amsthm| altogether. 
+In the |article| version, the package |amsthm| sometimes clashes with the document class. In this case you can use the following option, which is once more available as a class option for \beamer\ and as a package option for |beamerarticle|, to switch off the loading of |amsthm| altogether.
 
 \begin{classoption}{noamsthm}
-  Does not load |amsthm| and also not |amsmath|. Environments like
-  |theorem| or |proof| will not be available.
+  Does not load |amsthm| and also not |amsmath|. Environments like |theorem| or |proof| will not be available.
 \end{classoption}
 
-
-
 \begin{element}{theorems}\semiyes\no\no
-  This template is a parent of |theorem begin| and |theorem end|, see
-  the first for a detailed discussion of how the theorem templates are
-  set.
+  This template is a parent of |theorem begin| and |theorem end|, see the first for a detailed discussion of how the theorem templates are set.
+
+  \example
+  |\setbeamertemplate{theorems}[numbered]|
 
-  \example |\setbeamertemplate{theorems}[numbered]|
-  
   \begin{templateoptions}
     \itemoption{default}{}
-    By default, theorems are typeset as follows: The font specification for
-    the body is honored, the font specification for the head is
-    ignored. No theorem number is printed.
+    By default, theorems are typeset as follows: The font specification for the body is honored, the font specification for the head is ignored. No theorem number is printed.
     \itemoption{normal font}{}
-    Like the default, except all font specifications for the body are
-    ignored. Thus, the fonts are used that are normally used for
-    blocks.
+    Like the default, except all font specifications for the body are ignored. Thus, the fonts are used that are normally used for blocks.
     \itemoption{numbered}{}
-    This option is like the default, except that the theorem
-    number is printed for environments that are numbered.
+    This option is like the default, except that the theorem number is printed for environments that are numbered.
     \itemoption{ams style}{}
-    This causes theorems to be put in a |block| or |exampleblock|, but
-    to be otherwise typeset as is normally done in |amsthm|. Thus the
-    head font and body font depend on the setting for the theorem to be
-    typeset and theorems are numbered.
+    This causes theorems to be put in a |block| or |exampleblock|, but to be otherwise typeset as is normally done in |amsthm|. Thus the head font and body font depend on the setting for the theorem to be typeset and theorems are numbered.
   \end{templateoptions}
 \end{element}
 
 
 \begin{element}{theorem begin}\yes\no\no
-  Whenever an environment declared using the command |\newtheorem| is
-  to be typeset, this template is inserted at the beginning and the
-  template |theorem end| at the end. If there is a overlay
-  specification when an environment like |theorem| is 
-  used, this overlay specification will directly follow the
-  \meta{block beginning template} upon invocation. This is even true
-  if there was an optional argument to the |theorem| environment. This
-  optional argument is available via the insert |\inserttheoremaddition|.
-
-  Numerous inserts are available in this template, see below.  
-
-  Before the template starts, the font is set to the body font
-  prescribed by the environment to be typeset.
-  
-  \example The following typesets theorems like |amsthm|:
+  Whenever an environment declared using the command |\newtheorem| is to be typeset, this template is inserted at the beginning and the template |theorem end| at the end. If there is an overlay specification when an environment like |theorem| is used, this overlay specification will directly follow the \meta{block beginning template} upon invocation. This is even true if there was an optional argument to the |theorem| environment. This optional argument is available via the insert |\inserttheoremaddition|.
+
+  Numerous inserts are available in this template, see below.
+
+  Before the template starts, the font is set to the body font prescribed by the environment to be typeset.
+
+  \example
+  The following typesets theorems like |amsthm|:
 \begin{verbatim}
 \setbeamertemplate{theorem begin}
 {%
@@ -1022,9 +713,8 @@ package option for |beamerarticle|, to switch off the loading of
 \setbeamertemplate{theorem end}{\end{\inserttheoremblockenv}}
 \end{verbatim}
 
-  \example In the following example, all font ``suggestions'' for the
-  environment are suppressed or ignored; and the theorem number is
-  suppressed.
+  \example
+  In the following example, all font ``suggestions'' for the environment are suppressed or ignored; and the theorem number is suppressed.
 \begin{verbatim}
 \setbeamertemplate{theorem begin}
 {%
@@ -1041,31 +731,22 @@ package option for |beamerarticle|, to switch off the loading of
   The following inserts are available inside this template:
   \begin{itemize}
     \iteminsert{\inserttheoremblockenv}
-    This will normally expand to |block|, but if a theorem that has
-    theorem style |example| is typeset, it will expand to
-    |exampleblock|. Thus you can use this insert to decide which
-    environment should be used when typesetting the theorem.
+    This will normally expand to |block|, but if a theorem that has theorem style |example| is typeset, it will expand to |exampleblock|. Thus you can use this insert to decide which environment should be used when typesetting the theorem.
 
     \iteminsert{\inserttheoremheadfont}
-    This will expand to a font changing command that switches to the
-    font to be used in the head of the theorem. By not inserting it, you
-    can ignore the head font.
+    This will expand to a font changing command that switches to the font to be used in the head of the theorem. By not inserting it, you can ignore the head font.
 
     \iteminsert{\inserttheoremname}
-    This will expand to the name of the environment to be typeset (like
-    ``Theorem'' or ``Corollary''). 
+    This will expand to the name of the environment to be typeset (like ``Theorem'' or ``Corollary'').
 
     \iteminsert{\inserttheoremnumber}
-    This will expand to the number of the current theorem preceeded by a
-    space or to nothing, if the current theorem does not have a number.
+    This will expand to the number of the current theorem preceeded by a space or to nothing, if the current theorem does not have a number.
 
     \iteminsert{\inserttheoremaddition}
-    This will expand to the optional argument given to the environment
-    or will be empty, if there was no optional argument.
+    This will expand to the optional argument given to the environment or will be empty, if there was no optional argument.
 
     \iteminsert{\inserttheorempunctuation}
-    This will expand to the punctuation character for the current
-    environment. This is usually a period.
+    This will expand to the punctuation character for the current environment. This is usually a period.
   \end{itemize}
 \end{element}
 
@@ -1074,24 +755,14 @@ package option for |beamerarticle|, to switch off the loading of
 \end{element}
 
 
-
 \subsection{Framed and Boxed Text}
 
-In order to draw a frame (a rectangle) around some text, you can use
-\LaTeX s standard command |\fbox| and also |\frame| (inside a \beamer\
-frame, the |\frame| command changes its meaning to the normal \LaTeX\
-|\frame| command). More frame types are offered by the
-package |fancybox|, which defines the following commands:
-|\shadowbox|, |\doublebox|, |\ovalbox|, and |\Ovalbox|. Please consult
-the \LaTeX\ Companion for details on how to use these commands.
+In order to draw a frame (a rectangle) around some text, you can use \LaTeX s standard command |\fbox| and also |\frame| (inside a \beamer\ frame, the |\frame| command changes its meaning to the normal \LaTeX\ |\frame| command). More frame types are offered by the package |fancybox|, which defines the following commands: |\shadowbox|, |\doublebox|, |\ovalbox|, and |\Ovalbox|. Please consult the \LaTeX\ Companion for details on how to use these commands.
 
-The \beamer\ class also defines two environments for creating coloured
-boxes.
+The \beamer\ class also defines two environments for creating coloured boxes.
 
 \begin{environment}{{beamercolorbox}\oarg{options}\marg{beamer color}}
-  This environment can be used to conveniently typeset some text using
-  some \beamer-color. Basically, the following two command blocks do
-  the same: 
+  This environment can be used to conveniently typeset some text using some \beamer-color. Basically, the following two command blocks do the same:
 \begin{verbatim}
 \begin{beamercolorbox}{beamer color}
   Text
@@ -1105,26 +776,15 @@ boxes.
   }
 }
 \end{verbatim}
-  In other words, the environment installs the \meta{beamer color} and
-  uses the background for the background of the box and the foreground
-  for the text inside the box. However, in reality, numerous
-  \meta{options} can be given to specify in much greater detail how
-  the box is rendered.
-
-  If the background color of \meta{beamer color} is empty, no
-  background is drawn behind the text, that is, the background is
-  ``transparent.''
-
-  This command is used extensively by the default inner and outer
-  themes for typesetting the headlines and footlines. It is not really
-  intended to be used in normal frames (for example, it is not
-  available inside |article| mode). You should prefer using
-  structuring elements like blocks or theorems that automatically
-  insert colored boxes as needed.
-
-  \example The following example could be used to typeset a headline
-  with two lines, the first showing the document title, the second
-  showing the author's name:
+
+  In other words, the environment installs the \meta{beamer color} and uses the background for the background of the box and the foreground for the text inside the box. However, in reality, numerous \meta{options} can be given to specify in much greater detail how the box is rendered.
+
+  If the background color of \meta{beamer color} is empty, no background is drawn behind the text, that is, the background is ``transparent.''
+
+  This command is used extensively by the default inner and outer themes for typesetting the headlines and footlines. It is not really intended to be used in normal frames (for example, it is not available inside |article| mode). You should prefer using structuring elements like blocks or theorems that automatically insert colored boxes as needed.
+
+  \example
+  The following example could be used to typeset a headline with two lines, the first showing the document title, the second showing the author's name:
 \begin{verbatim}
 \begin{beamercolorbox}[ht=2.5ex,dp=1ex,center]{title in head/foot}
   \usebeamerfont{title in head/foot}
@@ -1136,7 +796,8 @@ boxes.
 \end{beamercolorbox}
 \end{verbatim}
 
-  \example Typesetting a postit:
+  \example
+  Typesetting a postit:
 \begin{verbatim}
 \setbeamercolor{postit}{fg=black,bg=yellow}
 \begin{beamercolorbox}[sep=1em,wd=5cm]{postit}
@@ -1144,129 +805,58 @@ boxes.
 \end{beamercolorbox}
 \end{verbatim}
 
-  
   The following \meta{options} can be given:
   \begin{itemize}
-  \item \declare{|wd=|\marg{width}} sets the width of the box. This
-    command has two effects: First, \TeX's |\hsize| is set to
-    \meta{width}. Second, after the box has been typeset, its width is
-    set to \meta{width} (no matter what it actually turned out to
-    be). Since setting the |\hsize| does not automatically change some
-    of \LaTeX's linewidth dimensions, you should consider using a
-    minipage inside this environment if you fool around with the
-    width.
-
-    If the width is larger than the normal text width, as specified by
-    the value of |\textwidth|, the width of the resulting box is reset
-    to the width |\textwidth|, but intelligent negative skips are
-    inserted at the left and right end of the box. The net effect of
-    this is that you can use a width larger than the text width for a
-    box and can insert the resulting box directly into normal text
-    without getting annoying warnings and having the box positioned
-    sensibly.
-  \item \declare{|dp=|\marg{depth}} sets the depth of the box,
-    overriding the real depth of the box. The box is first typeset
-    normally, then the depth is changed afterwards. This option is
-    useful for creating boxes that have guaranteed size.
-
-    If the option is not given, the box has its ``natural'' depth,
-    which results from the typesetting. For example, a box containing
-    only the letter ``a'' will have a different depth from a box
-    containing only the letter ``g.''
-  \item \declare{|ht=|\meta{height}} sets the height of the box,
-    overriding the real height. Note that the ``height'' does not
-    include the depth (see, for example, the \TeX-book for
-    details). If you want a one-line box that always has the same
-    size, setting the height to 2.25ex and the depth to 1ex is usually
-    a good option.
-  \item \declare{|left|} causes the text inside the box to be typeset
-    left-aligned and with a (radically) ragged right border. This is
-    the default. To get a better ragged right border, use the
-    |rightskip| option. 
-  \item \declare{|right|} causes the text to be right-aligned with a
-    (radically) ragged left border.
-  \item \declare{|center|} centers the text inside the box.
-  \item \declare{|leftskip=|\meta{left skip}} installs the \meta{left
-      skip} inside the box as the left skip. \TeX's left skip is a
-    glue that is inserted at the left end of every line. See the
-    \TeX-book for details.
-  \item \declare{|rightskip=|\meta{right skip}} install the
-    \meta{right skip}. To get a good ragged right border, try, say,
-    |\rightskip=0pt plus 4em|.
-  \item \declare{|sep=|\meta{dimension}} sets the size of extra
-    space around the text. This space is added ``inside the box,''
-    which means that if you specify a |sep| of 1cm and insert the box
-    normally into the vertical list, then the left border of the box
-    will be aligned with the left border of the slide text, while the
-    left border of the text inside the box will be 1cm to the right of
-    this left border. Likewise, the text inside the box will stop 1cm
-    before the right border of the normal text.
-  \item \declare{|colsep=|\meta{dimension}} sets the extra ``color
-    separation space'' around the text. This space behaves the
-    same way as the space added by |sep|, only this space is only
-    inserted if the box has a colored background, that is, if the
-    background of the \meta{beamer color} is not empty. This command
-    can be used together with |sep|, the effects accumulate.
-  \item \declare{|colsep*=|\meta{dimension}} sets an extra color
-    separation space around the text that is \emph{horizontally
-    outside the box}. This means that if the box has a background,
-    this background will protrude by \meta{dimension} to the left and
-    right of the text, but this protruding background will not be
-    taken intro consideration by \TeX\ for typesetting purposes.
-
-    A typical example usage of this option arises when you insert a
-    box with a coloured background in the middle of normal text. In
-    this case, if the background color is set, you would like a
-    background to be drawn behind the text \emph{and} you would like a
-    certain extra space around this text (the background should not
-    stop immediately at the borders of the text, this looks silly)
-    \emph{and} you would like the normal text always to be at the same 
-    horizontal position, independently of whether a background is
-    present or not. In this case, using |colsep*=4pt| is a good
-    option.
-  \item \declare{|shadow|}\opt{|=|\meta{true or false}} draws a shadow
-    behind the box. Currently, this option only has an effect if
-    used together with the |rounded| option, but that may change.
-  \item \declare{|rounded|}\opt{|=|\meta{true or false}} causes the
-    borders of the box to be rounded off if there is a background
-    installed. This command internally calls |beamerboxesrounded|.
-  \item \declare{|ignorebg|} causes the background color of the
-    \meta{beamer color} to be ignored, that is, to be treated as if it
-    were set to ``transparent'' or ``empty.''
-  \item \declare{vmode} causes \TeX\ to be in vertical mode when the
-    box starts. Normally, \TeX\ will be in horizontal mode at the
-    start of the box (a |\leavevmode| is inserted automatically at the
-    beginning of the box unless this option is given). Only
-    \TeX perts need this option, so, if you use it, you will
-    probably know what you are doing anyway.
+  \item
+    \declare{|wd=|\marg{width}} sets the width of the box. This command has two effects: First, \TeX's |\hsize| is set to \meta{width}. Second, after the box has been typeset, its width is set to \meta{width} (no matter what it actually turned out to be). Since setting the |\hsize| does not automatically change some of \LaTeX's linewidth dimensions, you should consider using a minipage inside this environment if you fool around with the width.
+
+    If the width is larger than the normal text width, as specified by the value of |\textwidth|, the width of the resulting box is reset to the width |\textwidth|, but intelligent negative skips are inserted at the left and right end of the box. The net effect of this is that you can use a width larger than the text width for a box and can insert the resulting box directly into normal text without getting annoying warnings and having the box positioned sensibly.
+  \item
+    \declare{|dp=|\marg{depth}} sets the depth of the box, overriding the real depth of the box. The box is first typeset normally, then the depth is changed afterwards. This option is useful for creating boxes that have guaranteed size.
+
+    If the option is not given, the box has its ``natural'' depth, which results from the typesetting. For example, a box containing only the letter ``a'' will have a different depth from a box containing only the letter ``g.''
+  \item
+    \declare{|ht=|\meta{height}} sets the height of the box, overriding the real height. Note that the ``height'' does not include the depth (see, for example, the \TeX-book for details). If you want a one-line box that always has the same size, setting the height to 2.25ex and the depth to 1ex is usually a good option.
+  \item
+    \declare{|left|} causes the text inside the box to be typeset left-aligned and with a (radically) ragged right border. This is the default. To get a better ragged right border, use the |rightskip| option.
+  \item
+    \declare{|right|} causes the text to be right-aligned with a (radically) ragged left border.
+  \item
+    \declare{|center|} centers the text inside the box.
+  \item
+    \declare{|leftskip=|\meta{left skip}} installs the \meta{left skip} inside the box as the left skip. \TeX's left skip is a glue that is inserted at the left end of every line. See the \TeX-book for details.
+  \item
+    \declare{|rightskip=|\meta{right skip}} install the \meta{right skip}. To get a good ragged right border, try, say, |\rightskip=0pt plus 4em|.
+  \item
+    \declare{|sep=|\meta{dimension}} sets the size of extra space around the text. This space is added ``inside the box,'' which means that if you specify a |sep| of 1cm and insert the box normally into the vertical list, then the left border of the box will be aligned with the left border of the slide text, while the left border of the text inside the box will be 1cm to the right of this left border. Likewise, the text inside the box will stop 1cm before the right border of the normal text.
+  \item
+    \declare{|colsep=|\meta{dimension}} sets the extra ``color separation space'' around the text. This space behaves the same way as the space added by |sep|, only this space is only inserted if the box has a colored background, that is, if the background of the \meta{beamer color} is not empty. This command can be used together with |sep|, the effects accumulate.
+  \item
+    \declare{|colsep*=|\meta{dimension}} sets an extra color separation space around the text that is \emph{horizontally outside the box}. This means that if the box has a background, this background will protrude by \meta{dimension} to the left and right of the text, but this protruding background will not be taken intro consideration by \TeX\ for typesetting purposes.
+
+    A typical example usage of this option arises when you insert a box with a coloured background in the middle of normal text. In this case, if the background color is set, you would like a background to be drawn behind the text \emph{and} you would like a certain extra space around this text (the background should not stop immediately at the borders of the text, this looks silly) \emph{and} you would like the normal text always to be at the same horizontal position, independently of whether a background is present or not. In this case, using |colsep*=4pt| is a good option.
+  \item
+    \declare{|shadow|}\opt{|=|\meta{true or false}} draws a shadow behind the box. Currently, this option only has an effect if used together with the |rounded| option, but that may change.
+  \item
+    \declare{|rounded|}\opt{|=|\meta{true or false}} causes the borders of the box to be rounded off if there is a background installed. This command internally calls |beamerboxesrounded|.
+  \item
+    \declare{|ignorebg|} causes the background color of the \meta{beamer color} to be ignored, that is, to be treated as if it were set to ``transparent'' or ``empty.''
+  \item
+    \declare{vmode} causes \TeX\ to be in vertical mode when the box starts. Normally, \TeX\ will be in horizontal mode at the start of the box (a |\leavevmode| is inserted automatically at the beginning of the box unless this option is given). Only \TeX perts need this option, so, if you use it, you will probably know what you are doing anyway.
   \end{itemize}
 \end{environment}
 
-
 \begin{environment}{{beamerboxesrounded}\oarg{options}\marg{head}}
-  The text inside the environment is framed by a rectangular area with
-  rounded corners. For the large rectangular area, the \beamer-color
-  specified with the |lower| option  is used. Its background is used
-  for the background, its foreground for the foreground. If the
-  \meta{head} is not empty, \meta{head} is drawn in the 
-  upper part of the box using the \beamer-color specified with the
-  |upper| option for the fore- and background. The following options
-  can be given: 
+  The text inside the environment is framed by a rectangular area with rounded corners. For the large rectangular area, the \beamer-color specified with the |lower| option  is used. Its background is used for the background, its foreground for the foreground. If the \meta{head} is not empty, \meta{head} is drawn in the upper part of the box using the \beamer-color specified with the |upper| option for the fore- and background. The following options can be given:
   \begin{itemize}
-  \item \declare{|lower=|\meta{beamer color}} sets the \beamer-color
-    to be used for the lower (main) part of the box. Its background is
-    used for the background, its foreground for the foreground of the
-    main part of the box. If either is empty, the current background
-    or foreground is used. The box will never be transparent.
-  \item \declare{|upper=|\meta{beamer color}} sets the \beamer-color
-    used for the upper (head) part of the box. It is only used if the
-    \meta{head} is not empty.     
-  \item \declare{|width=|\meta{dimension}} causes the width of the
-    text inside the box to be the specified \meta{dimension}. By
-    default, the |\textwidth| is used. Note that the box will protrude
-    4pt to the left and right.
-  \item \declare{|shadow=|\meta{true or false}}. If set to |true|, a
-    shadow will be drawn.    
+  \item
+    \declare{|lower=|\meta{beamer color}} sets the \beamer-color to be used for the lower (main) part of the box. Its background is used for the background, its foreground for the foreground of the main part of the box. If either is empty, the current background or foreground is used. The box will never be transparent.
+  \item
+    \declare{|upper=|\meta{beamer color}} sets the \beamer-color used for the upper (head) part of the box. It is only used if the \meta{head} is not empty.
+  \item
+    \declare{|width=|\meta{dimension}} causes the width of the text inside the box to be the specified \meta{dimension}. By default, the |\textwidth| is used. Note that the box will protrude 4pt to the left and right.
+  \item
+    \declare{|shadow=|\meta{true or false}}. If set to |true|, a shadow will be drawn.
   \end{itemize}
   If no \meta{head} is given, the head part is completely suppressed.
   \example
@@ -1281,17 +871,9 @@ boxes.
 \end{environment}
 
 
-
-
-
 \subsection{Figures and Tables}
 
-You can use the standard \LaTeX\ environments |figure| and
-|table| much the same way you would normally use them. However,
-any placement specification will be ignored. Figures and tables are
-immediately inserted where the environments start. If there are too
-many of them to fit on the frame, you must manually split them among
-additional frames or use the |allowframebreaks| option.
+You can use the standard \LaTeX\ environments |figure| and |table| much the same way you would normally use them. However, any placement specification will be ignored. Figures and tables are immediately inserted where the environments start. If there are too many of them to fit on the frame, you must manually split them among additional frames or use the |allowframebreaks| option.
 
 \example
 \begin{verbatim}
@@ -1312,18 +894,11 @@ additional frames or use the |allowframebreaks| option.
   This template is used to render the caption.
   \begin{templateoptions}
     \itemoption{default}{}
-    typesets the caption name (a word like ``Figure'' or ``Abbildung''
-    or ``Table,'' depending on whether a table or figure is typeset
-    and depending on the currently installed language) before the
-    caption text. No number is printed, since these make little sense
-    in a normal presentation.
+    typesets the caption name (a word like ``Figure'' or ``Abbildung'' or ``Table,'' depending on whether a table or figure is typeset and depending on the currently installed language) before the caption text. No number is printed, since these make little sense in a normal presentation.
     \itemoption{numbered}{}
-    adds the figure or table number to the caption. Use this option
-    only if your audience has a printed handout or printed lecture
-    notes that follow the same numbering.
+    adds the figure or table number to the caption. Use this option only if your audience has a printed handout or printed lecture notes that follow the same numbering.
     \itemoption{caption name own line}{}
-    As the name suggests, this options puts the caption name (like
-    ``Figure'') on its own line.
+    As the name suggests, this options puts the caption name (like ``Figure'') on its own line.
   \end{templateoptions}
 
   Inside the template, you can use the following inserts:
@@ -1332,9 +907,7 @@ additional frames or use the |allowframebreaks| option.
     Inserts the text of the current caption.
 
     \iteminsert{\insertcaptionname}
-    Inserts the name of the current caption. This word
-    is either ``Table'' or ``Figure'' or, if the |babel| package is
-    used, some translation thereof.
+    Inserts the name of the current caption. This word is either ``Table'' or ``Figure'' or, if the |babel| package is used, some translation thereof.
 
     \iteminsert{\insertcaptionnumber}
     Inserts the number of the current figure or table.
@@ -1342,58 +915,33 @@ additional frames or use the |allowframebreaks| option.
 \end{element}
 
 \begin{element}{caption name}\no\yes\yes
-  These \beamer-color and -font are used to typeset the caption name
-  (a word like ``Figure''). The |caption| template must directly
-  ``use'' them, they are not installed automatically by the
-  |\insertcaptionname| command.
+  These \beamer-color and -font are used to typeset the caption name (a word like ``Figure''). The |caption| template must directly ``use'' them, they are not installed automatically by the |\insertcaptionname| command.
 \end{element}
 
 
-
-
-
 \subsection{Splitting a Frame into Multiple Columns}
 
-The \beamer\ class offers several commands and environments for
-splitting (perhaps only part of) a frame into multiple columns. These
-commands have nothing to do with \LaTeX's commands for creating
-columns. Columns are especially useful for placing a graphic next to a
-description/explanation.
+The \beamer\ class offers several commands and environments for splitting (perhaps only part of) a frame into multiple columns. These commands have nothing to do with \LaTeX's commands for creating columns. Columns are especially useful for placing a graphic next to a description/explanation.
 
-The main environment for creating columns is called |columns|. Inside
-this environment, you can either place several |column| environments,
-each of which creates a new column, or use the |\column| command to
-create new columns.
+The main environment for creating columns is called |columns|. Inside this environment, you can either place several |column| environments, each of which creates a new column, or use the |\column| command to create new columns.
 
 \begin{environment}{{columns}\oarg{options}}
-  A multi-column area. Inside the environment you should place only
-  |column| environments or |\column| commands (see below). The
-  following \meta{options} may be given: 
+  A multi-column area. Inside the environment you should place only |column| environments or |\column| commands (see below). The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|b|} will cause the bottom lines of the columns to be
-    vertically aligned.
+    \declare{|b|} will cause the bottom lines of the columns to be vertically aligned.
   \item
-    \declare{|c|} will cause the columns to be centered vertically
-    relative to each other. Default, unless the global option
-    |t| is used. 
+    \declare{|c|} will cause the columns to be centered vertically relative to each other. Default, unless the global option |t| is used.
   \item
     \declare{|onlytextwidth|} is the same as |totalwidth=\textwidth|.
   \item
-    \declare{|t|} will cause the first lines of the columns to be
-    aligned. Default if global option |t| is used.
+    \declare{|t|} will cause the first lines of the columns to be aligned. Default if global option |t| is used.
   \item
-    \declare{|T|} is similar to the |t| option, but |T| aligns the
-    tops of the first lines while |t| aligns the so-called baselines
-    of the first lines. If strange things seem to happen in
-    conjunction with the |t| option (for example if a graphic suddenly
-    ``drops down'' with the |t| option instead of ``going up,''), try
-    using this option instead.
+    \declare{|T|} is similar to the |t| option, but |T| aligns the tops of the first lines while |t| aligns the so-called baselines of the first lines. If strange things seem to happen in conjunction with the |t| option (for example if a graphic suddenly ``drops down'' with the |t| option instead of ``going up,''), try using this option instead.
   \item
-    \declare{|totalwidth=|\meta{width}} will cause the columns to occupy
-    not the whole page width, but only \meta{width}, all told.
+    \declare{|totalwidth=|\meta{width}} will cause the columns to occupy not the whole page width, but only \meta{width}, all told.
   \end{itemize}
-    
+
   \example
 \begin{verbatim}
 \begin{columns}[t]
@@ -1405,7 +953,7 @@ create new columns.
   \end{column}
 \end{columns}
 \end{verbatim}
-  
+
   \example
 \begin{verbatim}
 \begin{columns}[t]
@@ -1419,23 +967,18 @@ create new columns.
 
   \articlenote
   This environment is ignored in |article| mode.
-  
+
   \lyxnote
-  Use ``Columns'' or ``ColumnsTopAligned'' to create a |columns|
-  environment. To pass options, insert them in \TeX-mode right at the
-  beginning of the environment in square brackets.
+  Use ``Columns'' or ``ColumnsTopAligned'' to create a |columns| environment. To pass options, insert them in \TeX-mode right at the beginning of the environment in square brackets.
 \end{environment}
 
-To create a column, you can either use the |column| environment or the
-|\column| command. 
+To create a column, you can either use the |column| environment or the |\column| command.
 
 \begin{environment}{{column}\oarg{placement}\marg{column width}}
-  Creates a single column of width \meta{column width}. The vertical
-  placement of the enclosing |columns| environment can be overruled by
-  specifying a specific \meta{placement} (|t| and |T| for the two top
-  modes, |c| for centered, and |b| for bottom). 
+  Creates a single column of width \meta{column width}. The vertical placement of the enclosing |columns| environment can be overruled by specifying a specific \meta{placement} (|t| and |T| for the two top modes, |c| for centered, and |b| for bottom).
 
-  \example The following code has the same effect as the above examples:
+  \example
+  The following code has the same effect as the above examples:
 \begin{verbatim}
 \begin{columns}
   \begin{column}[t]{5cm}
@@ -1446,6 +989,7 @@ To create a column, you can either use the |column| environment or the
   \end{column}
 \end{columns}
 \end{verbatim}
+
   \articlenote
   This command is ignored in |article| mode.
 
@@ -1454,12 +998,9 @@ To create a column, you can either use the |column| environment or the
 \end{environment}
 
 \begin{command}{{\column}\oarg{placement}\marg{column width}}
-  Starts a single column. The parameters and options are the same as
-  for the |column| environment. The column automatically ends with the
-  next occurrence of |\column| or of a |column| environment or of the
-  end of the current |columns| environment.
+  Starts a single column. The parameters and options are the same as for the |column| environment. The column automatically ends with the next occurrence of |\column| or of a |column| environment or of the end of the current |columns| environment.
 
-  \example 
+  \example
 \begin{verbatim}
 \begin{columns}
   \column[t]{5cm}
@@ -1468,66 +1009,37 @@ To create a column, you can either use the |column| environment or the
     One line (but aligned).
 \end{columns}
 \end{verbatim}
+
   \articlenote
   This command is ignored in |article| mode.
 
   \lyxnote
-  In a ``Column'' style, the width of the column must be given as
-  normal text, not in \TeX-mode.
+  In a ``Column'' style, the width of the column must be given as normal text, not in \TeX-mode.
 \end{command}
 
 
-
 \subsection{Positioning Text and Graphics Absolutely}
 
-Normally, \beamer\ uses \TeX's normal typesetting mechanism to
-position text and graphics on the page. In certain situation you may
-instead wish a certain text or graphic to appear at a
-page position that is specified \emph{absolutely}. This means that the
-position is specified relative to the upper left corner of the slide.
-
-The package |textpos| provides several commands for positioning text
-absolutely and it works together with \beamer. When using this
-package, you will typically have to specify the options |overlay| and
-perhaps |absolute|. For details on how to use the package, please see
-its documentation.
+Normally, \beamer\ uses \TeX's normal typesetting mechanism to position text and graphics on the page. In certain situation you may instead wish a certain text or graphic to appear at a page position that is specified \emph{absolutely}. This means that the position is specified relative to the upper left corner of the slide.
 
+The package |textpos| provides several commands for positioning text absolutely and it works together with \beamer. When using this package, you will typically have to specify the options |overlay| and perhaps |absolute|. For details on how to use the package, please see its documentation.
 
 
 \subsection{Verbatim and Fragile Text}
 
-If you wish to use a |{verbatim}| environment in a frame, you have to
-add the option |[fragile]| to the |{frame}| environment. In this case,
-you really have to use the |{frame}| environment (not the |\frame|
-command) and the |\end{frame}| must be alone on a single line. Using
-this option will cause the frame contents to be written to an external
-file and the read back. See the description of the |{frame}|
-environment for more details.
-
-You must also use the |[fragile]| option for frames that include any
-``fragile'' text, which is any text that is not ``interpreted the way
-text is usually interpreted by \TeX.'' For example, if you use a
-package that (locally) redefined the meaning of, say, the character
-|&|, you must use this option.
-
-Inside |{verbatim}| environments you obviously cannot use commands
-like |\alert<2>| to highlight part of code since the text is written
-in, well, verbatim. There are several good packages like |alltt| or
-|listings| that allow you to circumvent this problem. For simple
-cases, the following environment can be used, which is defined by
-\beamer:
+If you wish to use a |{verbatim}| environment in a frame, you have to add the option |[fragile]| to the |{frame}| environment. In this case, you really have to use the |{frame}| environment (not the |\frame| command) and the |\end{frame}| must be alone on a single line. Using this option will cause the frame contents to be written to an external file and the read back. See the description of the |{frame}| environment for more details.
+
+You must also use the |[fragile]| option for frames that include any ``fragile'' text, which is any text that is not ``interpreted the way text is usually interpreted by \TeX.'' For example, if you use a package that (locally) redefined the meaning of, say, the character |&|, you must use this option.
+
+Inside |{verbatim}| environments you obviously cannot use commands like |\alert<2>| to highlight part of code since the text is written in, well, verbatim. There are several good packages like |alltt| or |listings| that allow you to circumvent this problem. For simple cases, the following environment can be used, which is defined by \beamer:
 
 \begin{environment}{{semiverbatim}}
-  The text inside this environment is typeset like verbatim
-  text. However, the characters |\|, |{|, and |}| retain their
-  meaning. Thus, you can say things like
+  The text inside this environment is typeset like verbatim text. However, the characters |\|, |{|, and |}| retain their meaning. Thus, you can say things like
 \begin{verbatim}
 \alert<1->{std::cout << "AT&T likes 100% performance";}
 \end{verbatim}
-  To typeset the three characters |\|, |{|, and |}| you can use the
-  commands |\\| (which is redefined inside this environment---you do
-  not need it anyway), |\{|, and |\}|. Thus in order to get typeset
-  ``|\alert<1>{X}|'' you can write |\\alert<1>\{X\}|.
+
+  To typeset the three characters |\|, |{|, and |}| you can use the commands |\\| (which is redefined inside this environment---you do not need it anyway), |\{|, and |\}|. Thus in order to get typeset ``|\alert<1>{X}|'' you can write |\\alert<1>\{X\}|.
 \end{environment}
 
 
@@ -1535,63 +1047,39 @@ cases, the following environment can be used, which is defined by
 
 The |abstract| environment is overlay-specificiation-aware in \beamer:
 
-
 \begin{environment}{{abstract}\sarg{action specification}}
   You can use this environment to typeset an abstract.
 
   \begin{element}{abstract}\no\yes\yes
-    These \beamer-color and -font are used to typeset the abstract. If
-    a background color is set, this background color is used as
-    background for the whole abstract by default.
+    These \beamer-color and -font are used to typeset the abstract. If a background color is set, this background color is used as background for the whole abstract by default.
   \end{element}
 
   \begin{element}{abstract title}\yes\yes\yes
     \colorparents{titlelike}
-    This template is used for the title. By default, this inserts
-    the word |\abstractname|, centered. The background color is ignored.
+    This template is used for the title. By default, this inserts the word |\abstractname|, centered. The background color is ignored.
   \end{element}
 
   \begin{element}{abstract begin}\yes\no\no
-    This template is inserted at the very beginning of the abstract,
-    before the abstract title and the \meta{environment
-    contents} is inserted.
+    This template is inserted at the very beginning of the abstract, before the abstract title and the \meta{environment contents} is inserted.
   \end{element}
 
   \begin{element}{abstract end}\yes\no\no
-    This template is inserted at the end of the abstract, after the
-    \meta{environment contents}.
+    This template is inserted at the end of the abstract, after the \meta{environment contents}.
   \end{element}
 \end{environment}
 
 
-
-
 \subsection{Verse, Quotations, Quotes}
 
-\LaTeX\ defines three environments for typesetting quotations and
-verses: |verse|, |quotation|, and |quote|. These environments are also
-available in the \beamer\ class, where they are
-overlay-specification-aware. If an overlay specification is given, the
-verse or quotation is shown only on the specified slides and is
-covered otherwise. The difference between a |quotation| and a |quote|
-is that the first has paragraph indentation, whereas the second does
-not. 
-
-You can change the font and color used for these by changing the
-\beamer-colors and -fonts listed below. Unlike the standard \LaTeX\
-environments, the default font theme typesets a verse in an italic
-serif font, quotations and quotes are typeset using an italic font
-(whether serif or sans-serif depends on the standard document font).
+\LaTeX\ defines three environments for typesetting quotations and verses: |verse|, |quotation|, and |quote|. These environments are also available in the \beamer\ class, where they are overlay-specification-aware. If an overlay specification is given, the verse or quotation is shown only on the specified slides and is covered otherwise. The difference between a |quotation| and a |quote| is that the first has paragraph indentation, whereas the second does not.
 
+You can change the font and color used for these by changing the \beamer-colors and -fonts listed below. Unlike the standard \LaTeX\ environments, the default font theme typesets a verse in an italic serif font, quotations and quotes are typeset using an italic font (whether serif or sans-serif depends on the standard document font).
 
 \begin{environment}{{verse}\sarg{action specification}}
   You can use this environment to typeset a verse.
 
   \begin{element}{verse}\no\yes\yes
-    These \beamer-color and -font are used to typeset the verse. If
-    a background color is set, this background color is used as
-    background for the whole abstract. The default font is italic
-    serif. 
+    These \beamer-color and -font are used to typeset the verse. If a background color is set, this background color is used as background for the whole abstract. The default font is italic serif.
   \end{element}
 
   \begin{element}{verse begin}\yes\no\no
@@ -1603,10 +1091,8 @@ serif font, quotations and quotes are typeset using an italic font
   \end{element}
 \end{environment}
 
-
 \begin{environment}{{quotation}\sarg{action specification}}
-  Use this environment to typeset multi-paragraph quotations. Think
-  again, before presenting multi-paragraph quotations.
+  Use this environment to typeset multi-paragraph quotations. Think again, before presenting multi-paragraph quotations.
 
   \begin{element}{quotation}\no\yes\yes
     These \beamer-color and -font are used to typeset the quotation.
@@ -1621,7 +1107,6 @@ serif font, quotations and quotes are typeset using an italic font
   \end{element}
 \end{environment}
 
-
 \begin{environment}{{quote}\sarg{action specification}}
   Use this environment to typeset a single-paragraph quotation.
 
@@ -1641,56 +1126,37 @@ serif font, quotations and quotes are typeset using an italic font
 
 \subsection{Footnotes}
 
-First a word of warning: Using footnotes is usually not a good
-idea. They disrupt the flow of reading.
+First a word of warning: Using footnotes is usually not a good idea. They disrupt the flow of reading.
 
-You can use the usual |\footnote| command. It has been augmented to
-take an additional option, for placing footnotes at the frame
-bottom instead of at the bottom of the current minipage.
+You can use the usual |\footnote| command. It has been augmented to take an additional option, for placing footnotes at the frame bottom instead of at the bottom of the current minipage.
 
-\begin{command}{\footnote\sarg{overlay
-      specification}\oarg{options}\marg{text}} 
-  Inserts a footnote into the current frame. Footnotes will always be
-  shown at the bottom of the current frame; they will never be
-  ``moved'' to other frames. As usual, one can give a number as
-  \meta{options}, which will cause the footnote to use that
-  number. The \beamer\ class adds one additional option:
+\begin{command}{\footnote\sarg{overlay specification}\oarg{options}\marg{text}}
+  Inserts a footnote into the current frame. Footnotes will always be shown at the bottom of the current frame; they will never be ``moved'' to other frames. As usual, one can give a number as \meta{options}, which will cause the footnote to use that number. The \beamer\ class adds one additional option:
   \begin{itemize}
-  \item \declare{|frame|} causes the footnote to be shown at the
-    bottom of the frame. This is normally the default behavior anyway,
-    but in minipages and certain blocks it makes a difference. In a
-    minipage, the footnote is usually shown as part of the minipage
-    rather than as part of the frame.
+  \item
+    \declare{|frame|} causes the footnote to be shown at the bottom of the frame. This is normally the default behavior anyway, but in minipages and certain blocks it makes a difference. In a minipage, the footnote is usually shown as part of the minipage rather than as part of the frame.
   \end{itemize}
 
-  If an \meta{overlay specification} is given, this causes the
-  footnote \meta{text} to be shown only on the specified slides. The
-  footnote symbol in the text is shown on all slides.
+  If an \meta{overlay specification} is given, this causes the footnote \meta{text} to be shown only on the specified slides. The footnote symbol in the text is shown on all slides.
 
-  \example |\footnote{On a fast machine.}|
-  \example |\footnote[frame,2]{Not proved.}|
-  \example |\footnote<.->{Der Spiegel, 4/04, S.\ 90.}|
+  \example
+  |\footnote{On a fast machine.}|
+  \example
+  |\footnote[frame,2]{Not proved.}|
+  \example
+  |\footnote<.->{Der Spiegel, 4/04, S.\ 90.}|
 
   \begin{element}{footnote}\yes\yes\yes
-    This template will be used to render the footnote. Inside this
-    template, the following two inserts can be used:
+    This template will be used to render the footnote. Inside this template, the following two inserts can be used:
     \begin{itemize}
-    \iteminsert{\insertfootnotetext}
+      \iteminsert{\insertfootnotetext}
       Inserts the current footnote text.
-    \iteminsert{\insertfootnotemark}
-      Inserts the current footnote mark (like a raised number). This mark
-      is computed automatically.
+      \iteminsert{\insertfootnotemark}
+      Inserts the current footnote mark (like a raised number). This mark is computed automatically.
     \end{itemize}
   \end{element}
 
   \begin{element}{footnote mark}\no\yes\yes
-    This \beamer-color/-font is used when rendering the footnote mark,
-    both in the text and at the beginning of the footnote itself.
+    This \beamer-color/-font is used when rendering the footnote mark, both in the text and at the beginning of the footnote itself.
   \end{element}
 \end{command}
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-macros.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-macros.tex
index a940df5517b..45e4a273189 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-macros.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-macros.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-macros.tex,v 1.16 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \def\beamer{\textsc{beamer}}
 \def\pdf{\textsc{pdf}}
@@ -222,8 +223,3 @@
   \def\endtheindex{\onecolumn}
 \def\noindexing{\let\index=\@gobble}
 \makeatother
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
index fb5db3733da..4e98d4ce513 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-nonpresentation.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,100 +8,51 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-nonpresentation.tex,v 1.7 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Creating Handouts and Lecture Notes}
-
 \label{section-modes}
 
-During a presentation it is very much desirable that the audience has 
-a \emph{handout} or even \emph{lecture notes} available to it. A
-handout allows everyone in the audience to individually go back to
-things he or she has not understood.
-
-Always provide handouts \emph{as early as possible}, preferably weeks
-before the talk. Do \emph{not} retain the handout till the end of the
-talk. 
-
-The \beamer\ package offers two different ways of creating special
-versions of your talk; they are discussed in the following. The first,
-easy, way is to create a handout version by adding the |handout|
-option, which will cause the document to be typeset in |handout|
-mode. It will ``look like'' a presentation, but it can be printed more
-easily (the overlays are ``flattened''). The second, more complicated
-and more powerful way is to create an independent ``article''
-version of your presentation. This version coexists in your main
-file.
+During a presentation it is very much desirable that the audience has a \emph{handout} or even \emph{lecture notes} available to it. A handout allows everyone in the audience to individually go back to things he or she has not understood.
 
+Always provide handouts \emph{as early as possible}, preferably weeks before the talk. Do \emph{not} retain the handout till the end of the talk.
 
+The \beamer\ package offers two different ways of creating special versions of your talk; they are discussed in the following. The first, easy, way is to create a handout version by adding the |handout| option, which will cause the document to be typeset in |handout| mode. It will ``look like'' a presentation, but it can be printed more easily (the overlays are ``flattened''). The second, more complicated and more powerful way is to create an independent ``article'' version of your presentation. This version coexists in your main file.
 
 
 \subsection{Creating Handouts Using the Handout Mode}
-
 \label{handout}
 
-The easiest way of creating a handout for your audience (though not
-the most desirable one) is to use the |handout| option. This option
-works exactly like the |trans| option. An elaborated
-example of different overlay specifications for the presentation, the
-handout, and the transparencies can be found in the file
-|beamerexample1.tex|.
+The easiest way of creating a handout for your audience (though not the most desirable one) is to use the |handout| option. This option works exactly like the |trans| option. An elaborated example of different overlay specifications for the presentation, the handout, and the transparencies can be found in the file |beamerexample1.tex|.
 
 \begin{classoption}{handout}
-  Create a version that uses the |handout| overlay
-  specifications.
+  Create a version that uses the |handout| overlay specifications.
 
-  You might wish to choose a different color and/or presentation theme
-  for the handout.
+  You might wish to choose a different color and/or presentation theme for the handout.
 \end{classoption}
 
-When printing a handout created this way, you will typically wish to
-print at least two and possibly four slides on each page. The easiest
-way of doing so is presumably to use |pgfpages| as follows:
+When printing a handout created this way, you will typically wish to print at least two and possibly four slides on each page. The easiest way of doing so is presumably to use |pgfpages| as follows:
 
 \begin{verbatim}
 \usepackage{pgfpages}
 \pgfpagesuselayout{2 on 1}[a4paper,border shrink=5mm]
 \end{verbatim}
-Instead of |2 on 1| you can use |4 on 1| (but then you have to add
-|landscape| to the list of options) and you can use, say,
-|letterpaper| instead of |a4paper|.
 
+Instead of |2 on 1| you can use |4 on 1| (but then you have to add |landscape| to the list of options) and you can use, say, |letterpaper| instead of |a4paper|.
 
-\subsection{Creating Handouts Using the Article Mode}
 
+\subsection{Creating Handouts Using the Article Mode}
 \label{section-article}
 
-In the following, the ``article version'' of your presentation refers
-to a normal \TeX\ text typeset using, for example, the document class
-|article| or perhaps |llncs| or a similar document
-class. This version of the presentation will typically follow
-different typesetting rules and may even have a different
-structure. Nevertheless, you may wish to have this version coexist
-with your presentation in one file and you may wish to share some part
-of it (like a figure or a formula) with your presentation.
-
-In general, the article version of a talk is better suited as a
-handout thann a handout created using the simple |handout| mode since
-it is more economic and can include more in-depth information.
+In the following, the ``article version'' of your presentation refers to a normal \TeX\ text typeset using, for example, the document class |article| or perhaps |llncs| or a similar document class. This version of the presentation will typically follow different typesetting rules and may even have a different structure. Nevertheless, you may wish to have this version coexist with your presentation in one file and you may wish to share some part of it (like a figure or a formula) with your presentation.
 
+In general, the article version of a talk is better suited as a handout thann a handout created using the simple |handout| mode since it is more economic and can include more in-depth information.
 
 \subsubsection{Starting the Article Mode}
 
-The article mode of a presentation is created by specifying |article|
-or |book| or some other class as the document class instead of
-|beamer| and by then loading the package |beamerarticle|.
+The article mode of a presentation is created by specifying |article| or |book| or some other class as the document class instead of |beamer| and by then loading the package |beamerarticle|.
 
-The package |beamerarticle| defines virtually all of \beamer's
-commands in a way that is sensible for the |article| mode. Also,
-overlay specifications can be given to commands like |\textbf| or
-|\item| once |beamerarticle| has been 
-loaded. Note that, except for |\item|, these overlay specifications
-also work: by writing |\section<presentation>{Name}| you will suppress
-this section command in the article version. For the exact effects
-overlay specifications have in |article| mode, please see the
-descriptions of the commands to which you wish to apply them.
+The package |beamerarticle| defines virtually all of \beamer's commands in a way that is sensible for the |article| mode. Also, overlay specifications can be given to commands like |\textbf| or |\item| once |beamerarticle| has been loaded. Note that, except for |\item|, these overlay specifications also work: by writing |\section<presentation>{Name}| you will suppress this section command in the article version. For the exact effects overlay specifications have in |article| mode, please see the descriptions of the commands to which you wish to apply them.
 
 \begin{package}{{beamerarticle}\opt{|[|\meta{options}|]|}}
   Makes most \beamer\ commands available for another document class.
@@ -108,29 +60,15 @@ descriptions of the commands to which you wish to apply them.
   The following \meta{options} may be given:
   \begin{itemize}
   \item
-    \declare{|activeospeccharacters|} will leave the character code of
-    the pointed brackets as specified by
-    other packages. Normally, \beamer\ will turn off the special
-    behaviour of the two characters |<| and |>|. Using this option,
-    you can reinstall the original behaviour at the price of possible
-    problems when using overlay specifications in the |article| mode.
+    \declare{|activeospeccharacters|} will leave the character code of the pointed brackets as specified by other packages. Normally, \beamer\ will turn off the special behaviour of the two characters |<| and |>|. Using this option, you can reinstall the original behaviour at the price of possible problems when using overlay specifications in the |article| mode.
   \item
-    \declare{|noamsthm|} will suppress the loading of the |amsthm|
-    package. No theorems will be defined.
+    \declare{|noamsthm|} will suppress the loading of the |amsthm| package. No theorems will be defined.
   \item
-    \declare{|notheorem|} will suppress the definition of standard
-    environments like |theorem|, but |amsthm| is still loaded and the
-    |\newtheorem| command still makes the defined environments
-    overlay-specification-aware. Using this option allows you to
-    define the standard environments in whatever way you like while
-    retaining the power of the extensions to |amsthm|.    
+    \declare{|notheorem|} will suppress the definition of standard environments like |theorem|, but |amsthm| is still loaded and the |\newtheorem| command still makes the defined environments overlay-specification-aware. Using this option allows you to define the standard environments in whatever way you like while retaining the power of the extensions to |amsthm|.
   \item
-    \declare{|envcountsect|} causes theorem, definitions and the like
-    to be numbered with each section. Thus instead of Theorem~1 you
-    get Theorem~1.1. I recommend using this option.
+    \declare{|envcountsect|} causes theorem, definitions and the like to be numbered with each section. Thus instead of Theorem~1 you get Theorem~1.1. We recommend using this option.
   \item
-    \declare{|noxcolor|} will suppress the loading of the |xcolor|
-    package. No colors will be defined.
+    \declare{|noxcolor|} will suppress the loading of the |xcolor| package. No colors will be defined.
   \end{itemize}
 
   \example
@@ -141,23 +79,15 @@ descriptions of the commands to which you wish to apply them.
 \begin{frame}
   \frametitle{A frame title}
   \begin{itemize}
-  \item<1-> You can use overlay specifications.
-  \item<2-> This is useful.
+\item<1-> You can use overlay specifications.
+\item<2-> This is useful.
   \end{itemize}
 \end{frame}
 \end{document}
 \end{verbatim}
 \end{package}
 
-There is one remaining problem: While the |article| version can easily
-\TeX\ the whole file, even in the presence of commands like
-|\frame<2>|, we do not want the special article text to be inserted
-into our original \beamer\ presentation. That means, we would like all
-text \emph{between} frames to be suppressed. More precisely, we want
-all text except for commands like |\section| and so on to be
-suppressed. This behaviour can be enforced by specifying the option
-|ignorenonframetext| in the presentation version. The option will
-insert a |\mode*| at the beginning of your presentation. 
+There is one remaining problem: While the |article| version can easily \TeX\ the whole file, even in the presence of commands like |\frame<2>|, we do not want the special article text to be inserted into our original \beamer\ presentation. That means, we would like all text \emph{between} frames to be suppressed. More precisely, we want all text except for commands like |\section| and so on to be suppressed. This behaviour can be enforced by specifying the option |ignorenonframetext| in the presentation version. The option will insert a |\mode*| at the beginning of your presentation.
 
 The following example shows a simple usage of the |article| mode:
 
@@ -206,107 +136,70 @@ With some more text.
 \begin{frame}
   This text is part both of the article and of the presentation.
   \begin{itemize}
-  \item This stuff is also shown in both version.
-  \item This too.
+\item This stuff is also shown in both version.
+\item This too.
   \only<article>{\item This particular item is only part
       of the article version.}
-  \item<presentation:only@0> This text is also only part of the article.
+\item<presentation:only@0> This text is also only part of the article.
   \end{itemize}
 \end{frame}
 \end{document}
 \end{verbatim}
 
-There is one command whose behaviour is a bit special in |article|
-mode: The line break command |\\|. Inside frames, this command has no
-effect in |article| mode, except if an overlay specification is
-present. Then it has the normal effect dictated by the
-specification. The reason for this behaviour is that you will
-typically inserts lots of |\\| commands in a presentation in order to
-get control over all line breaks. These line breaks are mostly
-superfluous in |article| mode. If you really want a line break to
-apply in all versions, say |\\<all>|. Note that the command |\\| is
-often redefined by certain environments, so it may not always be
-overlay-specification-aware. In such a case you have to write
-something like |\only<presentation>{\\}|.
-
-
-
+There is one command whose behaviour is a bit special in |article| mode: The line break command |\\|. Inside frames, this command has no effect in |article| mode, except if an overlay specification is present. Then it has the normal effect dictated by the specification. The reason for this behaviour is that you will typically inserts lots of |\\| commands in a presentation in order to get control over all line breaks. These line breaks are mostly superfluous in |article| mode. If you really want a line break to apply in all versions, say |\\<all>|. Note that the command |\\| is often redefined by certain environments, so it may not always be overlay-specification-aware. In such a case you have to write something like |\only<presentation>{\\}|.
 
 \subsubsection{Workflow}
 \label{section-article-version-workflow}
-The following workflow steps are optional, but they can simplify the
-creation of the article version.
+
+The following workflow steps are optional, but they can simplify the creation of the article version.
 
 \begin{itemize}
-\item 
-  In the main file |main.tex|, delete the first line, which sets the
-  document class.
 \item
-  Create a file named, say, |main.beamer.tex| with the
-  following content:
+  In the main file |main.tex|, delete the first line, which sets the document class.
+\item
+  Create a file named, say, |main.beamer.tex| with the following content:
+
 \begin{verbatim}
 \documentclass[ignorenonframetext]{beamer}
 \input{main.tex}
-\end{verbatim} 
+\end{verbatim}
+
 \item
-  Create an extra file named, say, |main.article.tex| with the
-  following content:
+  Create an extra file named, say, |main.article.tex| with the following content:
+
 \begin{verbatim}
 \documentclass{article}
 \usepackage{beamerarticle}
 \setjobnamebeamerversion{main.beamer}
 \input{main.tex}
 \end{verbatim}
+
 \item
-  You can now run |pdflatex| or |latex| on the two files
-  |main.beamer.tex| and |main.article.tex|. 
+  You can now run |pdflatex| or |latex| on the two files |main.beamer.tex| and |main.article.tex|.
 \end{itemize}
 
-The command |\setjobnamebeamerversion| tells the article version where
-to find the presentation version. This is necessary if you wish to include
-slides from the presentation version in an article as figures.
+The command |\setjobnamebeamerversion| tells the article version where to find the presentation version. This is necessary if you wish to include slides from the presentation version in an article as figures.
 
 \begin{command}{\setjobnamebeamerversion\marg{filename without extension}}
-  Tells the \beamer\ class where to find the presentation version of the
-  current file.  
+  Tells the \beamer\ class where to find the presentation version of the current file.
 \end{command}
 
-An example of this workflow approach can be found in the |examples|
-subdirectory for files starting with |beamerexample2|.
+An example of this workflow approach can be found in the |examples| subdirectory for files starting with |beamerexample2|.
 
+\subsubsection{Including Slides from the Presentation Version in the Article Version}
 
+If you use the package |beamerarticle|, the |\frame| command becomes available in |article| mode. By adjusting the frame template, you can ``mimic'' the appearance of frames typeset by \beamer\ in your articles. However, sometimes you may wish to insert ``the real thing'' into the |article| version, that is, a precise ``screenshot'' of a slide from the presentation. The commands introduced in the following help you do exactly this.
 
-\subsubsection{Including Slides from the Presentation Version in the
-  Article Version}
+In order to include a slide from your presentation in your article version, you must do two things: First, you must place a normal \LaTeX\ label on the slide using the |\label| command. Since this command is overlay-specification-aware, you can also select specific slides of a frame. Also, by adding the option |label=|\meta{name} to a frame, a label \meta{name}|<|\meta{slide number}|>| is automatically added to each slide of the frame.
 
-If you use the package |beamerarticle|, the |\frame| command
-becomes available in |article| mode. By adjusting the frame template,
-you can ``mimic'' the appearance of frames typeset by \beamer\ in
-your articles. However, sometimes you may wish to insert ``the real
-thing'' into the |article| version, that is, a precise ``screenshot''
-of a slide from the presentation. The commands introduced in the
-following help you do exactly this.
-
-In order to include a slide from your presentation in your article
-version, you must do two things: First, you must place a normal
-\LaTeX\ label on the slide using the |\label| command. Since this
-command is overlay-specification-aware, you can also select specific
-slides of a frame. Also, by adding the option |label=|\meta{name} to
-a frame, a label \meta{name}|<|\meta{slide number}|>| is automatically
-added to each slide of the frame.
-
-Once you have labeled a slide, you can use the following command in
-your article version to insert the slide into it:
+Once you have labeled a slide, you can use the following command in your article version to insert the slide into it:
 
 \begin{command}{\includeslide\oarg{options}\marg{label name}}
-  This command calls |\pgfimage| with the given \meta{options} for
-  the file specified by
+  This command calls |\pgfimage| with the given \meta{options} for the file specified by
   \begin{quote}
     |\setjobnamebeamerversion|\meta{filename}
   \end{quote}
-  Furthermore, the option |page=|\meta{page of label name} is passed
-  to |\pgfimage|, where the \meta{page of label name} is read
-  internally from the file \meta{filename}|.snm|.
+  Furthermore, the option |page=|\meta{page of label name} is passed to |\pgfimage|, where the \meta{page of label name} is read internally from the file \meta{filename}|.snm|.
   \example
 
 \begin{verbatim}
@@ -323,95 +216,58 @@ your article version to insert the slide into it:
     \end{center}
     \caption{The second slide (original size). Now the second item is also shown.}
   \end{figure}
-\end{verbatim}  
+\end{verbatim}
 \end{command}
 
-The exact effect of passing the option |page=|\meta{page of label
-  name} to the command |\pgfimage| is explained in the documentation
-of |pgf|. In essence, the following happens:
+The exact effect of passing the option |page=|\meta{page of label name} to the command |\pgfimage| is explained in the documentation of |pgf|. In essence, the following happens:
 \begin{itemize}
 \item
-  For old version of |pdflatex| and for any version of |latex|
-  together with |dvips|, the |pgf| package will look for a file named
+  For old versions of |pdflatex| and for any version of |latex| together with |dvips|, the |pgf| package will look for a file named
   \begin{quote}
     \meta{filename}|.page|\meta{page of label name}|.|\meta{extension}
   \end{quote}
-  For each page of your |.pdf| or |.ps| file that is to be included in
-  this way, you must create such a file by hand. For example, if the
-  PostScript file of your presentation version is named
-  |main.beamer.ps| and you wish to include the slides with page
-  numbers 2 and~3, you must create (single page) files
-  |main.beamer.page2.ps| and |main.beamer.page3.ps| ``by hand'' (or
-  using some script). If these files cannot be found, |pgf| will
-  complain.
+  For each page of your |.pdf| or |.ps| file that is to be included in this way, you must create such a file by hand. For example, if the PostScript file of your presentation version is named |main.beamer.ps| and you wish to include the slides with page numbers 2 and~3, you must create (single page) files |main.beamer.page2.ps| and |main.beamer.page3.ps| ``by hand'' (or using some script). If these files cannot be found, |pgf| will complain.
 \item
-  For new versions of |pdflatex|, |pdflatex| also looks for the files
-  according to the above naming scheme. However, if it fails to find
-  them (because you have not produced them), it uses a special
-  mechanism to directly extract the desired page from the presentation
-  file |main.beamer.pdf|.
+  For new versions of |pdflatex|, |pdflatex| also looks for the files according to the above naming scheme. However, if it fails to find them (because you have not produced them), it uses a special mechanism to directly extract the desired page from the presentation file |main.beamer.pdf|.
 \end{itemize}
 
 
-
-
 \subsection{Details on Modes}
-
 \label{section-mode-details}
 
-This subsection describes how modes work exactly and how you can use
-the |\mode| command to control what part of your text belongs to which
-mode. 
+This subsection describes how modes work exactly and how you can use the |\mode| command to control what part of your text belongs to which mode.
 
-When \beamer\ typesets your text, it is always in one of the following
-five modes:
+When \beamer\ typesets your text, it is always in one of the following five modes:
 \begin{itemize}
 \item
   \declare{|beamer|} is the default mode.
 \item
-  \declare{|second|} is the mode used when a slide for an optional
-  second screen is being typeset.
+  \declare{|second|} is the mode used when a slide for an optional second screen is being typeset.
 \item
   \declare{|handout|} is the mode for creating handouts.
 \item
   \declare{|trans|} is the mode for creating transparencies.
 \item
-  \declare{|article|} is the mode when control has been transferred to
-  another class, like |article.cls|. Note that the mode is also
-  |article| if control is transferred to, say, |book.cls|.
+  \declare{|article|} is the mode when control has been transferred to another class, like |article.cls|. Note that the mode is also |article| if control is transferred to, say, |book.cls|.
 \end{itemize}
 
-In addition to these modes, \beamer\ recognizes the following
-names for modes sets:
+In addition to these modes, \beamer\ recognizes the following names for modes sets:
 
 \begin{itemize}
 \item
   \declare{|all|} refers to all modes.
 \item
-  \declare{|presentation|} refers to the first four modes, that is,
-  to all modes except for the |article| mode.
+  \declare{|presentation|} refers to the first four modes, that is, to all modes except for the |article| mode.
 \end{itemize}
 
-Depending on the current mode, you may wish to have certain text
-inserted only in that mode. For example, you might wish a certain
-frame or a certain table to be left out of your article version. In
-some situations, you can use the |\only| command for this
-purpose. However, the command |\mode|, which is described in the
-following, is much more powerful than |\only|.
+Depending on the current mode, you may wish to have certain text inserted only in that mode. For example, you might wish a certain frame or a certain table to be left out of your article version. In some situations, you can use the |\only| command for this purpose. However, the command |\mode|, which is described in the following, is much more powerful than |\only|.
 
-The command actually comes in three ``flavors,'' which only slightly
-differ in syntax. The first, and simplest, is the version that takes
-one argument. It behaves essentially the same way as |\only|.
+The command actually comes in three ``flavors,'' which only slightly differ in syntax. The first, and simplest, is the version that takes one argument. It behaves essentially the same way as |\only|.
 
 \begin{command}{\mode\sarg{mode specification}\marg{text}}
-  Causes the \meta{text} to be inserted only for the specified
-  modes. Recall that a \meta{mode specification} is just an overlay
-  specification in which no slides are mentioned.
+  Causes the \meta{text} to be inserted only for the specified modes. Recall that a \meta{mode specification} is just an overlay specification in which no slides are mentioned.
 
-  The \meta{text} should not do anything fancy that involves mode
-  switches or including other files. In particular, you should not put
-  an |\include| command inside \meta{text}. Use the argument-free form
-  below, instead.
+  The \meta{text} should not do anything fancy that involves mode switches or including other files. In particular, you should not put an |\include| command inside \meta{text}. Use the argument-free form below, instead.
 
   \example
 \begin{verbatim}
@@ -423,56 +279,29 @@ one argument. It behaves essentially the same way as |\only|.
 \end{verbatim}
 \end{command}
 
-The second flavor of the |\mode| command takes no argument. ``No
-argument'' means that it is not followed by an opening brace, but any
-other symbol. 
+The second flavor of the |\mode| command takes no argument. ``No argument'' means that it is not followed by an opening brace, but any other symbol.
 
 \begin{command}{\mode\sarg{mode specification}}
-  In the specified mode, this command actually has no effect. The
-  interesting part is the effect in the non-specified modes: In these
-  modes, the command causes \TeX\ to enter a kind of ``gobbling''
-  state. It will now ignore all following lines until the next
-  line that has a sole occurrence of one of the following commands:
-  |\mode|, |\mode*|, |\begin{document}|, |\end{document}|. Even a comment on
-  this line will make \TeX\ skip it. Note that the line with the
-  special commands that make \TeX\ stop gobbling may not directly
-  follow the line where the gobbling is started. Rather, there must
-  either be one non-empty line before the special command or at least
-  two empty lines.
-
-  When \TeX\ encounters a single |\mode| command, it will execute this
-  command. If the command is |\mode| command of the first flavor,
-  \TeX\ will resume its ``gobbling'' state after having inserted (or
-  not inserted) the argument of the |\mode| command. If the |\mode|
-  command is of the second flavor, it takes over.
-
-  Using this second flavor of |\mode| is less convenient than the
-  first, but there are different reasons why you might need to use it:
+  In the specified mode, this command actually has no effect. The interesting part is the effect in the non-specified modes: In these modes, the command causes \TeX\ to enter a kind of ``gobbling'' state. It will now ignore all following lines until the next line that has a sole occurrence of one of the following commands: |\mode|, |\mode*|, |\begin{document}|, |\end{document}|. Even a comment on this line will make \TeX\ skip it. Note that the line with the special commands that make \TeX\ stop gobbling may not directly follow the line where the gobbling is started. Rather, there must either be one non-empty line before the special command or at least two empty lines.
+
+  When \TeX\ encounters a single |\mode| command, it will execute this command. If the command is |\mode| command of the first flavor, \TeX\ will resume its ``gobbling'' state after having inserted (or not inserted) the argument of the |\mode| command. If the |\mode| command is of the second flavor, it takes over.
+
+  Using this second flavor of |\mode| is less convenient than the first, but there are different reasons why you might need to use it:
   \begin{itemize}
   \item
-    The line-wise gobbling is much faster than the gobble of the third
-    flavor, explained below.
+    The line-wise gobbling is much faster than the gobble of the third flavor, explained below.
   \item
-    The first flavor reads its argument completely. This means, it
-    cannot contain any verbatim text that contains unbalanced braces.
+    The first flavor reads its argument completely. This means, it cannot contain any verbatim text that contains unbalanced braces.
   \item
-    The first flavor cannot cope with arguments that contain
-    |\include|. 
+    The first flavor cannot cope with arguments that contain |\include|.
   \item
-    If the text mainly belongs to one mode with only small amounts of
-    text from another mode inserted, this second flavor is nice to
-    use.
+    If the text mainly belongs to one mode with only small amounts of text from another mode inserted, this second flavor is nice to use.
   \end{itemize}
 
-  \emph{Note:} When searching line-wise for a |\mode| command to shake
-  it out of its gobbling state, \TeX\ will not recognize a |\mode|
-  command if a mode specification follows on the same line. Thus, such
-  a specification must be given on the next line.
+  \emph{Note:} When searching line-wise for a |\mode| command to shake it out of its gobbling state, \TeX\ will not recognize a |\mode| command if a mode specification follows on the same line. Thus, such a specification must be given on the next line.
+
+  \emph{Note:} When a \TeX\ file ends, \TeX\ must not be in the gobbling state. Switch this state off using |\mode| on one line and |<all>| on the next.
 
-  \emph{Note:} When a \TeX\ file ends, \TeX\ must not be in the
-  gobbling state. Switch this state off using |\mode| on one line and
-  |<all>| on the next.
-  
   \example
 \begin{verbatim}
 \mode<article>
@@ -498,35 +327,15 @@ This text is only inserted in presentation mode.
 The last flavor of the mode command behaves quite differently.
 
 \begin{command}{\mode\declare{|*|}}
-  The effect of this mode is to ignore all text outside frames in the
-  |presentation| modes. In article mode it has no effect.
-
-  This mode should only be entered outside of frames. Once entered, if
-  the current mode is a |presentation| mode, \TeX\ will enter a
-  gobbling state similar to the gobbling state of the second
-  ``flavor'' of the |\mode| command. The difference is that the text
-  is now read token-wise, not line-wise. The text is gobbled token by
-  token until one of the following tokens is found: |\mode|, |\frame|,
-  |\againframe|, |\part|, |\section|, |\subsection|, |\appendix|,
-  |\note|, |\begin{frame}|, and |\end{document}| (the last two are
-  really tokens, but they are recognized anyway).
-
-  Once one of these commands is encountered, the gobbling stops and
-  the command is executed. However, all of these commands restore the
-  mode that was in effect when they started. Thus, once the command is
-  finished, \TeX\ returns to its gobbling.
-
-  Normally, |\mode*| is exactly what you want \TeX\ to do outside of
-  frames: ignore everything except for the above-mentioned commands
-  outside frames in |presentation| mode. However, there are  cases
-  in which you have to use the second flavor of the |\mode| command
-  instead: If you have verbatim text that contains one of the commands,
-  if you have very long text outside frames, or if you wish some text
-  outside a frame (like a definition) to be executed also in
-  |presentation| mode.
-
-  The class option |ignorenonframetext| will switch on |\mode*| at the
-  beginning of the document.
+  The effect of this mode is to ignore all text outside frames in the |presentation| modes. In article mode it has no effect.
+
+  This mode should only be entered outside of frames. Once entered, if the current mode is a |presentation| mode, \TeX\ will enter a gobbling state similar to the gobbling state of the second ``flavor'' of the |\mode| command. The difference is that the text is now read token-wise, not line-wise. The text is gobbled token by token until one of the following tokens is found: |\mode|, |\frame|, |\againframe|, |\part|, |\section|, |\subsection|, |\appendix|, |\note|, |\begin{frame}|, and |\end{document}| (the last two are really tokens, but they are recognized anyway).
+
+  Once one of these commands is encountered, the gobbling stops and the command is executed. However, all of these commands restore the mode that was in effect when they started. Thus, once the command is finished, \TeX\ returns to its gobbling.
+
+  Normally, |\mode*| is exactly what you want \TeX\ to do outside of frames: ignore everything except for the above-mentioned commands outside frames in |presentation| mode. However, there are  cases in which you have to use the second flavor of the |\mode| command instead: If you have verbatim text that contains one of the commands, if you have very long text outside frames, or if you wish some text outside a frame (like a definition) to be executed also in |presentation| mode.
+
+  The class option |ignorenonframetext| will switch on |\mode*| at the beginning of the document.
 
   \example
 \begin{verbatim}
@@ -550,8 +359,7 @@ Back to article stuff again.
 \end{document}
 \end{verbatim}
 
-  \example The following example shows how you can include other files
-  in a main file. The contents of a |main.tex|:
+  \example The following example shows how you can include other files in a main file. The contents of a |main.tex|:
 
 \begin{verbatim}
 \documentclass[ignorenonframetext]{beamer}
@@ -569,6 +377,7 @@ Back to star mode
 \end{verbatim}
 
   And |a.tex| (and likewise |b.tex|):
+
 \begin{verbatim}
 \mode*
 \section{First section}
@@ -577,12 +386,5 @@ Extra text in article version.
   Some text.
 \end{frame}
 \mode<all>
-\end{verbatim}  
+\end{verbatim}
 \end{command}
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-notes.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-notes.tex
index 7c8a3c31e87..1a6636eb88a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-notes.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-notes.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,50 +8,25 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-notes.tex,v 1.2 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Adding Notes for Yourself}
 
-A \emph{note} is text that is intended as a reminder to yourself of
-what you should say or should keep in mind when presenting a
-slide. Notes are usually printed out on paper, but with two-screen
-support they can also be shown on your laptop screen while the main
-presentation is shown on the projector. 
-
+A \emph{note} is text that is intended as a reminder to yourself of what you should say or should keep in mind when presenting a slide. Notes are usually printed out on paper, but with two-screen support they can also be shown on your laptop screen while the main presentation is shown on the projector.
 
 
 \subsection{Specifying Note Contents}
 
-To add a note to a slide or a frame, use the |\note|
-command. This command can be used both inside and outside frames, but
-it has quite different behaviors then: Inside frames, |\note| commands
-accumulate and append a single note page after the current slide;
-outside frames each |\note| directly inserts a single note page with
-the given parameter as contents. Using the |\note| command inside
-frames is usually preferably over using them outside, since only
-commands issued inside frames profit from the class option
-|onlyslideswithnotes|, see below.
+To add a note to a slide or a frame, use the |\note| command. This command can be used both inside and outside frames, but it has quite different behaviors then: Inside frames, |\note| commands accumulate and append a single note page after the current slide; outside frames each |\note| directly inserts a single note page with the given parameter as contents. Using the |\note| command inside frames is usually preferably over using them outside, since only commands issued inside frames profit from the class option |onlyslideswithnotes|, see below.
 
 \lyxnote
-In \LyX, only the inside-frame |\note| command with the option
-|[item]| is available in the form of the NoteItem style. 
-
-Inside a frame, the effect of |\note|\meta{text} is the following:
-When you use it somewhere inside the frame on a specific slide, a note
-page is created after the slide, containing the \meta{text}. Since you
-can add an overlay specification to the |\note| command, you can
-specify after which slide the note should be shown. If you use
-multiple |\note| commands on one slide, they ``accumulate'' and are
-all shown on the same note.
+In \LyX, only the inside-frame |\note| command with the option |[item]| is available in the form of the NoteItem style.
 
-To make the accumulation of notes more convenient, you can use the
-|\note| command with the option |[item]|. The notes added with this
-option are accumulated in an |enumerate| list that follows any text
-inserted using |\note|. 
+Inside a frame, the effect of |\note|\meta{text} is the following: When you use it somewhere inside the frame on a specific slide, a note page is created after the slide, containing the \meta{text}. Since you can add an overlay specification to the |\note| command, you can specify after which slide the note should be shown. If you use multiple |\note| commands on one slide, they ``accumulate'' and are all shown on the same note.
 
-The following example will produce one note page that follows the
-second slide and has two entries. 
+To make the accumulation of notes more convenient, you can use the |\note| command with the option |[item]|. The notes added with this option are accumulated in an |enumerate| list that follows any text inserted using |\note|.
 
+The following example will produce one note page that follows the second slide and has two entries.
 \begin{verbatim}
 \begin{frame}
   \begin{itemize}
@@ -63,59 +39,43 @@ second slide and has two entries.
 \end{frame}
 \end{verbatim}
 
+Outside frames, the command |\note| creates a single note page. It is ``independent'' of any usage of the |\note| commands inside the previous frame. If you say |\note| inside a frame and |\note| right after it, \emph{two} note pages are created.
 
-Outside frames, the command |\note| creates a single note page. It
-is ``independent'' of any usage of the |\note| commands
-inside the previous frame. If you say |\note| inside a frame and
-|\note| right after it, \emph{two} note pages are created.
-
-In the following, the syntax and effects of the |\note| command
-\emph{inside} frames is described:
+In the following, the syntax and effects of the |\note| command \emph{inside} frames is described:
 
-\begin{command}{\note\sarg{overlay
-      specification}\oarg{options}\marg{note text}}
+\begin{command}{\note\sarg{overlay specification}\oarg{options}\marg{note text}}
   Effects \emph{inside} frames:
-  
-  This command appends the \meta{note text} to
-  the note that follows the current slide. Multiple uses of this
-  command on a slide accumulate. If you 
-  do not specify an \meta{overlay specification}, the 
-  note will be added to \emph{all} slides of the current frame. This
-  is often not what you want, so adding a specification like |<1>| is
-  usually a good idea.
+
+  This command appends the \meta{note text} to the note that follows the current slide. Multiple uses of this command on a slide accumulate. If you do not specify an \meta{overlay specification}, the note will be added to \emph{all} slides of the current frame. This is often not what you want, so adding a specification like |<1>| is usually a good idea.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|item|} causes the note to be put as an item in a
-    list that is shown at the end of the note page.
+  \item
+    \declare{|item|} causes the note to be put as an item in a list that is shown at the end of the note page.
   \end{itemize}
-    
+
   \example|\note<2>{Do not talk longer than 2 minutes about this.}|
 
   \articlenote
   Notes are ignored in |article| mode.
 
   \lyxnote
-  Use the NoteItem style to insert a note item. 
+  Use the NoteItem style to insert a note item.
 \end{command}
 
-
-Next, the syntax and effects of the |\note| command
-\emph{outside} frames are described:
+Next, the syntax and effects of the |\note| command \emph{outside} frames are described:
 
 \begin{command}{\note\oarg{options}\marg{note text}}
-  Outside frames, this command creates a note page. This command is  
-  \emph{not} affected by the option |notes=onlyframeswithnotes|, see
-  below.
+  Outside frames, this command creates a note page. This command is \emph{not} affected by the option |notes=onlyframeswithnotes|, see below.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|itemize|} will enclose the whole note page in an
-    |itemize| environment. This is just a convenience.
-  \item \declare{|enumerate|} will enclose the whole note page in an
-    |enumerate| environment.
+  \item
+    \declare{|itemize|} will enclose the whole note page in an |itemize| environment. This is just a convenience.
+  \item
+    \declare{|enumerate|} will enclose the whole note page in an |enumerate| environment.
   \end{itemize}
-  
+
   \example
 \begin{verbatim}
 \frame{some text}
@@ -132,22 +92,15 @@ Next, the syntax and effects of the |\note| command
   Notes are ignored in |article| mode.
 \end{command}
 
-
 The following element dictates who the note pages are rendered:
+
 \begin{element}{note page}\yes\yes\yes
-  This template is used to typeset a note page.  The
-  template should contain a mentioning of the insert |\insertnote|,
-  which will contain the note text. To squeeze more onto note pages
-  you might consider changing the size of the \beamer-font |note page|
-  to something small. The default is |\small|.
+  This template is used to typeset a note page.  The template should contain a mentioning of the insert |\insertnote|, which will contain the note text. To squeeze more onto note pages you might consider changing the size of the \beamer-font |note page| to something small. The default is |\small|.
   \begin{templateoptions}
     \itemoption{default}{}
-    The default template shows the last slide in the upper right
-    corner and some ``hints'' that should help you match a note page
-    to the slide that is currently shown.
+    The default template shows the last slide in the upper right corner and some ``hints'' that should help you match a note page to the slide that is currently shown.
     \itemoption{compress}{}
-    The option produces an output that is similar to the default, only
-    more fits onto each note page at the price of legibility.
+    The option produces an output that is similar to the default, only more fits onto each note page at the price of legibility.
     \itemoption{plain}{}
     Just inserts the note text, no fancy hints.
   \end{templateoptions}
@@ -156,32 +109,24 @@ The following element dictates who the note pages are rendered:
     \iteminsert{\insertnote}
     Inserts the text of the current note into the template.
     \iteminsert{\insertslideintonotes}\marg{magnification}
-    Inserts a ``mini picture'' of the last slide into the current
-    note. The slide will be scaled by the given magnification.
+    Inserts a ``mini picture'' of the last slide into the current note. The slide will be scaled by the given magnification.
 
-    \example |\insertslideintonotes{0.25}|
+    \example
+    |\insertslideintonotes{0.25}|
 
-    This will give a mini slide whose width and height are one fourth of
-    the usual size.
+    This will give a mini slide whose width and height are one fourth of the usual size.
   \end{itemize}
 \end{element}
 
 
-
 \subsection{Specifying Contents for Multiple Notes}
 
-Sometimes you wish some text to be shown on every note or at least on
-every note in a long series of notes. To achieve this effect, you can use
-the following two commands:
+Sometimes you wish some text to be shown on every note or at least on every note in a long series of notes. To achieve this effect, you can use the following two commands:
 
 \begin{command}{\AtBeginNote\marg{text}}
-  The \meta{text} will be inserted at the beginning of every note in
-  the scope of the command. To stop the effect, either use
-  |\AtBeginNote{}| or enclose the area in a \TeX\ group.
+  The \meta{text} will be inserted at the beginning of every note in the scope of the command. To stop the effect, either use |\AtBeginNote{}| or enclose the area in a \TeX\ group.
 
-  It is advisable to add a |\par| command or an empty line at the end
-  of the \meta{text} since otherwise any note text will directly
-  follow the \meta{text} without a line break.
+  It is advisable to add a |\par| command or an empty line at the end of the \meta{text} since otherwise any note text will directly follow the \meta{text} without a line break.
 
   \example
 \begin{verbatim}
@@ -201,36 +146,25 @@ the following two commands:
 \end{command}
 
 \begin{command}{\AtEndNote\marg{text}}
-  This command behaves the same way as |\AtBeginNote|, except that the
-  text is inserted at the end (bottom). You may wish to add a |\par|
-  at the beginning of \meta{text}.
+  This command behaves the same way as |\AtBeginNote|, except that the text is inserted at the end (bottom). You may wish to add a |\par| at the beginning of \meta{text}.
 \end{command}
 
 
 \subsection{Specifying Which Notes and Frames Are Shown}
 
-Since you normally do not wish the notes to be part of your
-presentation, you must explicitly say so in the preamble if notes
-should be included in your presentation. You can use the following
-\beamer\ options for this:
+Since you normally do not wish the notes to be part of your presentation, you must explicitly say so in the preamble if notes should be included in your presentation. You can use the following \beamer\ options for this:
 
 \begin{beameroption}{hide notes}
   Notes are not shown. This is the default in a presentation.
 \end{beameroption}
 
 \begin{beameroption}{show notes}
-  Include notes in the output file. Normal slides are also included
-  and the note pages are interleaved with them. 
+  Include notes in the output file. Normal slides are also included and the note pages are interleaved with them.
 \end{beameroption}
 
 \begin{beameroption}{show notes on second screen}{|=|\meta{location}}
   \label{command-notesonsecondscreen}
-  When this option is given, a two screen version of your talk is
-  created, see Section~\ref{section-twoscreens} for further
-  details. The second screen, which is displayed on the right by
-  default, shows your notes. By   specifying a different
-  \meta{location}, you can also place the second screen on the |left|,
-  |bottom|, or |top|. 
+  When this option is given, a two screen version of your talk is created, see Section~\ref{section-twoscreens} for further details. The second screen, which is displayed on the right by default, shows your notes. By   specifying a different \meta{location}, you can also place the second screen on the |left|, |bottom|, or |top|.
 
   \example
 \begin{verbatim}
@@ -245,24 +179,12 @@ should be included in your presentation. You can use the following
 \end{document}
 \end{verbatim}
 
-  In detail, the following happens: The presentation is typeset
-  normally and shown on the main screen or, to be precise, on
-  |pgfpages|'s logical page number zero. The second screen (logical
-  screen number one) is initialized to be empty.
-
-  Whenever a note page is to be typeset, either because a frame
-  contained |\note| commands or because the frame was followed by a
-  |\note| command, the note page is normally typeset. Then the note
-  page is put on the second screen. Then the whole page is shipped
-  out. (The exact details are bit more complex, but that is what
-  happens, basically.)
-
-  An important effect of this behavior is that a note page
-  \emph{following} a frame is shown next to this frame. Normally, this
-  is exactly what you want and expect. However, if there are multiple
-  note pages for a single slide only the last one is shown,
-  currently. This may change in the future, so do not rely on this
-  effect.
+  In detail, the following happens: The presentation is typeset normally and shown on the main screen or, to be precise, on |pgfpages|'s logical page number zero. The second screen (logical screen number one) is initialized to be empty.
+
+  Whenever a note page is to be typeset, either because a frame contained |\note| commands or because the frame was followed by a |\note| command, the note page is normally typeset. Then the note page is put on the second screen. Then the whole page is shipped out. (The exact details are bit more complex, but that is what happens, basically.)
+
+  An important effect of this behavior is that a note page \emph{following} a frame is shown next to this frame. Normally, this is exactly what you want and expect. However, if there are multiple note pages for a single slide only the last one is shown, currently. This may change in the future, so do not rely on this effect.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -281,8 +203,7 @@ should be included in your presentation. You can use the following
 \end{frame}
 \end{verbatim}
 
-  If you really need multiple note pages for a single slide, you will
-  have to use something more complicated like this:
+  If you really need multiple note pages for a single slide, you will have to use something more complicated like this:
 \begin{verbatim}
 \begin{frame}<1-3>
   First frame.
@@ -295,20 +216,5 @@ should be included in your presentation. You can use the following
 
 
 \begin{beameroption}{show only notes}
-  Include only the notes in the output file and suppresses all
-  frames. This options is useful for printing them. If you specify
-  this command, the |.aux| and |.toc| files are \emph{not}
-  updated. So, if you add a section and re\TeX\ your presentation,
-  this will not be reflected in the navigation bars (which you do not
-  see anyway since only notes are output).
+  Include only the notes in the output file and suppresses all frames. This options is useful for printing them. If you specify this command, the |.aux| and |.toc| files are \emph{not} updated. So, if you add a section and re\TeX\ your presentation, this will not be reflected in the navigation bars (which you do not see anyway since only notes are output).
 \end{beameroption}
-
-
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
index 2da3117f899..c8b0a26a0f3 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-overlays.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,34 +8,19 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-overlays.tex,v 1.12 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Creating Overlays}
-
 \label{section-overlay}
 
 
-
 \subsection{The Pause Commands}
 
-The |pause| command offers an easy, but not very flexible
-way of creating frames that are uncovered piecewise. If you say
-|\pause| somewhere in a frame, only the text on the frame up to the
-|\pause| command is shown on the first slide. On the 
-second slide, everything is shown up to the second |\pause|, and
-so forth. You can also use |\pause| inside environments; its effect
-will last after the environment. However, taking this to
-extremes and use |\pause| deeply within a nested environment may not
-have the desired result.
-
-A much more fine-grained control over what is shown on each slide can
-be attained using overlay specifications, see the next
-sections. However, for many simple cases the |\pause|
-command is sufficient.
- 
-The effect of |\pause| lasts till the next |\pause|, |\onslide|, or
-the end of the frame.   
+The |pause| command offers an easy, but not very flexible way of creating frames that are uncovered piecewise. If you say |\pause| somewhere in a frame, only the text on the frame up to the |\pause| command is shown on the first slide. On the second slide, everything is shown up to the second |\pause|, and so forth. You can also use |\pause| inside environments; its effect will last after the environment. However, taking this to extremes and using |\pause| deeply within a nested environment may not have the desired result.
 
+A much more fine-grained control over what is shown on each slide can be attained using overlay specifications, see the next sections. However, for many simple cases the |\pause| command is sufficient.
+
+The effect of |\pause| lasts till the next |\pause|, |\onslide|, or the end of the frame.
 \begin{verbatim}
 \begin{frame}
   \begin{itemize}
@@ -71,20 +57,14 @@ the end of the frame.
 \end{verbatim}
 
 \begin{command}{\pause\oarg{number}}
-  This command causes the text following it to be shown only from the
-  next slide on, or, if the optional \meta{number} is given,
-  from the slide with the number \meta{number}. If the optional
-  \meta{number} is given, the counter |beamerpauses| is set to this
-  number. This command uses the |\onslide| command, internally.
-  This command does \emph{not} work inside |amsmath| environments like
-  |align|, since these do really wicked things.
+  This command causes the text following it to be shown only from the next slide on, or, if the optional \meta{number} is given, from the slide with the number \meta{number}. If the optional \meta{number} is given, the counter |beamerpauses| is set to this number. This command uses the |\onslide| command, internally. This command does \emph{not} work inside |amsmath| environments like |align|, since these do really wicked things.
 
   \example
 \begin{verbatim}
 \begin{frame}
   \begin{itemize}
   \item
-    A    
+    A
   \pause
   \item
     B
@@ -102,40 +82,15 @@ the end of the frame.
   Use the ``Pause'' style with an empty line to insert a pause.
 \end{command}
 
-To ``unpause'' some text, that is, to temporarily suspend pausing, use
-the command |\onslide|, see below.
-
-
-
-
+To ``unpause'' some text, that is, to temporarily suspend pausing, use the command |\onslide|, see below.
 
 
 \subsection{The General Concept of Overlay Specifications}
-
 \label{section-concept-overlays}
 
-The approach taken by most presentation classes to overlays is
-somewhat similar to the above |\pause| command. These commands get a
-certain slide number as input and affect the text on the slide
-following this command in a certain way. For example,
-\textsc{prosper}'s |\FromSlide{2}| command causes all text following
-this command to be shown only from the second slide on.
-
-The \beamer\ class uses a different approach (though the
-abovementioned command is also available: |\onslide<2->| will have the
-same effect as |\FromSlide{2}|, except that |\onslide| transcends
-environments; likewise, |\pause| is internally mapped to a command
-with an appropriate overlay specifications). The idea is to add
-\emph{overlay specifications} to certain commands. These
-specifications are always given in pointed 
-brackets and follow the command ``as soon as possible,'' though in
-certain cases \beamer\ also allows overlay specification to be
-given a little later. In the simplest case, the specification contains
-just a number. A command with an overlay
-specification following it will only have ``effect'' on the slide(s)
-mentioned in the specification. What exactly ``having an effect''
-means, depends on the command. Consider the following example.
+The approach taken by most presentation classes to overlays is somewhat similar to the above |\pause| command. These commands get a certain slide number as input and affect the text on the slide following this command in a certain way. For example, \textsc{prosper}'s |\FromSlide{2}| command causes all text following this command to be shown only from the second slide on.
 
+The \beamer\ class uses a different approach (though the abovementioned command is also available: |\onslide<2->| will have the same effect as |\FromSlide{2}|, except that |\onslide| transcends environments; likewise, |\pause| is internally mapped to a command with an appropriate overlay specifications). The idea is to add \emph{overlay specifications} to certain commands. These specifications are always given in pointed brackets and follow the command ``as soon as possible,'' though in certain cases \beamer\ also allows overlay specification to be given a little later. In the simplest case, the specification contains just a number. A command with an overlay specification following it will only have ``effect'' on the slide(s) mentioned in the specification. What exactly ``having an effect'' means, depends on the command. Consider the following example.
 \begin{verbatim}
 \begin{frame}
   \textbf{This line is bold on all three slides.}
@@ -144,9 +99,7 @@ means, depends on the command. Consider the following example.
 \end{frame}
 \end{verbatim}
 
-For the command |\textbf|, the overlay specification causes the
-text to be set in boldface only on the specified slides. On all other
-slides, the text is set in a normal font.
+For the command |\textbf|, the overlay specification causes the text to be set in boldface only on the specified slides. On all other slides, the text is set in a normal font.
 
 For a second example, consider the following frame:
 \begin{verbatim}
@@ -156,77 +109,35 @@ For a second example, consider the following frame:
 \end{frame}
 \end{verbatim}
 
-The command |\only|, which is introduced by \beamer, normally simply
-inserts its parameter into the current frame. However, if an
-overlay-specification is present, it ``throws away'' its parameter on
-slides that are not mentioned. 
-
-Overlay specifications can only be written behind certain commands,
-not every command. Which commands you can use and which effects this
-will have is explained in the next section. However, it is quite
-easy to redefine an existing command such that it becomes ``overlay
-specification aware,'' see also
-Section~\ref{section-overlay-commands}. 
+The command |\only|, which is introduced by \beamer, normally simply inserts its parameter into the current frame. However, if an overlay-specification is present, it ``throws away'' its parameter on slides that are not mentioned.
 
-The syntax of (basic) overlay specifications is the following: They
-are comma-separated lists of slides and ranges. Ranges are specified
-like this: |2-5|, which means slide two through to five. The start or
-the end of a range can be omitted. For example, |3-| means
-``slides three, four, five, and so on'' and |-5| means the same as
-|1-5|. A complicated example is |-3,6-8,10,12-15|, which selects the 
-slides 1, 2, 3, 6, 7, 8, 10, 12, 13, 14, and 15.
+Overlay specifications can only be written behind certain commands, not every command. Which commands you can use and which effects this will have is explained in the next section. However, it is quite easy to redefine an existing command such that it becomes ``overlay specification aware,'' see also Section~\ref{section-overlay-commands}.
 
+The syntax of (basic) overlay specifications is the following: They are comma-separated lists of slides and ranges. Ranges are specified like this: |2-5|, which means slide two through to five. The start or the end of a range can be omitted. For example, |3-| means ``slides three, four, five, and so on'' and |-5| means the same as |1-5|. A complicated example is |-3,6-8,10,12-15|, which selects the slides 1, 2, 3, 6, 7, 8, 10, 12, 13, 14, and 15.
 
 \lyxnote
-Overlay specifications can also be given in \LyX. You must give them
-in \TeX-mode (otherwise the pointed brackets may be ``escaped'' by
-\LyX, though this will not happen in all versions). For example, to
-add an overlay specification to an item, simply insert a \TeX-mode
-text like |<3>| as the first thing in that item. Likewise, you can add
-an overlay specification to environments like |theorem| by giving
-them in \TeX-mode right at the start of the environment. 
+Overlay specifications can also be given in \LyX. You must give them in \TeX-mode (otherwise the pointed brackets may be ``escaped'' by \LyX, though this will not happen in all versions). For example, to add an overlay specification to an item, simply insert a \TeX-mode text like |<3>| as the first thing in that item. Likewise, you can add an overlay specification to environments like |theorem| by giving them in \TeX-mode right at the start of the environment.
 
 
 \subsection{Commands with Overlay Specifications}
 \label{section-overlay-commands}
 
-For the following commands, adding an overlay specification causes the
-command to be simply ignored on slides that are not included in the
-specification: |\textbf|, |\textit|, |\textsl|,
-|\textrm|, |\textsf|, |\color|, |\alert|,
-|\structure|. If a command takes several arguments, like
-|\color|, the specification should directly follow the command as in
-the following example (but there are exceptions to this rule):
+For the following commands, adding an overlay specification causes the command to be simply ignored on slides that are not included in the specification: |\textbf|, |\textit|, |\textsl|, |\textrm|, |\textsf|, |\color|, |\alert|, |\structure|. If a command takes several arguments, like |\color|, the specification should directly follow the command as in the following example (but there are exceptions to this rule):
 \begin{verbatim}
 \begin{frame}
   \color<2-3>[rgb]{1,0,0} This text is red on slides 2 and 3, otherwise black.
 \end{frame}
 \end{verbatim}
 
-For the following commands, the effect of an overlay specification is
-special:
+For the following commands, the effect of an overlay specification is special:
 
 \begin{command}{\onslide\opt{\meta{modifier}}\sarg{overlay specification}\opt{\marg{text}}}
-  The behaviour of this command depends on whether the optional
-  argument \meta{text} is given or not (note that the optional
-  argument is given in \emph{normal} braces, not in square
-  brackets). If present, the \meta{modifier} can be either a~|+| or
-  a~|*|.
-
-  If no \meta{text} is given, the following happens: All text
-  following this command will only be shown  (uncovered) on the
-  specified slides. On non-specified slides, the text still 
-  occupies space. If no slides are specified, the following
-  text is always shown. You need not call this command in the same
-  \TeX\ group, its effect transcends block groups. However, this
-  command has a \emph{different} effect inside an |overprint|
-  environment, see the description of |overprint|.
-
-  If the \meta{modifier} is |+|, hidden text will not be treated
-  as covered, but as invisible. The difference is the same as the
-  difference between |\uncover| and |\visible|. The modifier |*| may
-  not be given if no \meta{text} argument is present.
-  
+  The behaviour of this command depends on whether the optional argument \meta{text} is given or not (note that the optional argument is given in \emph{normal} braces, not in square brackets). If present, the \meta{modifier} can be either a~|+| or a~|*|.
+
+  If no \meta{text} is given, the following happens: All text following this command will only be shown  (uncovered) on the specified slides. On non-specified slides, the text still occupies space. If no slides are specified, the following text is always shown. You need not call this command in the same \TeX\ group, its effect transcends block groups. However, this command has a \emph{different} effect inside an |overprint| environment, see the description of |overprint|.
+
+  If the \meta{modifier} is |+|, hidden text will not be treated as covered, but as invisible. The difference is the same as the difference between |\uncover| and |\visible|. The modifier |*| may not be given if no \meta{text} argument is present.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -246,9 +157,7 @@ special:
 \end{frame}
 \end{verbatim}
 
-  If a \meta{text} argument is present, |\onslide| (without a
-  \meta{modifier}) is mapped to |\uncover|, |\onslide+|
-  is mapped to |\visible|, and |\onslide*| is mapped to |\only|.
+  If a \meta{text} argument is present, |\onslide| (without a \meta{modifier}) is mapped to |\uncover|, |\onslide+| is mapped to |\visible|, and |\onslide*| is mapped to |\only|.
 
   \example
 \begin{verbatim}
@@ -260,24 +169,18 @@ special:
   \visible<2>{Same effect as the previous command.}
 
   \onslide*<3>{Same effect as the following command.}
-  \only<3>{Same effect as the previous command.}  
+  \only<3>{Same effect as the previous command.}
 \end{frame}
 \end{verbatim}
 \end{command}
 
+\begin{command}{\only\sarg{overlay specification}\marg{text}\sarg{overlay specification}}
+  If either \meta{overlay specification} is present (though only one may be present), the \meta{text} is inserted only into the specified slides. For other slides, the text is simply thrown away. In particular, it occupies no space.
 
-\begin{command}{\only\sarg{overlay
-      specification}\marg{text}\sarg{overlay specification}}
-  If either \meta{overlay specification} is present (though only one
-  may be present), the \meta{text} is inserted only into the specified
-  slides. For other slides, the text is simply thrown away. In
-  particular, it occupies no space.
-  
-  \example |\only<3->{Text inserted from slide 3 on.}|
+  \example
+  |\only<3->{Text inserted from slide 3 on.}|
 
-  Since the overlay specification may also be given after the text,
-  you can often use |\only| to make other commands
-  overlay-specification-aware in a simple manner:
+  Since the overlay specification may also be given after the text, you can often use |\only| to make other commands overlay-specification-aware in a simple manner:
 
   \example
 \begin{verbatim}
@@ -288,27 +191,21 @@ special:
 \end{verbatim}
 \end{command}
 
-
 \begin{command}{\uncover\sarg{overlay specification}\marg{text}}
-  If the \meta{overlay specification} is present, the \meta{text} is
-  shown (``uncovered'') only on the specified slides. On other slides, the
-  text still occupies space and it is still typeset, but it is not
-  shown or only shown as if transparent. For details on how to specify
-  whether the text is invisible or just transparent see
-  Section~\ref{section-transparent}. 
-  \example |\uncover<3->{Text shown from slide 3 on.}|
+  If the \meta{overlay specification} is present, the \meta{text} is shown (``uncovered'') only on the specified slides. On other slides, the text still occupies space and it is still typeset, but it is not shown or only shown as if transparent. For details on how to specify whether the text is invisible or just transparent see Section~\ref{section-transparent}.
+
+  \example
+  |\uncover<3->{Text shown from slide 3 on.}|
 
   \articlenote
   This command has the same effect as |\only|.
 \end{command}
 
 \begin{command}{\visible\sarg{overlay specification}\marg{text}}
-  This command does almost the same as |\uncover|. The only difference
-  is that if the text is not shown, it is never shown in a transparent
-  way, but rather it is not shown at all. Thus, for this command the
-  transparency settings have no effect.
-  
-  \example |\visible<2->{Text shown from slide 2 on.}|
+  This command does almost the same as |\uncover|. The only difference is that if the text is not shown, it is never shown in a transparent way, but rather it is not shown at all. Thus, for this command the transparency settings have no effect.
+
+  \example
+  |\visible<2->{Text shown from slide 2 on.}|
 
   \articlenote
   This command has the same effect as |\only|.
@@ -316,41 +213,37 @@ special:
 
 \begin{command}{\invisible\sarg{overlay specification}\marg{text}}
   This command is the opposite of |\visible|.
-  
-  \example |\invisible<-2>{Text shown from slide 3 on.}|
+
+  \example
+  |\invisible<-2>{Text shown from slide 3 on.}|
 \end{command}
 
-\begin{command}{\alt\sarg{overlay specification}%
-    \marg{default text}\marg{alternative text}\sarg{overlay specification}}
-  Only one \meta{overlay specification} may be given. 
-  The default text is shown on the specified slides, otherwise the
-  alternative text. The specification must always be present.
-  \example |\alt<2>{On Slide 2}{Not on slide 2.}|
-
-  Once more, giving the overlay specification at the end is useful
-  when the command is used inside other commands.
-  
-  \example Here is the definition of |\uncover|:
+\begin{command}{\alt\sarg{overlay specification}\marg{default text}\marg{alternative text}\sarg{overlay specification}}
+  Only one \meta{overlay specification} may be given. The default text is shown on the specified slides, otherwise the alternative text. The specification must always be present.
+
+  \example
+  |\alt<2>{On Slide 2}{Not on slide 2.}|
+
+  Once more, giving the overlay specification at the end is useful when the command is used inside other commands.
+
+  \example
+  Here is the definition of |\uncover|:
 \begin{verbatim}
 \newcommand{\uncover}{\alt{\@firstofone}{\makeinvisible}}
 \end{verbatim}
 \end{command}
 
-\begin{command}{\temporal\ssarg{overlay specification}%
-    \marg{before slide text}\marg{default text}\marg{after slide text}}
-  This command alternates between three different texts, depending on
-  whether the current slide is temporally before the specified
-  slides, is one of the specified slides, or comes after them. If the
-  \meta{overlay specification} is not an interval (that is, if it has
-  a ``hole''), the ``hole'' is considered to be part of the before slides.
+\begin{command}{\temporal\ssarg{overlay specification}\marg{before slide text}\marg{default text}\marg{after slide text}}
+  This command alternates between three different texts, depending on whether the current slide is temporally before the specified slides, is one of the specified slides, or comes after them. If the \meta{overlay specification} is not an interval (that is, if it has a ``hole''), the ``hole'' is considered to be part of the before slides.
+
   \example
 \begin{verbatim}
   \temporal<3-4>{Shown on 1, 2}{Shown on 3, 4}{Shown 5, 6, 7, ...}
   \temporal<3,5>{Shown on 1, 2, 4}{Shown on 3, 5}{Shown 6, 7, 8, ...}
 \end{verbatim}
 
-  As a possible application of the |\temporal| command consider the
-  following example: 
+  As a possible application of the |\temporal| command consider the following example:
+
   \example
 \begin{verbatim}
 \def\colorize<#1>{%
@@ -368,13 +261,10 @@ special:
 \end{command}
 
 
-\begin{command}{\item\sarg{alert specification}\oarg{item
-      label}\sarg{alert specification}}
+\begin{command}{\item\sarg{alert specification}\oarg{item label}\sarg{alert specification}}
   \beamernote
-  Only one \meta{alert specification} may be given. The effect of
-  \meta{alert specification} is described in
-  Section~\ref{section-action-specifications}. 
-  
+  Only one \meta{alert specification} may be given. The effect of \meta{alert specification} is described in Section~\ref{section-action-specifications}.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -399,29 +289,16 @@ special:
   The \meta{action specification} is currently completely ignored.
 
   \lyxnote
-  The \meta{action specification} must be given in \TeX-mode and it
-  must be given at the very start of the item.
+  The \meta{action specification} must be given in \TeX-mode and it must be given at the very start of the item.
 \end{command}
 
-The related command |\bibitem| is also overlay-specification-aware
-in the same way as |\item|.
+The related command |\bibitem| is also overlay-specification-aware in the same way as |\item|.
 
 \begin{command}{\label\sarg{overlay specification}\marg{label name}}
-  If the \meta{overlay specification} is present, the label is only
-  inserted on the specified slide. Inserting a label on more than one
-  slide will cause a `multiple labels' warning. \emph{However}, if no
-  overlay specification is present, the specification is automatically
-  set to just `1' and the label is thus inserted only on the first
-  slide. This is typically the desired behaviour since it does not
-  really matter on which slide the label is inserted, \emph{except} if
-  you use an |\only| command and \emph{except} if you wish to use that
-  label as a hyperjump target. Then you need to specify a slide.
-
-  Labels can be used as target of hyperjumps. A convenient way of
-  labelling a frame is to use the |label=|\meta{name} option of the
-  |frame| environment. However, this will cause the whole frame to be
-  kept in memory till the end of the compilation, which may pose a
-  problem. 
+  If the \meta{overlay specification} is present, the label is only inserted on the specified slide. Inserting a label on more than one slide will cause a `multiple labels' warning. \emph{However}, if no overlay specification is present, the specification is automatically set to just `1' and the label is thus inserted only on the first slide. This is typically the desired behaviour since it does not really matter on which slide the label is inserted, \emph{except} if you use an |\only| command and \emph{except} if you wish to use that label as a hyperjump target. Then you need to specify a slide.
+
+  Labels can be used as target of hyperjumps. A convenient way of labelling a frame is to use the |label=|\meta{name} option of the |frame| environment. However, this will cause the whole frame to be kept in memory till the end of the compilation, which may pose a problem.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -438,15 +315,9 @@ in the same way as |\item|.
 \end{command}
 
 
-
 \subsection{Environments with Overlay Specifications}
 
-Environments can also be equipped with overlay specifications. For
-most of the predefined environments, see Section~\ref{predefined},
-adding an overlay specification causes the whole environment to be
-uncovered only on the specified slides. This is useful for showing
-things incrementally as in the following example.
-
+Environments can also be equipped with overlay specifications. For most of the predefined environments, see Section~\ref{predefined}, adding an overlay specification causes the whole environment to be uncovered only on the specified slides. This is useful for showing things incrementally as in the following example.
 \begin{verbatim}
 \begin{frame}
   \frametitle{A Theorem on Infinite Sets}
@@ -464,24 +335,14 @@ things incrementally as in the following example.
   \end{example}
 \end{frame}
 \end{verbatim}
-In the example, the first slide only contains the theorem, on the
-second slide an example is added, and on the third slide the proof is
-also shown.
 
-For each of the basic commands |\only|, |\alt|, |\visible|,
-|\uncover|, and |\invisible| there exists 
-``environment versions'' |onlyenv|, |altenv|, |visibleenv|,
-|uncoverenv|, and |invisibleenv|. Except for |altenv|
-and |onlyenv|, these environments do the same as the commands.
+In the example, the first slide only contains the theorem, on the second slide an example is added, and on the third slide the proof is also shown.
+
+For each of the basic commands |\only|, |\alt|, |\visible|, |\uncover|, and |\invisible| there exists ``environment versions'' |onlyenv|, |altenv|, |visibleenv|, |uncoverenv|, and |invisibleenv|. Except for |altenv| and |onlyenv|, these environments do the same as the commands.
 
 \begin{environment}{{onlyenv}\sarg{overlay specification}}
-  If the \meta{overlay specification} is given, the contents of the
-  environment is inserted into the text only on the specified
-  slides. The difference to |\only| is, that the text is actually
-  typeset inside a box that is then thrown away, whereas |\only|
-  immediately throws away its contents. If the text is not
-  ``typesettable,'' the |onlyenv| may produce an error where |\only|
-  would not.
+  If the \meta{overlay specification} is given, the contents of the environment is inserted into the text only on the specified slides. The difference to |\only| is, that the text is actually typeset inside a box that is then thrown away, whereas |\only| immediately throws away its contents. If the text is not ``typesettable,'' the |onlyenv| may produce an error where |\only| would not.
+
   \example
 \begin{verbatim}
 \begin{frame}
@@ -493,20 +354,13 @@ and |onlyenv|, these environments do the same as the commands.
 \end{verbatim}
 \end{environment}
 
+\begin{environment}{{altenv}\sarg{overlay specification}\marg{begin text}\marg{end text}\marg{alternate begin text}\marg{alternate end text}\sarg{overlay specification}}
+  Only one \meta{overlay specification} may be given. On the specified slides, \meta{begin text} will be inserted at the beginning of the environment and \meta{end text} will be inserted at the end. On all other slides, \meta{alternate begin text} and \meta{alternate end text} will be used.
 
-\begin{environment}{{altenv}\sarg{overlay specification}\marg{begin
-text}\marg{end text}\marg{alternate begin text}\marg{alternate end
-text}\sarg{overlay specification}}
-  Only one \meta{overlay specification} may be given. On the specified
-  slides, \meta{begin text} will be inserted at the beginning of the
-  environment and \meta{end text} will be inserted at the end. On all
-  other slides, \meta{alternate begin text} and \meta{alternate end
-    text} will be used.
-  
   \example
 \begin{verbatim}
 \begin{frame}
-  This 
+  This
   \begin{altenv}<2>{(}{)}{[}{]}
     word
   \end{uncoverenv}
@@ -518,28 +372,20 @@ text}\sarg{overlay specification}}
 
 \subsection{Dynamically Changing Text or Images}
 
-You may sometimes wish to have some part of a frame change dynamically
-from slide to slide. On each slide of the frame, something different
-should be shown inside this area. You could achieve the effect of
-dynamically changing text by giving a list of |\only| commands like this:
+You may sometimes wish to have some part of a frame change dynamically from slide to slide. On each slide of the frame, something different should be shown inside this area. You could achieve the effect of dynamically changing text by giving a list of |\only| commands like this:
 \begin{verbatim}
   \only<1>{Initial text.}
   \only<2>{Replaced by this on second slide.}
   \only<3>{Replaced again by this on third slide.}
 \end{verbatim}
-The trouble with this approach is that it may lead to slight, but
-annoying differences in the heights of the lines, which may cause the
-whole frame to ``whobble'' from slide to slide. This problem becomes
-much more severe if the replacement text is several lines long.
 
-To solve this problem, you can use two environments:
-|overlayarea| and |overprint|. The first is more flexible,
-but less user-friendly.
+The trouble with this approach is that it may lead to slight, but annoying differences in the heights of the lines, which may cause the whole frame to ``whobble'' from slide to slide. This problem becomes much more severe if the replacement text is several lines long.
+
+To solve this problem, you can use two environments: |overlayarea| and |overprint|. The first is more flexible, but less user-friendly.
 
 \begin{environment}{{overlayarea}\marg{area width}\marg{area height}}
-  Everything within the environment will be placed in a rectangular
-  area of the specified size. The area will have the same size on all
-  slides of a frame, regardless of its actual contents. 
+  Everything within the environment will be placed in a rectangular area of the specified size. The area will have the same size on all slides of a frame, regardless of its actual contents.
+
   \example
 \begin{verbatim}
 \begin{overlayarea}{\textwidth}{3cm}
@@ -553,18 +399,8 @@ but less user-friendly.
 \end{environment}
 
 \begin{environment}{{overprint}\oarg{area width}}
-  The \meta{area width} defaults to the text width.
-  Inside the environment, use |\onslide| commands to specify
-  different things that should be shown for this environment on
-  different slides. The |\onslide| commands are used like
-  |\item| commands. Everything within the environment will be
-  placed in a rectangular area of the specified width. The height and
-  depth of the area are chosen large enough to accommodate the largest
-  contents of the area. The overlay specifications of the
-  |\onslide| commands must be disjoint. This may be a problem for
-  handouts, since, there, all overlay specifications default to |1|. If
-  you use the option |handout|, you can disable all but one
-  |\onslide| by setting the others to |0|.
+  The \meta{area width} defaults to the text width. Inside the environment, use |\onslide| commands to specify different things that should be shown for this environment on different slides. The |\onslide| commands are used like |\item| commands. Everything within the environment will be placed in a rectangular area of the specified width. The height and depth of the area are chosen large enough to accommodate the largest contents of the area. The overlay specifications of the |\onslide| commands must be disjoint. This may be a problem for handouts, since, there, all overlay specifications default to |1|. If you use the option |handout|, you can disable all but one |\onslide| by setting the others to |0|.
+
   \example
 \begin{verbatim}
 \begin{overprint}
@@ -577,17 +413,10 @@ but less user-friendly.
 \end{verbatim}
 
   \lyxnote
-  Use the style ``Overprint'' to insert an |overprint|
-  environment. You have to use \TeX-mode to insert the |\onslide|
-  commands. 
+  Use the style ``Overprint'' to insert an |overprint| environment. You have to use \TeX-mode to insert the |\onslide| commands.
 \end{environment}
 
-
-A similar need for dynamical changes arises when you have, say, a
-series of pictures named |first.pdf|, |second.pdf|, and |third.pdf|
-that show different stages of some process. To make a frame that shows
-these pictures on different slides, the following code might be used:
-
+A similar need for dynamical changes arises when you have, say, a series of pictures named |first.pdf|, |second.pdf|, and |third.pdf| that show different stages of some process. To make a frame that shows these pictures on different slides, the following code might be used:
 \begin{verbatim}
 \begin{frame}
   \frametitle{The Three Process Stages}
@@ -598,18 +427,7 @@ these pictures on different slides, the following code might be used:
 \end{frame}
 \end{verbatim}
 
-The above code uses the fact the \beamer\ makes the |\includegraphics|
-command overlay-specification-aware. It works nicely, but only if each
-|.pdf| file contains the complete graphic to be shown. However, some
-programs, like |xfig|, sometimes also produce series of graphics in
-which each file just contains the \emph{additional} graphic elements
-to be shown on the next slide. In this case, the first graphic must be
-shown not on overlay~1, but from overlay~1 on, and so on. While this
-is easy to achieve by changing the overlay specification |<1>| to
-|<1->|, the graphics must also be shown \emph{on top of each
-  other}. An easy way to achieve this is to use \TeX's |\llap|
-command like this: 
-
+The above code uses the fact the \beamer\ makes the |\includegraphics| command overlay-specification-aware. It works nicely, but only if each |.pdf| file contains the complete graphic to be shown. However, some programs, like |xfig|, sometimes also produce series of graphics in which each file just contains the \emph{additional} graphic elements to be shown on the next slide. In this case, the first graphic must be shown not on overlay~1, but from overlay~1 on, and so on. While this is easy to achieve by changing the overlay specification |<1>| to |<1->|, the graphics must also be shown \emph{on top of each other}. An easy way to achieve this is to use \TeX's |\llap| command like this:
 \begin{verbatim}
 \begin{frame}
   \frametitle{The Three Process Stages}
@@ -621,7 +439,6 @@ command like this:
 \end{verbatim}
 
 or like this:
-
 \begin{verbatim}
 \begin{frame}
   \frametitle{The Three Process Stages}
@@ -634,96 +451,60 @@ or like this:
 \end{frame}
 \end{verbatim}
 
-A more convenient way is to use the |\multiinclude| command, see
-Section~\ref{section-xmpmulti} for details.
-
-
+A more convenient way is to use the |\multiinclude| command, see Section~\ref{section-xmpmulti} for details.
 
 
 \subsection{Advanced Overlay Specifications}
 
 \subsubsection{Making Commands and Environments Overlay-Specification-Aware}
 
-This section explains how to define new commands that are 
-overlay-specification-aware. Also, it explains how to setup counters
-correctly that should be increased from frame to frame (like equation
-numbering), but not from slide to slide. You may wish to skip this
-section, unless you  want to write your own extensions to the \beamer\
-class. 
-
-\beamer\ extends the syntax of \LaTeX's standard command
-|\newcommand|:
-
-
-\begin{command}{\newcommand\declare{|<>|}\marg{command name}%
-    \oarg{argument number}\oarg{default optional value}\marg{text}}
-  Declares the new command named \meta{command name}. The \meta{text}
-  should contain the body of this command and it may contain
-  occurrences of parameters like |#|\meta{number}. Here \meta{number}
-  may be between 1 and $\mbox{\meta{argument number}}+1$. The
-  additionally allowed argument is the overlay specification.
-
-  When \meta{command name} is used, it will scan as many as
-  \meta{argument number} arguments. While scanning them, it will look
-  for an overlay specification, which may be given between any two
-  arguments, before the first argument, or after the last argument. If
-  it finds an overlay specification like |<3>|, it will call
-  \meta{text} with arguments 1 to \meta{argument number} set to the
-  normal arguments and the argument number $\mbox{\meta{argument
-      number}}+1$ set to |<3>| (including the pointed brackets). If no
-  overlay specification is found, the extra argument is empty.
-
-  If the \meta{default optional value} is provided, the first argument
-  of \meta{command name} is optional. If no optional argument is
-  specified in square brackets, the \meta{default optional value} is
-  used.
-  
-  \example The following command will typeset its argument in red on
-  the specified slides:
+This section explains how to define new commands that are overlay-specification-aware. Also, it explains how to setup counters correctly that should be increased from frame to frame (like equation numbering), but not from slide to slide. You may wish to skip this section, unless you  want to write your own extensions to the \beamer\ class.
+
+\beamer\ extends the syntax of \LaTeX's standard command |\newcommand|:
+
+\begin{command}{\newcommand\declare{|<>|}\marg{command name}\oarg{argument number}\oarg{default optional value}\marg{text}}
+  Declares the new command named \meta{command name}. The \meta{text} should contain the body of this command and it may contain occurrences of parameters like |#|\meta{number}. Here \meta{number} may be between 1 and $\mbox{\meta{argument number}}+1$. The additionally allowed argument is the overlay specification.
+
+  When \meta{command name} is used, it will scan as many as \meta{argument number} arguments. While scanning them, it will look for an overlay specification, which may be given between any two arguments, before the first argument, or after the last argument. If it finds an overlay specification like |<3>|, it will call \meta{text} with arguments 1 to \meta{argument number} set to the normal arguments and the argument number $\mbox{\meta{argument number}}+1$ set to |<3>| (including the pointed brackets). If no overlay specification is found, the extra argument is empty.
+
+  If the \meta{default optional value} is provided, the first argument of \meta{command name} is optional. If no optional argument is specified in square brackets, the \meta{default optional value} is used.
+
+  \example
+  The following command will typeset its argument in red on the specified slides:
 \begin{verbatim}
 \newcommand<>{\makered}[1]{{\color#2{red}#1}}
 \end{verbatim}
-  
-  \example Here is \beamer's definition of |\emph|:
+
+  \example
+  Here is \beamer's definition of |\emph|:
 \begin{verbatim}
 \newcommand<>{\emph}[1]{{\only#2{\itshape}#1}}
 \end{verbatim}
 
-  
-  \example Here is \beamer's definition of |\transdissolve| (the
-  command |\beamer@dotrans| mainly passes its argument to |hyperref|):
+  \example
+  Here is \beamer's definition of |\transdissolve| (the command |\beamer@dotrans| mainly passes its argument to |hyperref|):
 \begin{verbatim}
 \newcommand<>{\transdissolve}[1][]{\only#2{\beamer@dotrans[#1]{Dissolve}}}
 \end{verbatim}
 \end{command}
 
-\begin{command}{\renewcommand\declare{|<>|}\marg{existing command name}%
-    \oarg{argument number}\oarg{default optional value}\marg{text}}
-  Redeclares a command that already exists in the same way as
-  |\newcommand<>|. Inside \meta{text}, you can 
-  still access to original definitions using the command
-  |\beameroriginal|, see the example.
-  \example This command is used in \beamer\ to make |\hyperlink| overlay-specification-aware:
+\begin{command}{\renewcommand\declare{|<>|}\marg{existing command name}\oarg{argument number}\oarg{default optional value}\marg{text}}
+  Redeclares a command that already exists in the same way as |\newcommand<>|. Inside \meta{text}, you can still access to original definitions using the command |\beameroriginal|, see the example.
+
+  \example
+  This command is used in \beamer\ to make |\hyperlink| overlay-specification-aware:
 \begin{verbatim}
 \renewcommand<>{\hyperlink}[2]{\only#3{\beameroriginal{\hyperlink}{#1}{#2}}}
 \end{verbatim}
 \end{command}
 
+\begin{command}{\newenvironment\declare{|<>|}\marg{environment name}\oarg{argument number}\oarg{default optional value}\\ \marg{begin text}\marg{end text}}
+  Declares a new environment that is overlay-specification-aware. If this environment is encountered, the same algorithm as for |\newcommand<>| is used to parse the arguments and the overlay specification.
+
+  Note that, as always, the \meta{end text} may not contain any arguments like |#1|. In particular, you do not have access to the overlay specification. In this case, it is usually a good idea to use |altenv| environment in the \meta{begin text}.
 
-\begin{command}{\newenvironment\declare{|<>|}\marg{environment name}%
-    \oarg{argument number}\oarg{default optional value}\\\marg{begin
-    text}\marg{end text}}
-  Declares a new environment that is overlay-specification-aware. If
-  this environment is encountered, the same algorithm as for
-  |\newcommand<>| is used to parse the arguments and the overlay
-  specification.
-
-  Note that, as always, the \meta{end text} may not contain any
-  arguments like |#1|. In particular, you do not have access to the
-  overlay specification. In this case, it is usually a good idea to
-  use |altenv| environment in the \meta{begin text}.
-  
-  \example Declare your own action block:
+  \example
+  Declare your own action block:
 \begin{verbatim}
 \newenvironment<>{myboldblock}[1]{%
   \begin{actionenv}#2%
@@ -739,8 +520,8 @@ class.
 \end{frame}
 \end{verbatim}
 
-  \example Text in the following environment is normally bold and
-  italic on non-specified slides: 
+  \example
+  Text in the following environment is normally bold and italic on non-specified slides:
 \begin{verbatim}
 \newenvironment<>{boldornormal}
   {\begin{altenv}#1
@@ -749,9 +530,8 @@ class.
   {\end{altenv}}
 \end{verbatim}
 
-  Incidentally, since |altenv| also accepts its argument at the end,
-  the same effect could have been achieved using just 
-  \begin{verbatim}
+  Incidentally, since |altenv| also accepts its argument at the end, the same effect could have been achieved using just
+\begin{verbatim}
 \newenvironment{boldornormal}
   {\begin{altenv}
     {\begin{bfseries}}{\end{bfseries}}
@@ -760,12 +540,8 @@ class.
 \end{verbatim}
 \end{command}
 
-\begin{command}{\renewenvironment\declare{|<>|}\marg{existing environment name}%
-    \oarg{argument number}\oarg{default optional value}\\
-    \marg{begin
-    text}\marg{end text}}
-  Redefines an existing environment. The original environment is still
-  available under the name |original|\meta{existing environment name}.
+\begin{command}{\renewenvironment\declare{|<>|}\marg{existing environment name}\oarg{argument number}\oarg{default optional value}\\ \marg{begin text}\marg{end text}}
+  Redefines an existing environment. The original environment is still available under the name |original|\meta{existing environment name}.
 
   \example
 \begin{verbatim}
@@ -775,24 +551,16 @@ class.
 \end{verbatim}
 \end{command}
 
-The following two commands can be used to ensure that a certain
-counter is automatically reset on subsequent slides of a frame. This
-is necessary for example for the equation count. You might want this
-count to be increased from frame to frame, but certainly not from
-overlay slide to overlay slide. For equation counters and footnote
-counters (you should not use footnotes), these commands have already
-been invoked.
+The following two commands can be used to ensure that a certain counter is automatically reset on subsequent slides of a frame. This is necessary for example for the equation count. You might want this count to be increased from frame to frame, but certainly not from overlay slide to overlay slide. For equation counters and footnote counters (you should not use footnotes), these commands have already been invoked.
 
 \begin{command}{\resetcounteronoverlays\marg{counter name}}
-  After you have invoked this command, the value of the specified
-  counter will be the same on all slides of every frame. 
-  \example |\resetcounteronoverlays{equation}|
+  After you have invoked this command, the value of the specified counter will be the same on all slides of every frame.
+  \example
+  |\resetcounteronoverlays{equation}|
 \end{command}
- 
+
 \begin{command}{\resetcountonoverlays\marg{count register name}}
-  The same as |\resetcounteronoverlays|, except that this
-  command should be used with counts that have been created using the
-  \TeX\ primitive |\newcount| instead of \LaTeX's  |\definecounter|. 
+  The same as |\resetcounteronoverlays|, except that this command should be used with counts that have been created using the \TeX\ primitive |\newcount| instead of \LaTeX's |\definecounter|.
   \example
 \begin{verbatim}
 \newcount\mycount
@@ -800,163 +568,84 @@ been invoked.
 \end{verbatim}
 \end{command}
 
-
-
-
-
-
 \subsubsection{Mode Specifications}
 
-This section is only important if you use \beamer's mode mechanism
-to create different versions of your presentation. If you are not
-familiar with \beamer's modes, please skip this section or read
-Section~\ref{section-modes} first.
-
-In certain cases you may wish to have different overlay specifications
-to apply to a command in different modes.
-For example, you might wish a certain text to appear only from the
-third slide on during your presentation, but in a handout for the
-audience there should be no second slide and the text should appear
-already on the second slide. In this case you could write
+This section is only important if you use \beamer's mode mechanism to create different versions of your presentation. If you are not familiar with \beamer's modes, please skip this section or read Section~\ref{section-modes} first.
+
+In certain cases you may wish to have different overlay specifications to apply to a command in different modes. For example, you might wish a certain text to appear only from the third slide on during your presentation, but in a handout for the audience there should be no second slide and the text should appear already on the second slide. In this case you could write
 \begin{verbatim}
 \only<3| handout:2>{Some text}
 \end{verbatim}
 
-The vertical bar, which must be followed by a (white) space, separates
-the two different specifications |3| and |handout:2|. By writing a
-mode name before a colon, you specify that the following specification
-only applies to that mode. If no mode is given, as in |3|, the mode
-|beamer| is automatically added. For this reason, if you write
-|\only<3>{Text}| and you are in |handout| mode, the text will be shown
-on all slides since there is no restriction specified for handouts and
-since the |3| is the same as |beamer:3|.
-
-It is also possible to give an overlay specification that contains
-only a mode name (or several, separated by vertical bars):
+The vertical bar, which must be followed by a (white) space, separates the two different specifications |3| and |handout:2|. By writing a mode name before a colon, you specify that the following specification only applies to that mode. If no mode is given, as in |3|, the mode |beamer| is automatically added. For this reason, if you write |\only<3>{Text}| and you are in |handout| mode, the text will be shown on all slides since there is no restriction specified for handouts and since the |3| is the same as |beamer:3|.
+
+It is also possible to give an overlay specification that contains only a mode name (or several, separated by vertical bars):
 \begin{verbatim}
 \only<article>{This text is shown only in article mode.}
 \end{verbatim}
-An overlay specification that does not contain any slide numbers is
-called a (pure) \emph{mode specification}. If a mode specification is
-given, all modes that are not mentioned are automatically
-suppressed. Thus |<beamer:1->| means ``on all slides in |beamer| mode
-and also on all slides in all other modes, since nothing special is
-specified for them,'' whereas |<beamer>| means ``on all slides in
-|beamer| mode and not on any other slide.''
-
-Mode specifications can also be used outside frames as in the following
-examples:
+
+An overlay specification that does not contain any slide numbers is called a (pure) \emph{mode specification}. If a mode specification is given, all modes that are not mentioned are automatically suppressed. Thus |<beamer:1->| means ``on all slides in |beamer| mode and also on all slides in all other modes, since nothing special is specified for them,'' whereas |<beamer>| means ``on all slides in |beamer| mode and not on any other slide.''
+
+Mode specifications can also be used outside frames as in the following examples:
 \begin{verbatim}
 \section<presentation>{This section exists only in the presentation modes}
 \section<article>{This section exists only in the article mode}
 \end{verbatim}
 
-You can also mix pure mode specifications and overlay specifications,
-although this can get confusing: 
+You can also mix pure mode specifications and overlay specifications, although this can get confusing:
 \begin{verbatim}
 \only<article| beamer:1>{Riddle}
 \end{verbatim}
 
-This will cause the text |Riddle| to be inserted in |article| mode and
-on the first slide of a frame in |beamer| mode, but not at all in
-|handout| or |trans| mode. (Try to find out how
-\verb/<beamer| beamer:1>/ differs from |<beamer>| and from
-|<beamer:1>|.)
-
-As if all this were not already complicated enough, there is another
-mode that behaves in a special way: the mode |second|. For this mode a
-special rule applies: An overlay specification for mode |beamer| also
-applies to mode |second| (but not the other way round). Thus, if we
-are in mode |second|, the specification |<second:2>| means ``on slide
-2'' and |<beamer:2>| also means ``on slide 2''. To get a slide that is
-typeset in |beamer| mode, but not in |second| mode, you can use,
-|<second:0>|. 
-
+This will cause the text |Riddle| to be inserted in |article| mode and on the first slide of a frame in |beamer| mode, but not at all in |handout| or |trans| mode. (Try to find out how \verb/<beamer| beamer:1>/ differs from |<beamer>| and from |<beamer:1>|.)
 
+As if all this were not already complicated enough, there is another mode that behaves in a special way: the mode |second|. For this mode a special rule applies: An overlay specification for mode |beamer| also applies to mode |second| (but not the other way round). Thus, if we are in mode |second|, the specification |<second:2>| means ``on slide 2'' and |<beamer:2>| also means ``on slide 2''. To get a slide that is typeset in |beamer| mode, but not in |second| mode, you can use, |<second:0>|.
 
 \subsubsection{Action Specifications}
 \label{section-action-specifications}
 
-This section also introduces a rather advanced concept. You may
-also wish to skip it on first reading.
+This section also introduces a rather advanced concept. You may also wish to skip it on first reading.
 
-Some overlay-specification-aware commands cannot only handle normal
-overlay specifications, but also so called \emph{action
-specifications}. In an action specification, the list of slide numbers
-and ranges is prefixed by \meta{action}|@|, where \meta{action} is the
-name of a certain action to be taken on the specified slides:
+Some overlay-specification-aware commands cannot only handle normal overlay specifications, but also so called \emph{action specifications}. In an action specification, the list of slide numbers and ranges is prefixed by \meta{action}|@|, where \meta{action} is the name of a certain action to be taken on the specified slides:
 \begin{verbatim}
-\item<3-| alert@3> Shown from slide 3 on, alerted on slide 3. 
+\item<3-| alert@3> Shown from slide 3 on, alerted on slide 3.
 \end{verbatim}
-In the above example, the |\item| command, which allows actions to be
-specified, will uncover the item text from slide three on and it will,
-additionally, alert this item exactly on slide 3.
 
-Not all commands can take an action specification. Currently, only
-|\item| (though not in |article| mode currently), |\action|, the
-environment |actionenv|, and the block environments (like |block| or
-|theorem|) handle them. 
+In the above example, the |\item| command, which allows actions to be specified, will uncover the item text from slide three on and it will, additionally, alert this item exactly on slide 3.
+
+Not all commands can take an action specification. Currently, only |\item| (though not in |article| mode currently), |\action|, the environment |actionenv|, and the block environments (like |block| or |theorem|) handle them.
 
 By default, the following actions are available:
 \begin{itemize}
 \item \declare{|alert|} alters the item or block.
-\item \declare{|uncover|} uncovers the item or block (this is
-  the default, if no action is specified).
-\item \declare{|only|} causes the whole item or block
-  to be inserted only on the specified slides.
-\item \declare{|visible|} causes the text to become visible only on
-  the specified slides (the difference between |uncover| and
-  |visible| is the same as between |\uncover| and |\visible|).
-\item \declare{|invisible|} causes the text to become invisible on the
-  specified slides.
+\item \declare{|uncover|} uncovers the item or block (this is the default, if no action is specified).
+\item \declare{|only|} causes the whole item or block to be inserted only on the specified slides.
+\item \declare{|visible|} causes the text to become visible only on the specified slides (the difference between |uncover| and |visible| is the same as between |\uncover| and |\visible|).
+\item \declare{|invisible|} causes the text to become invisible on the specified slides.
 \end{itemize}
 
-The rest of this section explains how you can add your own actions and
-make commands action-specification-aware. You may wish to skip it upon
-first reading.
-
-You can easily add your own actions: An action specification like
-\meta{action}|@|\meta{slide numbers} simply inserts an environment
-called \meta{action}|env| around the |\item| or parameter of
-|\action| with |<|\meta{slide numbers}|>| as overlay
-specification. Thus, by defining a new overlay-specification-aware
-environment named \meta{my action name}|env|, you can add your own
-action:
+The rest of this section explains how you can add your own actions and make commands action-specification-aware. You may wish to skip it upon first reading.
+
+You can easily add your own actions: An action specification like \meta{action}|@|\meta{slide numbers} simply inserts an environment called \meta{action}|env| around the |\item| or parameter of |\action| with |<|\meta{slide numbers}|>| as overlay specification. Thus, by defining a new overlay-specification-aware environment named \meta{my action name}|env|, you can add your own action:
 \begin{verbatim}
 \newenvironment{checkenv}{\only{\setbeamertemplate{itemize item}{X}}}{}
 \end{verbatim}
-You can then  write
+
+You can then write
 \begin{verbatim}
 \item<beamer:check@2> Text.
 \end{verbatim}
-This will change the itemization symbol before |Text.| to |X| on
-slide~2 in |beamer| mode. The definition of |checkenv| used the fact
-that |\only| also accepts an overlay-specification given after its
-argument. 
 
-The whole action mechanism is base on the following environment:
+This will change the itemization symbol before |Text.| to |X| on slide~2 in |beamer| mode. The definition of |checkenv| used the fact that |\only| also accepts an overlay-specification given after its argument.
+
+The whole action mechanism is based on the following environment:
 
 \begin{environment}{{actionenv}\sarg{action specification}}
-  This environment extracts all actions from the \meta{action
-    specification} for the current mode. For each action of the form
-  \meta{action}|@|\meta{slide numbers}, it inserts the following text:
-  |\begin{|\meta{action}|env}<|\meta{slide number}|>| at the
-  beginning of the environment and the text |\end{|\meta{action}|env}|
-  at the end. If there are several action specifications, several
-  environments are opened (and closed in the appropriate order). An
-  \meta{overlay specification} without an action is promoted to
-  |uncover@|\meta{overlay specification}.
-
-  If the so called \emph{default overlay specification} is not empty,
-  it will be used in case no \meta{action specification} is given. The
-  default overlay specification is usually just empty, but it may be
-  set either by providing an additional optional argument to the
-  command |\frame| or to the environments |itemize|, |enumerate|, or
-  |description| (see these for details). Also, the default action
-  specification can be set using the command
-  |\beamerdefaultoverlayspecification|, see below.
- 
-  \example 
+  This environment extracts all actions from the \meta{action specification} for the current mode. For each action of the form \meta{action}|@|\meta{slide numbers}, it inserts the following text: |\begin{|\meta{action}|env}<|\meta{slide number}|>| at the beginning of the environment and the text |\end{|\meta{action}|env}| at the end. If there are several action specifications, several environments are opened (and closed in the appropriate order). An \meta{overlay specification} without an action is promoted to |uncover@|\meta{overlay specification}.
+
+  If the so called \emph{default overlay specification} is not empty, it will be used in case no \meta{action specification} is given. The default overlay specification is usually just empty, but it may be set either by providing an additional optional argument to the command |\frame| or to the environments |itemize|, |enumerate|, or |description| (see these for details). Also, the default action specification can be set using the command |\beamerdefaultoverlayspecification|, see below.
+
+  \example
 \begin{verbatim}
 \begin{frame}
   \begin{actionenv}<2-| alert@3-4,6>
@@ -970,53 +659,35 @@ The whole action mechanism is base on the following environment:
   \end{uncoverenv}
 \end{frame}
 \end{verbatim}
-\end{environment} 
- 
+\end{environment}
+
 \begin{command}{\action\sarg{action specification}\marg{text}}
   This has the same effect as putting \meta{text} in an |actionenv|.
 
-  \example |\action<alert@2>{Could also have used \alert<2>{}.}|
+  \example
+  |\action<alert@2>{Could also have used \alert<2>{}.}|
 \end{command}
 
-\begin{command}{\beamerdefaultoverlayspecification\marg{default
-      overlay specification}}
-  Locally sets the default overlay specification to the given
-  value. This overlay specification will be used in every |actionenv|
-  environment and every |\item| that does not have its own overlay
-  specification. The main use of this command is to install an
-  incremental overlay specification like |<+->| or
-  \verb/<+-| alert@+>/, see Section~\ref{section-incremental}.
-
-  Usually, the default overlay specification is installed
-  automatically by the optional arguments to |\frame|, |frame|,
-  |itemize|, |enumerate|, and |description|. You will only have to use
-  this command if you wish to do funny things.
-
-  If given outside any frame, this command sets the default overlay
-  specification for all following frames for which you do not override
-  the default overlay specification.
-
-  \example |\beamerdefaultoverlayspecification{<+->}|
-
-  \example |\beamerdefaultoverlayspecification{}| clears the default
-  overlay specification. (Actually, it installs the default overlay
-  specification |<*>|, which just means ``always,'' but the
-  ``portable'' way of clearing the default overlay specification is
-  this call.)
-\end{command}
+\begin{command}{\beamerdefaultoverlayspecification\marg{default overlay specification}}
+  Locally sets the default overlay specification to the given value. This overlay specification will be used in every |actionenv| environment and every |\item| that does not have its own overlay specification. The main use of this command is to install an incremental overlay specification like |<+->| or \verb/<+-| alert@+>/, see Section~\ref{section-incremental}.
+
+  Usually, the default overlay specification is installed automatically by the optional arguments to |\frame|, |frame|, |itemize|, |enumerate|, and |description|. You will only have to use this command if you wish to do funny things.
 
+  If given outside any frame, this command sets the default overlay specification for all following frames for which you do not override the default overlay specification.
 
+  \example
+  |\beamerdefaultoverlayspecification{<+->}|
+
+  \example
+  |\beamerdefaultoverlayspecification{}| clears the default overlay specification. (Actually, it installs the default overlay specification |<*>|, which just means ``always,'' but the ``portable'' way of clearing the default overlay specification is this call.)
+\end{command}
 
 \subsubsection{Incremental Specifications}
 \label{section-incremental}
 
-This section is mostly important for people who have already used
-overlay specifications a lot and have grown tired of writing things
-like |<1->|, |<2->|, |<3->|, and so on again and again. You should
-skip this section on first reading.
+This section is mostly important for people who have already used overlay specifications a lot and have grown tired of writing things like |<1->|, |<2->|, |<3->|, and so on again and again. You should skip this section on first reading.
 
-Often you want to have overlay specifications that follow a pattern
-similar to the following:
+Often you want to have overlay specifications that follow a pattern similar to the following:
 \begin{verbatim}
 \begin{itemize}
 \item<1-> Apple
@@ -1025,14 +696,10 @@ similar to the following:
 \item<4-> Orange
 \end{itemize}
 \end{verbatim}
-The problem starts if you decide to insert a new fruit, say, at the
-beginning. In this case, you would have to adjust all of the overlay
-specifications. Also, if you add a |\pause| command before the
-|itemize|, you would also have to update the overlay specifications.
-
-\beamer\ offers a special syntax to make creating lists as the one
-above more ``robust.'' You can replace it by the following list of
-\emph{incremental overlay specifications}:
+
+The problem starts if you decide to insert a new fruit, say, at the beginning. In this case, you would have to adjust all of the overlay specifications. Also, if you add a |\pause| command before the |itemize|, you would also have to update the overlay specifications.
+
+\beamer\ offers a special syntax to make creating lists as the one above more ``robust.'' You can replace it by the following list of \emph{incremental overlay specifications}:
 \begin{verbatim}
 \begin{itemize}
 \item<+-> Apple
@@ -1041,19 +708,10 @@ above more ``robust.'' You can replace it by the following list of
 \item<+-> Orange
 \end{itemize}
 \end{verbatim}
-The effect of the |+|-sign is the following: You can use it in any
-overlay specification at any point where you would usually use a
-number. If a |+|-sign is encountered, it is replaced by the current
-value of the \LaTeX\ counter |beamerpauses|, which is 1 at the
-beginning of the frame. Then the counter is increased by 1, though it
-is only increased once for every overlay specification, even if the
-specification contains multiple |+|-signs (they are replaced by the
-same number).
-
-In the above example, the first specification is replaced by
-|<1->|. Then the second is replaced by |<2->| and so forth. We can now
-easily insert new entries, without having to change anything. We might
-also write the following:
+
+The effect of the |+|-sign is the following: You can use it in any overlay specification at any point where you would usually use a number. If a |+|-sign is encountered, it is replaced by the current value of the \LaTeX\ counter |beamerpauses|, which is 1 at the beginning of the frame. Then the counter is increased by 1, though it is only increased once for every overlay specification, even if the specification contains multiple |+|-signs (they are replaced by the same number).
+
+In the above example, the first specification is replaced by |<1->|. Then the second is replaced by |<2->| and so forth. We can now easily insert new entries, without having to change anything. We might also write the following:
 \begin{verbatim}
 \begin{itemize}
 \item<+-| alert@+> Apple
@@ -1062,12 +720,8 @@ also write the following:
 \item<+-| alert@+> Orange
 \end{itemize}
 \end{verbatim}
-This will alert the current item when it is uncovered. For example,
-the first specification \verb/<+-| alert@+>/ is replaced by
-\verb/<1-| alert@1>/, the second is replaced by \verb/<2-| alert@2>/, and so on.
-Since the |itemize| environment also allows you to specify a default
-overlay specification, see the documentation of that environment, the
-above example can be written even more economically as follows:
+
+This will alert the current item when it is uncovered. For example, the first specification \verb/<+-| alert@+>/ is replaced by \verb/<1-| alert@1>/, the second is replaced by \verb/<2-| alert@2>/, and so on. Since the |itemize| environment also allows you to specify a default overlay specification, see the documentation of that environment, the above example can be written even more economically as follows:
 \begin{verbatim}
 \begin{itemize}[<+-| alert@+>]
 \item Apple
@@ -1077,23 +731,11 @@ above example can be written even more economically as follows:
 \end{itemize}
 \end{verbatim}
 
-The |\pause| command also updates the counter |beamerpauses|. You can
-change this counter yourself using the normal \LaTeX\ commands
-|\setcounter| or |\addtocounter|.
-
-Any occurence of a |+|-sign may be followed by an \emph{offset} in
-round brackets. This offset will be added to the value of
-|beamerpauses|. Thus, if |beamerpauses| is 2, then |<+(1)->| expands to
-|<3->| and |<+(-1)-+>| expands to |<1-2>|. 
-
-There is another special sign you can use in an overlay specification
-that behaves similarly to the |+|-sign: a dot. When you write |<.->|,
-a similar thing as in |<+->| happens \emph{except that the counter
-  |beamerpauses| is not incremented} and \emph{except that you get the
-  value of |beamerpauses| decreased by one}. Thus a dot, possibly
-followed by an offset, just expands to the current value of the
-counter |beamerpauses| minus one, possibly offset. This dot notation
-can be useful in case like the following:
+The |\pause| command also updates the counter |beamerpauses|. You can change this counter yourself using the normal \LaTeX\ commands |\setcounter| or |\addtocounter|.
+
+Any occurence of a |+|-sign may be followed by an \emph{offset} in round brackets. This offset will be added to the value of |beamerpauses|. Thus, if |beamerpauses| is 2, then |<+(1)->| expands to |<3->| and |<+(-1)-+>| expands to |<1-2>|.
+
+There is another special sign you can use in an overlay specification that behaves similarly to the |+|-sign: a dot. When you write |<.->|, a similar thing as in |<+->| happens \emph{except that the counter |beamerpauses| is not incremented} and \emph{except that you get the value of |beamerpauses| decreased by one}. Thus a dot, possibly followed by an offset, just expands to the current value of the counter |beamerpauses| minus one, possibly offset. This dot notation can be useful in case like the following:
 \begin{verbatim}
 \begin{itemize}[<+->]
 \item Apple
@@ -1102,26 +744,14 @@ can be useful in case like the following:
 \item Orange
 \end{itemize}
 \end{verbatim}
-In the example, the second item is shown at the same time as the first
-one since it does not update the counter.
 
-In the following example, each time an item is uncovered, the
-specified text is alerted. When the next item is uncovered, this
-altering ends.
+In the example, the second item is shown at the same time as the first one since it does not update the counter.
+
+In the following example, each time an item is uncovered, the specified text is alerted. When the next item is uncovered, this altering ends.
 \begin{verbatim}
 \begin{itemize}[<+->]
 \item This is \alert<.>{important}.
 \item We want to \alert<.>{highlight} this and \alert<.>{this}.
 \item What is the \alert<.>{matrix}?
-\end{itemize}  
+\end{itemize}
 \end{verbatim}
-
-
-
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-solutions.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-solutions.tex
index d5413c0cf0f..74bb5d29be6 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-solutions.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-solutions.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,36 +8,16 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-solutions.tex,v 1.4 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Solution Templates}
 \label{section-solutions}
 
-In the subdirectories of the directory |beamer/solutions| you will
-find \emph{solution templates} in different languages. A solution
-template is a \TeX-text that ``solves'' a specific problem. Such a
-problem might be ``I need to create a 20 minute talk for a
-conference'' or ``I want to create a slide that introduces the next
-speaker'' or ``I want to create a table that is uncovered piecewise.''
-For such a problem, a solution template consists of a mixture of a
-template and an example that can be used to solve this particular
-problem. Just copy the solution template file (or parts of it) and
-freely adjust them to your needs.  
+In the subdirectories of the directory |beamer/solutions| you will find \emph{solution templates} in different languages. A solution template is a \TeX-text that ``solves'' a specific problem. Such a problem might be ``I need to create a 20 minute talk for a conference'' or ``I want to create a slide that introduces the next speaker'' or ``I want to create a table that is uncovered piecewise.'' For such a problem, a solution template consists of a mixture of a template and an example that can be used to solve this particular problem. Just copy the solution template file (or parts of it) and freely adjust them to your needs.
 
-The collecting of \beamer\ solution templates has only begun and
-currently there are only very few of them. I hope that in the future
-more solutions will become available and I would like to encourage
-users of the \beamer\ class to send me solutions they develop. I would
-also like to encourage users to help in translating solutions to
-languages other than English and German. If you have written a
-solution or a translation, please feel free to send it to me (make
-sure however, that it contains about the same amount of explanations
-and justifications as do the existing solutions).
-
-The following list of solution templates is sorted by the length of
-the talks for which they provide a template. As always, the solutions
-can be found in the directory |beamer/solutions|.
+The collecting of \beamer\ solution templates has only begun and currently there are only very few of them. We hope that in the future more solutions will become available and we would like to encourage users of the \beamer\ class to send us solutions they develop. We would also like to encourage users to help in translating solutions to languages other than English and German. If you have written a solution or a translation, please feel free to send it to us (make sure however, that it contains about the same amount of explanations and justifications as do the existing solutions).
 
+The following list of solution templates is sorted by the length of the talks for which they provide a template. As always, the solutions can be found in the directory |beamer/solutions|.
 
 \begin{solution}{short-talks/speaker\_introduction-ornate-2min}
   \begin{itemize}
@@ -47,8 +28,12 @@ can be found in the directory |beamer/solutions|.
   \item
     Ornate style.
   \end{itemize}
-  \beamernote \TeX-version available in languages |de|, |en|, and |fr|.
-  \lyxnote    \LyX-version available in languages |de| and |en|.
+
+  \beamernote
+  \TeX-version available in languages |de|, |en|, and |fr|.
+
+  \lyxnote
+  \LyX-version available in languages |de| and |en|.
 \end{solution}
 
 \begin{solution}{generic-talks/generic-ornate-15min-45min}
@@ -60,8 +45,12 @@ can be found in the directory |beamer/solutions|.
   \item
     Ornate style.
   \end{itemize}
-  \beamernote \TeX-version available in languages |de|, |en|, and |fr|.
-  \lyxnote    \LyX-version available in languages |de| and |en|.
+
+  \beamernote
+  \TeX-version available in languages |de|, |en|, and |fr|.
+
+  \lyxnote
+  \LyX-version available in languages |de| and |en|.
 \end{solution}
 
 \begin{solution}{conference-talks/conference-ornate-20min}
@@ -73,8 +62,10 @@ can be found in the directory |beamer/solutions|.
   \item
     Ornate style.
   \end{itemize}
-  \beamernote \TeX-version available in languages |de|, |en|, and |fr|.
-  \lyxnote    \LyX-version available in languages |de| and |en|.
-\end{solution}
 
+  \beamernote
+  \TeX-version available in languages |de|, |en|, and |fr|.
 
+  \lyxnote
+  \LyX-version available in languages |de| and |en|.
+\end{solution}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-themes.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-themes.tex
index 54ac1809e17..6b42e89ef9a 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-themes.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-themes.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,154 +8,79 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-
 \section{Themes}
 
-
 \subsection{Five Flavors of Themes}
 
 \emph{Themes} make it easy to change the appearance of a
 presentation. The \beamer\ class uses five different kinds of themes:
 \begin{description}
 \item[Presentation Themes]
-  Conceptually, a presentation theme dictates for every single detail
-  of a presentation what it looks like. Thus, choosing a particular
-  presentation theme will setup for, say, the numbers in enumeration
-  what color they have, what color their background has, what font is
-  used to render them, whether a circle or ball or rectangle or
-  whatever is drawn behind them, and so forth. Thus, when you choose
-  a presentation theme, your presentation will look the way someone
-  (the creator of the theme) thought that a presentation should look
-  like. Presentation themes typically only choose a particular color
-  theme, font theme, inner theme, and outer theme that go well
-  together. 
+  Conceptually, a presentation theme dictates for every single detail of a presentation what it looks like. Thus, choosing a particular presentation theme will setup for, say, the numbers in enumeration what color they have, what color their background has, what font is used to render them, whether a circle or ball or rectangle or whatever is drawn behind them, and so forth. Thus, when you choose a presentation theme, your presentation will look the way someone (the creator of the theme) thought that a presentation should look like. Presentation themes typically only choose a particular color theme, font theme, inner theme, and outer theme that go well together.
 \item[Color Themes]
-  A color theme only dictates which colors are used in a
-  presentation. If you have chosen a particular presentation theme
-  and then choose a color theme, only the colors of your presentation
-  will change. A color theme can specify colors in a very detailed
-  way: For example, a color theme can specifically change the colors
-  used to render, say, the border of a button, the background of a
-  button, and the text on a button.
+  A color theme only dictates which colors are used in a presentation. If you have chosen a particular presentation theme and then choose a color theme, only the colors of your presentation will change. A color theme can specify colors in a very detailed way: For example, a color theme can specifically change the colors used to render, say, the border of a button, the background of a button, and the text on a button.
 \item[Font Themes]
-  A font theme dictates which fonts or font attributes are used in a
-  presentation. As for colors, the font of all text elements used in a
-  presentation can be specified independently.
+  A font theme dictates which fonts or font attributes are used in a presentation. As for colors, the font of all text elements used in a presentation can be specified independently.
 \item[Inner Themes]
-  An inner theme specifies how certain elements of a
-  presentation are typeset. This includes all elements that are at the
-  ``inside'' of the frame, that is, that are not part of the headline,
-  footline, or sidebars. This includes all enumerations, itemize
-  environments, block environments, theorem environments, or the table of
-  contents. For example, an inner theme might
-  specify that in an enumeration the number should be typeset without
-  a dot and that a small circle should be shown behind it. The inner
-  theme would \emph{not} specify what color should be used for the
-  number or the circle (this is the job of the color theme) nor which font
-  should be used (this is the job of the font theme).
+  An inner theme specifies how certain elements of a presentation are typeset. This includes all elements that are at the ``inside'' of the frame, that is, that are not part of the headline, footline, or sidebars. This includes all enumerations, itemize environments, block environments, theorem environments, or the table of contents. For example, an inner theme might specify that in an enumeration the number should be typeset without a dot and that a small circle should be shown behind it. The inner theme would \emph{not} specify what color should be used for the number or the circle (this is the job of the color theme) nor which font should be used (this is the job of the font theme).
 \item[Outer Themes]
-  An outer theme specifies what the ``outside'' or ``border'' of the
-  presentation slides should look like. It specifies whether there are
-  head- and footlines, what is shown in them, whether there is a
-  sidebar, where the logo goes, where the navigation symbols and bars
-  go, and so on. It also specifies where the frametitle is put and how
-  it is typeset. 
+  An outer theme specifies what the ``outside'' or ``border'' of the presentation slides should look like. It specifies whether there are head- and footlines, what is shown in them, whether there is a sidebar, where the logo goes, where the navigation symbols and bars go, and so on. It also specifies where the frametitle is put and how it is typeset.
 \end{description}
 
-The different themes reside in the four subdirectories |theme|, |color|,
-|font|, |inner|, and |outer| of the directory
-|beamer/themes|. Internally, a theme is stored as a normal style
-file. However, to use a theme, the following special commands should
-be used:
+The different themes reside in the five subdirectories |theme|, |color|, |font|, |inner|, and |outer| of the directory |beamer/themes|. Internally, a theme is stored as a normal style file. However, to use a theme, the following special commands should be used:
 
 \begin{command}{\usetheme\oarg{options}\marg{name list}}
-  Installs the presentation theme named \meta{name}. Currently, the
-  effect of this command is the same as saying |\usepackage| for the 
-  style file named |beamertheme|\meta{name}|.sty| for each \meta{name}
-  in the \meta{name list}.  
+  Installs the presentation theme named \meta{name}. Currently, the effect of this command is the same as saying |\usepackage| for the style file named |beamertheme|\meta{name}|.sty| for each \meta{name} in the \meta{name list}.
 \end{command}
 
 
 \begin{command}{\usecolortheme\oarg{options}\marg{name list}}
-  Same as |\usetheme|, only for color themes. Color style files
-  are named |beamercolortheme|\meta{name}|.sty|.
+  Same as |\usetheme|, only for color themes. Color style files are named |beamercolortheme|\meta{name}|.sty|.
 \end{command}
 
 \begin{command}{\usefonttheme\oarg{options}\marg{name}}
-  Same as |\usetheme|, only for font themes. Font style files
-  are named |beamerfonttheme|\meta{name}|.sty|.
+  Same as |\usetheme|, only for font themes. Font style files are named |beamerfonttheme|\meta{name}|.sty|.
 \end{command}
 
 \begin{command}{\useinnertheme\oarg{options}\marg{name}}
-  Same as |\usetheme|, only for inner themes. Inner style files
-  are named |beamerinnertheme|\meta{name}|.sty|.
+  Same as |\usetheme|, only for inner themes. Inner style files are named |beamerinnertheme|\meta{name}|.sty|.
 \end{command}
 
 \begin{command}{\useoutertheme\oarg{options}\marg{name}}
-  Same as |\usetheme|, only for outer themes. Outer style files
-  are named |beameroutertheme|\meta{name}|.sty|.
+  Same as |\usetheme|, only for outer themes. Outer style files are named |beameroutertheme|\meta{name}|.sty|.
 \end{command}
 
-If you do not use any of these commands, a sober \emph{default} theme
-is used for all of them. In the following, the presentation themes
-that come with the \beamer\ class are described. The element, layout,
-color, and font themes  are presented in the following sections.
-
+If you do not use any of these commands, a sober \emph{default} theme is used for all of them. In the following, the presentation themes that come with the \beamer\ class are described. The element, layout, color, and font themes  are presented in the following sections.
 
 
 \subsection{Presentation Themes without Navigation Bars}
 
-A presentation theme dictates for every single detail
-of a presentation what it looks like. Normally, having chosen a
-particular presentation theme, you do not need to specify anything
-else having to do with the appearance of your presentation---the
-creator of the theme should have taken of that for you. However, you
-still \emph{can} change things afterward either by using a different
-color, font, element, or even layout theme; or by changing specific
-colors, fonts, or templates directly.
-
-When I started naming the presentation themes, I soon ran out of ideas
-on how to call them. Instead of giving them more and more cumbersome
-names, I decided to switch to a different naming convention:
-Except for two special cases, all presentation themes are named after
-cities. These cities happen to be cities in which or near which there
-was a conference or workshop that I attended or that a
-co-author of mine attended.
-
-If a theme has not been developped by me (that is, if someone else is
-to blame), this is indicated with the theme. I have sometimes slightly
-changed or ``corrected'' submitted themes, but I still list the
-original authors. 
+A presentation theme dictates for every single detail of a presentation what it looks like. Normally, having chosen a particular presentation theme, you do not need to specify anything else having to do with the appearance of your presentation---the creator of the theme should have taken care of that for you. However, you still \emph{can} change things afterward either by using a different color, font, element, or even layout theme; or by changing specific colors, fonts, or templates directly.
+
+When Till started naming the presentation themes, he soon ran out of ideas on how to call them. Instead of giving them more and more cumbersome names, he decided to switch to a different naming convention: Except for two special cases, all presentation themes are named after cities. These cities happen to be cities in which or near which there was a conference or workshop that he attended or that a co-author of his attended.
 
+All themes listed without author mentioned were developed by Till. If a theme has not been developped by us (that is, if someone else is to blame), this is indicated with the theme. We have sometimes slightly changed or ``corrected'' submitted themes, but we still list the original authors.
 
 \begin{themeexample}{default}
-  As the name suggests, this theme is installed by default. It is a
-  sober no-nonsense theme that makes minimal use of color or font
-  variations. This theme is useful for all kinds of talks, except for
-  very long talks.
+  As the name suggests, this theme is installed by default. It is a sober no-nonsense theme that makes minimal use of color or font variations. This theme is useful for all kinds of talks, except for very long talks.
 \end{themeexample}
 
-
 \begin{themeexample}[{\opt{|[headheight=|\meta{head height}|,footheight=|\meta{foot height}|]|}}]{boxes}
-  For this theme, you can specify an arbitrary number of templates for
-  the boxes in the headline and in the footline. You can add a
-  template for another box by using the following commands.
+  For this theme, you can specify an arbitrary number of templates for the boxes in the headline and in the footline. You can add a template for another box by using the following commands.
 
   \begin{command}{\addheadbox\marg{beamer color}\marg{box template}}
-    Each time this command is invoked, a new box is added to the head
-    line, with the first added box being shown on the left. All boxes
-    will have the same size.
+    Each time this command is invoked, a new box is added to the head line, with the first added box being shown on the left. All boxes will have the same size.
+
+    The \meta{beamer color} will be used to setup the foreground and background colors of the box.
 
-    The \meta{beamer color} will be used to setup the foreground and
-    background colors of the box.
     \example
 \begin{verbatim}
 \addheadbox{section in head/foot}{\tiny\quad 1. Box}
 \addheadbox{structure}{\tiny\quad 2. Box}
 \end{verbatim}
 
-    A similar effect as the above commands can be achieved by directly
-    installing a head template that contains two |beamercolorbox|es:
+    A similar effect as the above commands can be achieved by directly installing a head template that contains two |beamercolorbox|es:
+
 \begin{verbatim}
 \setbeamertemplate{headline}
 {\leavevmode
@@ -166,8 +92,8 @@ original authors.
 \end{beamercolorbox}
 }
 \end{verbatim}
-    While being more complicated, the above commands offer more
-    flexibility.     
+
+    While being more complicated, the above commands offer more flexibility.
   \end{command}
 
   \begin{command}{\addfootbox\marg{beamer color}\marg{box template}}
@@ -180,44 +106,30 @@ original authors.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Bergen}
-  A theme based on the |inmargin| inner theme and the |rectangles|
-  inner theme. Using this theme is not quite trivial since getting the
-  spacing right can be trickier than with most other themes. Also, this
-  theme goes badly with columns. You may wish to consult the remarks
-  on the |inmargin| inner theme.
+  A theme based on the |inmargin| inner theme and the |rectangles| inner theme. Using this theme is not quite trivial since getting the spacing right can be trickier than with most other themes. Also, this theme goes badly with columns. You may wish to consult the remarks on the |inmargin| inner theme.
 
   Bergen is a town in Norway. It hosted \textsc{iwpec} 2004.
 \end{themeexample}
 
-
 \begin{themeexample}[\oarg{options}]{Boadilla}
-  A theme giving much information on little space.
-  The following \meta{options} may be given:
+  A theme giving much information in little space. The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|secheader|} causes a headline to be inserted showing
-    the current section and subsection. By default, this
-    headline is not shown.
+  \item \declare{|secheader|} causes a headline to be inserted showing the current section and subsection. By default, this headline is not shown.
   \end{itemize}
 
-  \themeauthor Manuel Carro. Boadilla is a village in the vicinity of
-  Madrid, hosting the Univeristy's Computer Science department.
+  \themeauthor Manuel Carro. Boadilla is a village in the vicinity of Madrid, hosting the Univeristy's Computer Science department.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Madrid}
-  Like the |Boadilla| theme, except that stronger colors are used and
-  that the itemize icons are not modified. The same \meta{options} as
-  for the |Boadilla| theme may be given.
+  Like the |Boadilla| theme, except that stronger colors are used and that the itemize icons are not modified. The same \meta{options} as for the |Boadilla| theme may be given.
 
   \themeauthor Manuel Carro. Madrid is the capital of Spain.
 \end{themeexample}
 
-
 \begin{themeexample}{AnnArbor}
-  Like |Boadille|, but using the colors of the University of
-  Michigan.
+  Like |Boadille|, but using the colors of the University of Michigan.
 
-  \themeauthor Madhusudan Singh. The University of Michigan is located
-  at Ann Arbor.
+  \themeauthor Madhusudan Singh. The University of Michigan is located at Ann Arbor.
 \end{themeexample}
 
 \begin{themeexample}{CambridgeUS}
@@ -226,198 +138,139 @@ original authors.
   \themeauthor Madhusudan Singh.
 \end{themeexample}
 
-
 \begin{themeexample}{Pittsburgh}
-  A sober theme. The right-flushed frame titles creates an interesting 
-  ``tension'' inside each frame.
+  A sober theme. The right-flushed frame titles creates an interesting ``tension'' inside each frame.
 
-  Pittsburgh is a town in the eastern USA. It hosts the second
-  \textsc{recomb} workshop of \textsc{snp}s and haplotypes, 2004.
+  Pittsburgh is a town in the eastern USA. It hosts the second \textsc{recomb} workshop of \textsc{snp}s and haplotypes, 2004.
 \end{themeexample}
 
-
 \begin{themeexample}[\oarg{options}]{Rochester}
-  A dominant theme without any navigational elements. It can be made less
-  dominant by using a different color theme.
+  A dominant theme without any navigational elements. It can be made less dominant by using a different color theme.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|height=|\meta{dimension}} sets the height of the
-    frame title bar.
+  \item \declare{|height=|\meta{dimension}} sets the height of the frame title bar.
   \end{itemize}
 
-  Rochester is a town in upstate New York, USA. I visited Rochester in 2001.
+  Rochester is a town in upstate New York, USA. Till visited Rochester in 2001.
 \end{themeexample}
 
 
-
-
 \subsection{Presentation Themes with a Tree-Like Navigation Bar}
 
 \begin{themeexample}{Antibes}
-  A dominant theme with a tree-like navigation at the top. The 
-  rectangular elements mirror the rectangular navigation at the
-  top. The theme can be made less dominant by using a different color
-  theme.
+  A dominant theme with a tree-like navigation at the top. The rectangular elements mirror the rectangular navigation at the top. The theme can be made less dominant by using a different color theme.
 
   Antibes is a town in the south of France. It hosted \textsc{stacs} 2002.
 \end{themeexample}
 
 \begin{themeexample}{JuanLesPins}
-  A variation on the |Antibes| theme that has a much ``smoother''
-  appearance. It can be made less dominant by choosing a different
-  color theme.
+  A variation on the |Antibes| theme that has a much ``smoother'' appearance. It can be made less dominant by choosing a different color theme.
 
   Juan--Les--Pins is a cozy village near Antibes. It hosted \textsc{stacs} 2002.
 \end{themeexample}
 
-
 \begin{themeexample}{Montpellier}
-  A sober theme giving basic navigational hints. The headline can be
-  made more dominant by using a different color theme.
+  A sober theme giving basic navigational hints. The headline can be made more dominant by using a different color theme.
 
   Montpellier is in the south of France. It hosted \textsc{stacs} 2004.
 \end{themeexample}
 
 
-
 \subsection{Presentation Themes with a Table of Contents Sidebar}
 
 \begin{themeexample}[\oarg{options}]{Berkeley}
-  A dominant theme. If the navigation bar is on the left, it dominates
-  since it is seen first. The height of the frame title is fixed to
-  two and a half lines, thus you should be careful with overly long
-  titles. A logo will be put in the corner area. Rectangular areas
-  dominate the layout. The theme can be made less dominant by using a
-  different color theme.
-
-  By default, the current entry of the table of contents in the
-  sidebar will be hilighted by using a more vibrant color. A good
-  alternative is to hilight the current entry by using a different
-  color for the background of the current point. The color theme
-  |sidebartab| installs the appropriate colors, so you just have to
-  say
+  A dominant theme. If the navigation bar is on the left, it dominates since it is seen first. The height of the frame title is fixed to two and a half lines, thus you should be careful with overly long titles. A logo will be put in the corner area. Rectangular areas dominate the layout. The theme can be made less dominant by using a different color theme.
+
+  By default, the current entry of the table of contents in the sidebar will be highlighted by using a more vibrant color. A good alternative is to highlight the current entry by using a different color for the background of the current point. The color theme |sidebartab| installs the appropriate colors, so you just have to say
 \begin{verbatim}
 \usecolorhteme{sidebartab}
 \end{verbatim}
-  This color theme works with all themes that show a table of contents
-  in the sidebar.
 
-  This theme is useful for long talks like lectures that require a
-  table of contents to be visible all the time.
+  This color theme works with all themes that show a table of contents in the sidebar.
+
+  This theme is useful for long talks like lectures that require a table of contents to be visible all the time.
 
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|hideallsubsections|} causes only sections to be
-    shown in the sidebar. This is useful, if you need to save
-    space.
-  \item \declare{|hideothersubsections|} causes only the subsections
-    of the current section to be shown. This is useful, if you need to
-    save  space.      
+  \item \declare{|hideallsubsections|} causes only sections to be shown in the sidebar. This is useful, if you need to save space.
+  \item \declare{|hideothersubsections|} causes only the subsections of the current section to be shown. This is useful, if you need to save space.
   \item \declare{|left|} puts the sidebar on the left (default).
   \item \declare{|right|} puts the sidebar on the right.
-  \item \declare{|width=|\meta{dimension}} sets the width of the
-    sidebar. If set to zero, no sidebar is created.
+  \item \declare{|width=|\meta{dimension}} sets the width of the sidebar. If set to zero, no sidebar is created.
   \end{itemize}
 
-  Berkeley is on the western coast of the USA, near San Francisco. I
-  visited Berkeley for a year in 2004.
+  Berkeley is on the western coast of the USA, near San Francisco. Till visited Berkeley for a year in 2004.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{PaloAlto}
-  A variation in the |Berkeley| theme with less dominance of
-  rectangular areas. The same \meta{options} as for the |Berkeley|
-  theme can be given. 
+  A variation in the |Berkeley| theme with less dominance of rectangular areas. The same \meta{options} as for the |Berkeley| theme can be given.
 
-  Palo Alto is also near San Francisco. It hosted the Bay Area Theory
-  Workshop 2004.
+  Palo Alto is also near San Francisco. It hosted the Bay Area Theory Workshop 2004.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Goettingen}
-  A relatively sober theme useful for a longer talk that demands a
-  sidebar with a full table of contents.  The same \meta{options} as
-  for the |Berkeley| theme can be given. 
+  A relatively sober theme useful for a longer talk that demands a sidebar with a full table of contents.  The same \meta{options} as for the |Berkeley| theme can be given.
 
-  G\"ottingen is a town in Germany. It hosted the 42nd Theorietag. 
+  G\"ottingen is a town in Germany. It hosted the 42nd Theorietag.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Marburg}
-  A very dominant variation of the |Goettingen| theme. The same
-  \meta{options} may be given.
+  A very dominant variation of the |Goettingen| theme. The same \meta{options} may be given.
 
-  Marburg is a town in Germany. It hosted the 46th Theorietag. 
+  Marburg is a town in Germany. It hosted the 46th Theorietag.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Hannover}
-  In this theme, the sidebar on the left is balanced by
-  right-flushed frame titles.
-    
+  In this theme, the sidebar on the left is balanced by right-flushed frame titles.
+
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|hideallsubsections|} causes only sections to be
-    shown in the sidebar. This is useful, if you need to save
-    space.
-  \item \declare{|hideothersubsections|} causes only the subsections
-    of the current section to be shown. This is useful, if you need to
-    save  space.      
-  \item \declare{|width=|\meta{dimension}} sets the width of the
-    sidebar.
+  \item \declare{|hideallsubsections|} causes only sections to be shown in the sidebar. This is useful, if you need to save space.
+  \item \declare{|hideothersubsections|} causes only the subsections of the current section to be shown. This is useful, if you need to save space.
+  \item \declare{|width=|\meta{dimension}} sets the width of the sidebar.
   \end{itemize}
 
-  Hannover is a town in Germany. It hosted the 48th Theorietag. 
+  Hannover is a town in Germany. It hosted the 48th Theorietag.
 \end{themeexample}
 
 
-
-
 \subsection{Presentation Themes with a Mini Frame Navigation}
 
 \begin{themeexample}[\oarg{options}]{Berlin}
-  A dominant theme with strong colors and dominating rectangular
-  areas. The head- and footlines give lots of information and leave
-  little space for the actual slide contents. This theme is useful for
-  conferences where the audience is not likely to know the title of
-  the talk or who is presenting it.  The theme can be made less
-  dominant by using a different color theme.
-  
+  A dominant theme with strong colors and dominating rectangular areas. The head- and footlines give lots of information and leave little space for the actual slide contents. This theme is useful for conferences where the audience is not likely to know the title of the talk or who is presenting it. The theme can be made less dominant by using a different color theme.
+
   The following \meta{options} may be given:
   \begin{itemize}
-  \item \declare{|compress|} causes the mini frames in the headline to
-    use only a single line. This is useful for saving space.
+  \item \declare{|compress|} causes the mini frames in the headline to use only a single line. This is useful for saving space.
   \end{itemize}
 
   Berlin is the capital of Germany.
 \end{themeexample}
 
 \begin{themeexample}[\oarg{options}]{Ilmenau}
-  A variation on the |Berlin| theme. The same \meta{options} may be
-  given.
+  A variation on the |Berlin| theme. The same \meta{options} may be given.
 
   Ilemanu is a town in Germany. It hosted the 40th Theorietag.
 \end{themeexample}
 
 \begin{themeexample}{Dresden}
-  A variation on the |Berlin| theme with a strong separation into
-  navigational stuff at the top/bottom and a sober main text. The same
-  \meta{options} may be given.
+  A variation on the |Berlin| theme with a strong separation into navigational stuff at the top/bottom and a sober main text. The same \meta{options} may be given.
 
   Dresden is a town in Germany. It hosted STACS 2001.
 \end{themeexample}
 
 
 \begin{themeexample}{Darmstadt}
-  A theme with a strong separation into a navigational upper part and
-  an informational main part. By using a different color theme, this
-  separation can be lessened.
+  A theme with a strong separation into a navigational upper part and an informational main part. By using a different color theme, this separation can be lessened.
 
-  Darmstadt is a town in Germany. 
+  Darmstadt is a town in Germany.
 \end{themeexample}
 
 \begin{themeexample}{Frankfurt}
-  A variation on the |Darmstadt| theme that is slightly less cluttered
-  by leaving out the subsection information.
+  A variation on the |Darmstadt| theme that is slightly less cluttered by leaving out the subsection information.
 
-  Frankfurt is a town in Germany. 
+  Frankfurt is a town in Germany.
 \end{themeexample}
 
 \begin{themeexample}{Singapore}
@@ -427,41 +280,32 @@ original authors.
 \end{themeexample}
 
 \begin{themeexample}{Szeged}
-  A sober theme with a strong dominance of horizontal lines. 
+  A sober theme with a strong dominance of horizontal lines.
 
   Szeged is on the south border of Hungary. It hosted \textsc{dlt} 2003.
 \end{themeexample}
 
 
-
-
 \subsection{Presentation Themes with Section and Subsection Tables}
 
 \begin{themeexample}{Copenhagen}
-  A not-quite-too-dominant theme. This theme gives compressed
-  information about the current section and subsection at the top and
-  about the title and the author at the bottom. No shadows are used,
-  giving the presentation a ``flat'' look. The theme can be made less
-  dominant by using a different color theme.
-
-  Copenhagen is the capital of Denmark. It is connected to Malm\"o by
-  the �resund bridge.
-\end{themeexample}
+  A not-quite-too-dominant theme. This theme gives compressed information about the current section and subsection at the top and about the title and the author at the bottom. No shadows are used, giving the presentation a ``flat'' look. The theme can be made less dominant by using a different color theme.
 
+  Copenhagen is the capital of Denmark. It is connected to Malm\"o by the \O resund bridge.
+\end{themeexample}
 
 \begin{themeexample}{Luebeck}
   A variation on the |Copenhagen| theme.
 
-  L�beck is a town in nothern Germany. It hosted the 41st Theorietag.
+  L\"ubeck is a town in nothern Germany. It hosted the 41st Theorietag.
 \end{themeexample}
 
 \begin{themeexample}{Malmoe}
   A more sober variation of the |Copenhagen| theme.
 
-  Malm� is a town in southern Sweden. It hosted \textsc{fct} 2001.
+  Malm\"o is a town in southern Sweden. It hosted \textsc{fct} 2001.
 \end{themeexample}
 
-
 \begin{themeexample}{Warsaw}
   A dominant variation of the |Copenhagen| theme.
 
@@ -471,14 +315,7 @@ original authors.
 
 \subsection{Presentation Themes Included For Compatibility}
 
-Earlier versions of \beamer\ included some further themes. These
-themes are still available for compatibility, though they are now
-implemented differently (they also mainly install appropriate color,
-font, inner, and outer themes). However, they may or may not honour
-color themes and they will not be supported in the future. The
-following list shows which of the new themes should be used instead of
-the old themes. (When switching, you may want to use the font theme
-|structurebold| with the option |onlysmall|.)
+Earlier versions of \beamer\ included some further themes. These themes are still available for compatibility, though they are now implemented differently (they also mainly install appropriate color, font, inner, and outer themes). However, they may or may not honour color themes and they will not be supported in the future. The following list shows which of the new themes should be used instead of the old themes. (When switching, you may want to use the font theme |structurebold| with the option |onlysmall|.)
 
 \medskip
 \begin{tabular}{lp{13cm}}
@@ -493,11 +330,5 @@ the old themes. (When switching, you may want to use the font theme
   |shadow| & Try |Warsaw| instead. \\
   |split| & Try |Malmoe| instead. \\
   |tree| & Try |Montpellier| and, for the bars version, |Antibes| or
-  |JuansLesPins|. 
+  |JuansLesPins|.
 \end{tabular}
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-transparancies.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-transparancies.tex
index 3d0600c07e8..7f4c5665f79 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-transparancies.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-transparancies.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,109 +8,60 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-transparancies.tex,v 1.2 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Creating Transparancies}
-
 \label{section-trans}
 \label{trans}
 
-The main aim of the \beamer\ class is to create presentations for
-beamers. However, it is often useful to print transparencies as
-backup, in case the hardware fails. A transparencies version of a talk
-often has less slides than the main version, since it takes more time
-to switch slides, but it may have more slides than the handout
-version. For example, while in a handout an animation might be
-condensed to a single slide, you might wish to print several slides
-for the transparency version.
+The main aim of the \beamer\ class is to create presentations for beamers. However, it is often useful to print transparencies as backup, in case the hardware fails. A transparencies version of a talk often has less slides than the main version, since it takes more time to switch slides, but it may have more slides than the handout version. For example, while in a handout an animation might be condensed to a single slide, you might wish to print several slides for the transparency version.
 
-In order to create a transparencies version, specify the class option
-|trans|. If you do not specify anything else, this will cause
-all overlay specifications to be suppressed. For most cases this will
-create exactly the desired result.
+In order to create a transparencies version, specify the class option |trans|. If you do not specify anything else, this will cause all overlay specifications to be suppressed. For most cases this will create exactly the desired result.
 
 \begin{classoption}{trans}
   Create a version that uses the |trans| overlay specifications.
 \end{classoption}
 
-In some cases, you may want a more complex behaviour. For example, if
-you use many |\only| commands to draw an animation. In this case,
-suppressing all overlay specifications is not such a good idea, since
-this will cause all steps of the animation to be shown at the same
-time. In some cases this is not desirable. Also, it might be desirable
-to suppress some |\alert| commands that apply only to specific
-slides in the handout.
-
-For a fine-grained control of what is shown on a handout, you can use
-\emph{mode specifications}. They specify which slides
- of a frame should be shown for a special version, for example for the
-handout version. As explained in
-Section~\ref{section-concept-overlays}, a mode specification is written
-alongside the normal overlay specification inside the pointed
-brackets. It is separated from the normal specification by a vertical
-bar and a space. Here is an example:
+In some cases, you may want a more complex behaviour. For example, if you use many |\only| commands to draw an animation. In this case, suppressing all overlay specifications is not such a good idea, since this will cause all steps of the animation to be shown at the same time. In some cases this is not desirable. Also, it might be desirable to suppress some |\alert| commands that apply only to specific slides in the handout.
+
+For a fine-grained control of what is shown on a handout, you can use \emph{mode specifications}. They specify which slides of a frame should be shown for a special version, for example for the handout version. As explained in Section~\ref{section-concept-overlays}, a mode specification is written alongside the normal overlay specification inside the pointed brackets. It is separated from the normal specification by a vertical bar and a space. Here is an example:
 \begin{verbatim}
   \only<1-3,5-9| trans:2-3,5>{Text}
 \end{verbatim}
-This specification says: ``Normally (in |beamer| mode), insert the
-text on slides 1--3 and 5--9. For the transparencies version, insert
-the text only on slides 2,~3, and~5.'' If no special mode specification is
-given for |trans| mode, the default is ``always.'' This causes the
-desirable effect that if you do not specify anything, the overlay
-specification is effectively suppressed for the handout.
+
+This specification says: ``Normally (in |beamer| mode), insert the text on slides 1--3 and 5--9. For the transparencies version, insert the text only on slides 2,~3, and~5.'' If no special mode specification is given for |trans| mode, the default is ``always.'' This causes the desirable effect that if you do not specify anything, the overlay specification is effectively suppressed for the handout.
 
 An especially useful specification is the following:
 \begin{verbatim}
   \only<3| trans:0>{Not shown on transparancies.}
 \end{verbatim}
-Since there is no zeroth slide, the text is not shown. Likewise,
-\verb!\alert<3| trans:0>{Text}! will not alert the text on a
-transparancy.
 
-You can also use a mode specification for the overlay specification
-of the |{frame}| environment as in the following example.
+Since there is no zeroth slide, the text is not shown. Likewise, \verb!\alert<3| trans:0>{Text}! will not alert the text on a transparancy.
+
+You can also use a mode specification for the overlay specification of the |{frame}| environment as in the following example.
 \begin{verbatim}
 \begin{frame}<1-| trans:0>
   Text...
 \end{frame}
 \end{verbatim}
-This causes the frame to be suppressed in the transparancies
-version. Also, you can restrict the presentation such that only
-specific slides of the frame are shown on the handout:
+
+This causes the frame to be suppressed in the transparancies version. Also, you can restrict the presentation such that only specific slides of the frame are shown on the handout:
 \begin{verbatim}
 \begin{frame}<1-| trans:4-5>
   Text...
 \end{frame}
 \end{verbatim}
 
-It is also possible to give only an alternate overlay
-specification. For example, |\alert<trans:0>{...}| causes the
-text to be always hilighted during the presentation, but never on the
-transparancies version. Likewise, |\frame<trans:0>{...}| causes the
-frame to be suppressed for the handout.
-
-Finally, note that it is possible to give more than one alternate
-overlay specification and in any order. For example, the following
-specification states that the text should be inserted on the first
-three slides in the presentation, in the first two slides of the
-transparency version, and not at all in the handout.
+It is also possible to give only an alternate overlay specification. For example, |\alert<trans:0>{...}| causes the text to be always hilighted during the presentation, but never on the transparancies version. Likewise, |\frame<trans:0>{...}| causes the frame to be suppressed for the handout.
+
+Finally, note that it is possible to give more than one alternate overlay specification and in any order. For example, the following specification states that the text should be inserted on the first three slides in the presentation, in the first two slides of the transparency version, and not at all in the handout.
 \begin{verbatim}
   \only<trans:1-2| 1-3| handout:0>{Text}
 \end{verbatim}
 
-If you wish to give the same specification in all versions, you can do
-so by specifying |all:| as the version. For example,
+If you wish to give the same specification in all versions, you can do so by specifying |all:| as the version. For example,
 \begin{verbatim}
 \frame<all:1-2>{blah...}
 \end{verbatim}
-ensures that the frame has two slides in all versions. 
-
-
-
-
 
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+ensures that the frame has two slides in all versions.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tricks.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tricks.tex
index 376c445f35a..7d32dd79707 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tricks.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tricks.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,18 +8,14 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-tricks.tex,v 1.7 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{How To Uncover Things Piecewise}
 
 
 \subsection{Uncovering an Enumeration Piecewise}
 
-A common usage of overlays is to show a list of points in an
-enumeration in a piecewise fashion. The easiest and most flexible way
-to do this is the following:
-
+A common usage of overlays is to show a list of points in an enumeration in a piecewise fashion. The easiest and most flexible way to do this is the following:
 \begin{verbatim}
 \begin{itemize}
 \item<1-> First point.
@@ -27,17 +24,11 @@ to do this is the following:
 \end{itemize}
 \end{verbatim}
 
-The advantage of this approach is that you retain total control over
-the order in which items are shown. By changing, for example, the last
-specification to |<2->|, you can have the last two points uncovered at
-the same time.
+The advantage of this approach is that you retain total control over the order in which items are shown. By changing, for example, the last specification to |<2->|, you can have the last two points uncovered at the same time.
 
-A disadvantage of the approach is that you will have to renumber
-everything if you add a new item. This is usually not such a big
-problem, but it can be a nuisance.
+A disadvantage of the approach is that you will have to renumber everything if you add a new item. This is usually not such a big problem, but it can be a nuisance.
 
 To automatize the uncovering, you can use the following code:
-
 \begin{verbatim}
 \begin{itemize}[<+->]
 \item First point.
@@ -46,16 +37,9 @@ To automatize the uncovering, you can use the following code:
 \end{itemize}
 \end{verbatim}
 
-The effect of the |[<+->]| is to install a \emph{default overlay
-  specification}, see the definition of |itemize| for details.
-
-Now, suppose you wish the second and third point to be shown at the
-same time. You could achieve this by adding the specification |<2->|
-to either the second or third |\item| command. However, then you still
-have to do some renumbering if you add a new item at the beginning. A
-better approach is to temporarily use a different overlay
-specification and the dot-notation:
+The effect of the |[<+->]| is to install a \emph{default overlay specification}, see the definition of |itemize| for details.
 
+Now, suppose you wish the second and third point to be shown at the same time. You could achieve this by adding the specification |<2->| to either the second or third |\item| command. However, then you still have to do some renumbering if you add a new item at the beginning. A better approach is to temporarily use a different overlay specification and the dot-notation:
 \begin{verbatim}
 \begin{itemize}[<+->]
 \item First point.
@@ -64,18 +48,12 @@ specification and the dot-notation:
 \end{itemize}
 \end{verbatim}
 
-You might wish to build your own macros based on these ideas (like an
-|itemstep| environment or a |\itemlikeprevious| command).
-
+You might wish to build your own macros based on these ideas (like an |itemstep| environment or a |\itemlikeprevious| command).
 
 
-\subsection{Hilighting the Current Item in an Enumeration}
-
-If you uncover an enumeration piecewise, it is sometimes a good idea
-to hilight the last uncovered point to draw the audience's attention
-to it. This is best achieved as follows:
-
+\subsection{Highlighting the Current Item in an Enumeration}
 
+If you uncover an enumeration piecewise, it is sometimes a good idea to highlight the last uncovered point to draw the audience's attention to it. This is best achieved as follows:
 \begin{verbatim}
 \begin{itemize}
 \item<1-| alert@1> First point.
@@ -85,7 +63,6 @@ to it. This is best achieved as follows:
 \end{verbatim}
 
 or
-
 \begin{verbatim}
 \begin{itemize}[<+-| alert@+>]
 \item First point.
@@ -97,18 +74,11 @@ or
 Note that this will draw the little item symbol also in red.
 
 
-
 \subsection{Changing Symbol Before an Enumeration}
 
-When uncovering a list of tasks or problems, you may desire that the
-symbol in front of the last uncovered symbol is, say, a ballot~X,
-while for the previous items it is a check mark (you'll find these
-characters in some Dingbats fonts).
-
-The best way to achieve this is to implement a new action
-environment. If this action is activated, it temporarily changes the
-item symbol template to the other symbol:
+When uncovering a list of tasks or problems, you may desire that the symbol in front of the last uncovered symbol is, say, a ballot~X, while for the previous items it is a check mark (you'll find these characters in some Dingbats fonts).
 
+The best way to achieve this is to implement a new action environment. If this action is activated, it temporarily changes the item symbol template to the other symbol:
 \begin{verbatim}
 \newenvironment{ballotenv}
 {\only{%
@@ -122,16 +92,11 @@ item symbol template to the other symbol:
 \setbeamertemplate{itemize subsubitem}{code for showing a smaller check mark}
 \end{verbatim}
 
-The effect of the code is to install a check mark as the default
-template. If the action |ballot| is now requested for some item, this
-template will temporarily be replaced by the ballot templates.
+The effect of the code is to install a check mark as the default template. If the action |ballot| is now requested for some item, this template will temporarily be replaced by the ballot templates.
 
-Note that the |ballotenv| is invoked with the overlay specification
-given for the action directly following it. This causes the |\only| to
-be invoked exactly for the specified overlays.
+Note that the |ballotenv| is invoked with the overlay specification given for the action directly following it. This causes the |\only| to be invoked exactly for the specified overlays.
 
 Here are example usages:
-
 \begin{verbatim}
 \begin{itemize}
 \item<1-| ballot@1> First point.
@@ -141,7 +106,6 @@ Here are example usages:
 \end{verbatim}
 
 and
-
 \begin{verbatim}
 \begin{itemize}[<+-| ballot@+>]
 \item First point.
@@ -150,9 +114,7 @@ and
 \end{itemize}
 \end{verbatim}
 
-In the following example, more and more items become ``checked'' from
-slide to slide:
-
+In the following example, more and more items become ``checked'' from slide to slide:
 \begin{verbatim}
 \begin{itemize}[<ballot@+-| visible@1-,+(1)>]
 \item First point.
@@ -161,11 +123,7 @@ slide to slide:
 \end{itemize}
 \end{verbatim}
 
-The important point is |ballot@+|. The funny |visible@1-,+(1)| has the
-following effect: Although it has no effect with respect to what is
-shown (after all, it applies to all slides), it ensures that in
-the enumeration the slide number 4 is mentioned. Thus there will also
-be a slide in which all three points are checked.
+The important point is |ballot@+|. The funny |visible@1-,+(1)| has the following effect: Although it has no effect with respect to what is shown (after all, it applies to all slides), it ensures that in the enumeration the slide number 4 is mentioned. Thus there will also be a slide in which all three points are checked.
 
 
 \subsection{Uncovering Tagged Formulas Piecewise}
@@ -179,11 +137,7 @@ Suppose you have a three-line formula as the following:
 \end{align}
 \end{verbatim}
 
-Uncovering this formula line-by-line is a little tricky. A first idea
-is to use the |\pause| or |\onslide| commands. Unfortunately, these do
-not work since |align| internally reprocesses its input several times,
-which messes up the delicate internals of the commands. The next idea
-is the following, which works a little better:
+Uncovering this formula line-by-line is a little tricky. A first idea is to use the |\pause| or |\onslide| commands. Unfortunately, these do not work since |align| internally reprocesses its input several times, which messes up the delicate internals of the commands. The next idea is the following, which works a little better:
 \begin{verbatim}
 \begin{align}
   A &= B \\
@@ -191,15 +145,10 @@ is the following, which works a little better:
     \uncover<3->{&= D}
 \end{align}
 \end{verbatim}
-Unfortunately, this does not work in the presence of tags (so it works
-for the |align*| environment). What happens is that the tag of the
-last line is shown on all slides. The problem here is that the tag is
-created when |\\| is encountered or when |\end{align}| is
-encountered. In the last line these are already ``behind'' the
-|\uncover|.
-
-To solve this problem, you can add an empty line without a tag and then
-insert a negative vertical skip to undo the last line:
+
+Unfortunately, this does not work in the presence of tags (so it works for the |align*| environment). What happens is that the tag of the last line is shown on all slides. The problem here is that the tag is created when |\\| is encountered or when |\end{align}| is encountered. In the last line these are already ``behind'' the |\uncover|.
+
+To solve this problem, you can add an empty line without a tag and then insert a negative vertical skip to undo the last line:
 \begin{verbatim}
 \begin{align}
   A &= B \\
@@ -213,19 +162,9 @@ insert a negative vertical skip to undo the last line:
 
 \subsection{Uncovering a Table Rowwise}
 
-When you wish to uncover a table line-by-line, you will run into all
-sorts of problems if there are vertical and horizontal lines in the
-table. The reason is that the first vertical line at the left end is
-drawn before the line is even read (and thus, in particular, before
-any |\onslide| command can be read). However, placing a |\pause| or
-|\uncover| at the end of the line before is also not helpful since it
-will then suppress the horizontal line below the last uncovered line.
-
-A possible way to solve this problem is not to use either horizontal
-or vertical lines. Instead, colouring the lines using the |colortbl|
-package is a good alternative to structure the table. Here is an
-optically pleasing example, where the table is uncovered line-wise:
+When you wish to uncover a table line-by-line, you will run into all sorts of problems if there are vertical and horizontal lines in the table. The reason is that the first vertical line at the left end is drawn before the line is even read (and thus, in particular, before any |\onslide| command can be read). However, placing a |\pause| or |\uncover| at the end of the line before is also not helpful since it will then suppress the horizontal line below the last uncovered line.
 
+A possible way to solve this problem is not to use either horizontal or vertical lines. Instead, colouring the lines using the |colortbl| package is a good alternative to structure the table. Here is an optically pleasing example, where the table is uncovered line-wise:
 \begin{verbatim}
 \rowcolors[]{1}{blue!20}{blue!10}
 \begin{tabular}{l!{\vrule}cccc}
@@ -236,26 +175,16 @@ optically pleasing example, where the table is uncovered line-wise:
 \end{tabular}
 \end{verbatim}
 
-By using |\onslide| instead of |\pause|, you can get more fine-grained
-control over which line is shown on which slide.
+By using |\onslide| instead of |\pause|, you can get more fine-grained control over which line is shown on which slide.
 
 
 \subsection{Uncovering a Table Columnwise}
 
-The same problems as for uncovering a table linewise arise for
-uncovering it columnwise.
-
-Once more, using the |colortbl| package offers a solution. In the
-following example, the |tabular| header is used to insert |\onslide|
-commands, one for each column, that cover the entries in the column
-from a certain slide on. At the end of the last column, the |\onslide|
-without a specification ensures that the first column on the next row
-is once more shown normally.
+The same problems as for uncovering a table linewise arise for uncovering it columnwise.
 
-Inserting a horizontal line is tricky since it will protrude over the
-full width of the table also in the covered version. The best idea is
-just not to use horizontal bars.
+Once more, using the |colortbl| package offers a solution. In the following example, the |tabular| header is used to insert |\onslide| commands, one for each column, that cover the entries in the column from a certain slide on. At the end of the last column, the |\onslide| without a specification ensures that the first column on the next row is once more shown normally.
 
+Inserting a horizontal line is tricky since it will protrude over the full width of the table also in the covered version. The best idea is just not to use horizontal bars.
 \begin{verbatim}
 \rowcolors[]{1}{blue!20}{blue!10}
 \begin{tabular}{l!{\vrule}c<{\onslide<2->}c<{\onslide<3->}c<{\onslide<4->}c<{\onslide}c}
@@ -265,10 +194,3 @@ just not to use horizontal bars.
   Z     & 5 & 6 & 7 & 8
 \end{tabular}
 \end{verbatim}
-
-
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tutorial.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tutorial.tex
index b93d6d4458f..eb9912853c7 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tutorial.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-tutorial.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,154 +8,90 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-tutorial.tex,v 1.13 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Tutorial: Euclid's Presentation}
 \label{section-tutorial}
- 
-This section presents a short tutorial that focuses on those features
-of \beamer\ that you are likely to use when you start using
-\beamer. It  leaves out all the glorious details that are explained
-in great detail later on.
 
+This section presents a short tutorial that focuses on those features of \beamer\ that you are likely to use when you start using \beamer. It  leaves out all the glorious details that are explained in great detail later on.
 
 
 \subsection{Problem Statement}
 
-We wish to help Prof.\ Euclid of the University of Alexandria to
-create a presentation on his latest discovery: There are 
-infinitely many prime numbers! Euclid wrote a paper on this and it got
-accepted at the 27th International Symposium on Prime Numbers $-280$
-(ISPN~'80). Euclid wishes to use the \beamer\ class
-to create a presentation for the conference.
-On the conference webpage he found out that he will have twenty
-minutes for his talk, including questions.
+We wish to help Prof.\ Euclid of the University of Alexandria to create a presentation on his latest discovery: There are infinitely many prime numbers! Euclid wrote a paper on this and it got accepted at the 27th International Symposium on Prime Numbers $-280$ (ISPN~'80). Euclid wishes to use the \beamer\ class to create a presentation for the conference. On the conference webpage he found out that he will have twenty minutes for his talk, including questions.
 
 
 \subsection{Solution Template}
 
-The first thing Euclid should do is to look for a solution template
-for his presentation. Having a look at
-Section~\ref{section-solutions}, he finds that the file
+The first thing Euclid should do is to look for a solution template for his presentation. Having a look at Section~\ref{section-solutions}, he finds that the file
 \begin{verbatim}
 beamer/solutions/conference-talks/conference-ornate-20min.en.tex
 \end{verbatim}
-might be appropriate. He creates a subdirectories |presentation| in
-the directory that contains the actual paper and copies the solution
-template to this subdirectory, renaming to |main.tex|.
+might be appropriate. He creates a subdirectory |presentation| in the directory that contains the actual paper and copies the solution template to this subdirectory, renaming to |main.tex|.
 
 \lyxnote
-If Euclid uses \LyX, he would choose ``New from template'' and pick
-the template file 
+If Euclid uses \LyX, he would choose ``New from template'' and pick the template file
 \begin{verbatim}
 beamer/solutions/conference-talks/conference-ornate-20min.en.lyx
 \end{verbatim}
-
 He opens the file in his favorite editor. It starts
 \begin{verbatim}
 \documentclass{beamer}
 \end{verbatim}
-which Euclid finds hardly surprising. Next comes a line reading 
+which Euclid finds hardly surprising. Next comes a line reading
 \begin{verbatim}
 \mode<presentation>
-\end{verbatim} 
-which Euclid does not understand. Since he finds more stuff in the file
-that he does not understand, he decides to ignore all of that for time
-being, hoping that it all serves some good purpose. 
+\end{verbatim}
+which Euclid does not understand. Since he finds more stuff in the file that he does not understand, he decides to ignore all of that for time being, hoping that it all serves some good purpose.
 
 
 \subsection{Title Material}
 
-The next thing that seems logical is the place where the |\title|
-command is used. Naturally, he replaces it with
+The next thing that seems logical is the place where the |\title| command is used. Naturally, he replaces it with
 \begin{verbatim}
 \title{There Is No Largest Prime Number}
-\end{verbatim} 
-since this was the title of the paper. He sees that the command
-|\title| also takes an optional ``short'' argument in square brackets,
-which is shown in places where there is little space, but he decides
-that the title is short enough by itself.
+\end{verbatim}
+since this was the title of the paper. He sees that the command |\title| also takes an optional ``short'' argument in square brackets, which is shown in places where there is little space, but he decides that the title is short enough by itself.
 
 Euclid next adjusts the |\author| and |\date| fields as follows:
-\begin{verbatim} 
+\begin{verbatim}
 %\author{Euclid of Alexandria}
 %\date[ISPN '80]{27th International Symposium of Prime Numbers}
-\end{verbatim} 
-For the date, he felt that the name was a little long, so a short 
-version is given (|ISPN '80|). On second thought, Euclid decides to
-add his email address and replaces the |\author| field as follows:
+\end{verbatim}
+For the date, he felt that the name was a little long, so a short version is given (|ISPN '80|). On second thought, Euclid decides to add his email address and replaces the |\author| field as follows:
 \begin{verbatim}
 %\author[Euclid]{Euclid of Alexandria \\ \texttt{euclid@alexandria.edu}}
 \end{verbatim}
-Somehow Euclid does not like the fact that there is no ``|\email|''
-command in \beamer. He decides to write an email to \beamer's author,
-asking him to fix this, but postpones this for later when the
-presentation is finished. 
+Somehow Euclid does not like the fact that there is no ``|\email|'' command in \beamer. He decides to write an email to \beamer's author, asking him to fix this, but postpones this for later when the presentation is finished.
 
-There are two fields that Euclid does not know, but whose meaning he
-can guess: |\subtitle| and |\institute|. He adjusts them. (Euclid does
-not need to use the |\and| command, which is 
-used to separate several authors, nor the |\inst| command, which just
-makes its argument a superscript).
+There are two fields that Euclid does not know, but whose meaning he can guess: |\subtitle| and |\institute|. He adjusts them. (Euclid does not need to use the |\and| command, which is used to separate several authors, nor the |\inst| command, which just makes its argument a superscript).
 
 \lyxnote
-In \LyX, Euclid just edits the first lines having of the different
-styles like Author or Title or Date. He deletes the optional short
-fields.
+In \LyX, Euclid just edits the first lines having of the different styles like Author or Title or Date. He deletes the optional short fields.
 
 
 \subsection{The Title Page Frame}
 
-The next thing in the file that seems interesting is where the first
-``frame'' is created, right after the |\||begin{document}|:
-
+The next thing in the file that seems interesting is where the first ``frame'' is created, right after the |\||begin{document}|:
 \begin{verbatim}
 \begin{frame}
   \titlepage
 \end{frame}
 \end{verbatim}
-
-In \beamer, a presentation consists of a series of frames. Each frame
-in turn may consist of several slides (if there is more than one, they
-are called overlays). Normally, everything between |\begin{frame}|
-  and |\end{frame}| is put on a single slide. No page breaking is
-performed. So Euclid infers that the first frame is ``filled'' by the
-title page, which seems quite logical.
+In \beamer, a presentation consists of a series of frames. Each frame in turn may consist of several slides (if there is more than one, they are called overlays). Normally, everything between |\begin{frame}| and |\end{frame}| is put on a single slide. No page breaking is performed. So Euclid infers that the first frame is ``filled'' by the title page, which seems quite logical.
 
 \lyxnote
-The title page frame is created automatically by \LyX. All other
-frames start with the style BeginFrame and end either with the style
-EndFrame or, automatically, with the start of the next frame,
-subsection, or section. 
+The title page frame is created automatically by \LyX. All other frames start with the style BeginFrame and end either with the style EndFrame or, automatically, with the start of the next frame, subsection, or section.
 
 
 \subsection{Creating the Presentation PDF File}
 
-Eager to find out how the first page will
-look, he invokes |pdflatex| on his file |main.tex| (twice). He could
-also use |latex| (twice), followed by |dvips|, and then possibly
-|ps2pdf|. Then he uses the Acrobat Reader or |xpdf| to view the
-resulting |main.pdf|. Indeed, the first page contains all the
-information Euclid has provided until now. It even looks quite
-impressive with the colorful title and the rounded corners and the
-shadows, but he is doubtful whether he should leave it like that. He
-decides to address this problem later.
-
-Euclid is delighted to find out that clicking on a section or
-subsection in the navigation bar at the tops hyperjumps there. Also,
-the small symbols at the bottom seem to be clickable. Toying around
-with them for a while, he finds that clicking on the arrows left or
-right of a symbols hyperjumps him backward or forward one slide~/
-frame~/ subsection~/ section. Clicking on the left or right side of
-the symbol hyperjumps to the beginning or end of the frame~/
-subsection~/ section. He finds the symbols quite small, but decides
-not write an email to \beamer's author since he also thinks that
-bigger symbols would be distracting.
+Eager to find out how the first page will look, he invokes |pdflatex| on his file |main.tex| (twice). He could also use |latex| (twice), followed by |dvips|, and then possibly |ps2pdf|, or |lualatex| (twice), or |xelatex| (twice). Then he uses the Acrobat Reader, |xpdf|, |evince| or |okular| to view the resulting |main.pdf|. Indeed, the first page contains all the information Euclid has provided until now. It even looks quite impressive with the colorful title and the rounded corners and the shadows, but he is doubtful whether he should leave it like that. He decides to address this problem later.
+
+Euclid is delighted to find out that clicking on a section or subsection in the navigation bar at the top hyperjumps there. Also, the small symbols at the bottom seem to be clickable. Toying around with them for a while, he finds that clicking on the arrows left or right of a symbols hyperjumps him backward or forward one slide~/ frame~/ subsection~/ section. Clicking on the left or right side of the symbol hyperjumps to the beginning or end of the frame~/ subsection~/ section. He finds the symbols quite small, but decides not to write an email to \beamer's author since he also thinks that bigger symbols would be distracting.
 
 \lyxnote
-Euclid chooses View $\to$ PDF to view the resulting presentation. On a
-slow machine, this may take a while. See Section~\ref{section-speedup}
-for ways of speeding up the compilation.
+Euclid chooses View $\to$ PDF to view the resulting presentation. On a slow machine, this may take a while. See Section~\ref{section-speedup} for ways of speeding up the compilation.
 
 
 \subsection{The Table of Contents}
@@ -166,24 +103,15 @@ The next frame contains a table of contents:
   \tableofcontents
 \end{frame}
 \end{verbatim}
-Furthermore, this frame has an individual title (Outline). A comment
-in the frame says that Euclid might wish to try to add the
-|[pausesections]| option. He tries this, changing the frame to:
+Furthermore, this frame has an individual title (Outline). A comment in the frame says that Euclid might wish to try to add the |[pausesections]| option. He tries this, changing the frame to:
 \begin{verbatim}
 \begin{frame}
   \frametitle{Outline}
   \tableofcontents[pausesections]
 \end{frame}
 \end{verbatim}
-After re-pdf\LaTeX ing the presentation, he finds that instead of a
-single slide, there are now two ``table of contents slides'' in the
-presentation. On the first of these, only the first section is shown,
-on the second both sections are shown (scanning down in the file,
-Euclid finds that, indeed, there are |\section| commands introducing
-these sections). The effect of the |pausesections| seems to be that
-one can talk about the first section before the second one is
-shown. Then, Euclid can press the down- or right-key, to show the
-complete table of contents and can talk about the second section.
+
+After re-pdf\LaTeX ing the presentation, he finds that instead of a single slide, there are now two ``table of contents'' slides in the presentation. On the first of these, only the first section is shown, on the second both sections are shown (scanning down in the file, Euclid finds that, indeed, there are |\section| commands introducing these sections). The effect of the |pausesections| seems to be that one can talk about the first section before the second one is shown. Then, Euclid can press the down- or right-key, to show the complete table of contents and can talk about the second section.
 
 
 \subsection{Sections and Subsections}
@@ -193,55 +121,28 @@ The next commands Euclid finds are
 \section{Motivation}
 \subsection{The Basic Problem That We Studied}
 \end{verbatim}
-These commands are given \emph{outside} of frames. So Euclid assumes
-that at the point of invocation they have no direct effect, they only
-create entries in the table of contents. Having a ``Motivation''
-section seems reasonable to Euclid, but he changes the |\subsection|
-title.
-
-As he looks at the presentation, he notices that his assumption was
-not quite true: each |\subsection| command seems to insert a frame
-containing a table of contents into the presentation. Doubling back he
-finds the command that causes this: The |\AtBeginSubsection| inserts a
-frame with only the current subsection hilighted at the beginning of
-each section. If Euclid does not like this, he can just delete the
-whole |\AtBeginSubsection| stuff and the table of contents at the
-beginning of each subsection disappear. 
-
-The |\section| and |\subsection| commands take optional short
-arguments. These short arguments are used whenever a short form of the
-section of subsection name is needed. While this is in keeping with
-the way \beamer\ treats the optional arguments of things like
-|\title|, it is \emph{different} from the usual way \LaTeX\ treats an
-optional argument for sections (where the optional argument dictates
-what is shown in the table of contents and the main argument dictates
-what is shown everywhere else; in \beamer\ things are exactly the
-other way round).
+These commands are given \emph{outside} of frames. So Euclid assumes that at the point of invocation they have no direct effect, they only create entries in the table of contents. Having a ``Motivation'' section seems reasonable to Euclid, but he changes the |\subsection| title.
+
+As he looks at the presentation, he notices that his assumption was not quite true: each |\subsection| command seems to insert a frame containing a table of contents into the presentation. Doubling back he finds the command that causes this: The |\AtBeginSubsection| inserts a frame with only the current subsection highlighted at the beginning of each section. If Euclid does not like this, he can just delete the whole |\AtBeginSubsection| stuff and the table of contents at the beginning of each subsection disappears.
 
+The |\section| and |\subsection| commands take optional short arguments. These short arguments are used whenever a short form of the section of subsection name is needed. While this is in keeping with the way \beamer\ treats the optional arguments of things like |\title|, it is \emph{different} from the usual way \LaTeX\ treats an optional argument for sections (where the optional argument dictates what is shown in the table of contents and the main argument dictates what is shown everywhere else; in \beamer\ things are exactly the other way round).
 
 
 \subsection{Creating a Simple Frame}
 
-Euclid then modifies the next frame, which is the first ``real'' frame
-of the presentation, as follows:
+Euclid then modifies the next frame, which is the first ``real'' frame of the presentation, as follows:
 \begin{verbatim}
 \begin{frame}
   \frametitle{What Are Prime Numbers?}
-  A prime number is a number that has exactly two divisors. 
+  A prime number is a number that has exactly two divisors.
 \end{frame}
 \end{verbatim}
-This yields the desired result. It might be a good idea to put some
-emphasis on the object being defined (prime numbers). Euclid tries
-|\emph| but finds that too mild an emphasis. \beamer\ offers the
-command |\alert|, which is used like |\emph| and, by default, typesets
-its argument in bright red.
+This yields the desired result. It might be a good idea to put some emphasis on the object being defined (prime numbers). Euclid tries |\emph| but finds that too mild an emphasis. \beamer\ offers the command |\alert|, which is used like |\emph| and, by default, typesets its argument in bright red.
+
 \lyxnote
-The |\alert| command needs to be entered in \TeX-mode, which is
-awkward. It's easier to just paint the text in red.
+The |\alert| command needs to be entered in \TeX-mode, which is awkward. It's easier to just paint the text in red.
 
-Next, Euclid decides to make it even clearer that he is giving a
-definition by putting a |definition| environment around the
-definition. 
+Next, Euclid decides to make it even clearer that he is giving a definition by putting a |definition| environment around the definition.
 \begin{verbatim}
 \begin{frame}
   \frametitle{What Are Prime Numbers?}
@@ -250,13 +151,10 @@ definition.
   \end{definition}
 \end{frame}
 \end{verbatim}
-Other useful environments like |theorem|, |lemma|, |proof|,
-|corollary|, or |example| are also predefined by \beamer. As in
-|amsmath|, they take optional arguments that they show in
-brackets. Indeed, |amsmath| is automatically loaded by \beamer.
 
-Since it is always a good idea to add examples, Euclid decides to add
-one:
+Other useful environments like |theorem|, |lemma|, |proof|, |corollary|, or |example| are also predefined by \beamer. As in |amsmath|, they take optional arguments that they show in brackets. Indeed, |amsmath| is automatically loaded by \beamer.
+
+Since it is always a good idea to add examples, Euclid decides to add one:
 \begin{verbatim}
 \begin{frame}
   \frametitle{What Are Prime Numbers?}
@@ -276,10 +174,7 @@ one:
 
 \subsection{Creating Simple Overlays}
 
-The frame already looks quite nice, though, perhaps a bit colorful.
-However, Euclid would now like to show the three items one after
-another, not all three right away. To achieve this, he adds |\pause|
-commands after the first and second items:
+The frame already looks quite nice, though, perhaps a bit colorful. However, Euclid would now like to show the three items one after another, not all three right away. To achieve this, he adds |\pause| commands after the first and second items:
 \begin{verbatim}
   \begin{itemize}
   \item 2 is prime (two divisors: 1 and 2).
@@ -290,37 +185,17 @@ commands after the first and second items:
   \end{itemize}
 \end{verbatim}
 
-By showing them incrementally, he
-hopes to focus the audience's attention on the item he is currently
-talking about. On second thought, he deletes the |\pause| stuff once
-more since in simple cases like the above the pausing is rather
-silly. Indeed, Euclids has noticed that good presentations make use of
-this uncovering mechanism only in special circumstances.
+By showing them incrementally, he hopes to focus the audience's attention on the item he is currently talking about. On second thought, he deletes the |\pause| stuff once more since in simple cases like the above the pausing is rather silly. Indeed, Euclids has noticed that good presentations make use of this uncovering mechanism only in special circumstances.
 
 \lyxnote
 You add a pause using the Pause style.
 
-Euclid finds that he can also add a |\pause| between the definition
-and the example. So, |\pause|s seem to transcede environments, which
-Euclid finds quite useful. After some experimentation he finds that
-|\pause| only does not work in |align| environments. He immediately
-writes an email about this to \beamer's author, but receives a polite
-answer stating that the implementation of |align| does wicked things
-and there is no fix for this. Also, Euclid is pointed to the last part
-of the user's guide, where a workaround is described. 
+Euclid finds that he can also add a |\pause| between the definition and the example. So, |\pause|s seem to transcede environments, which Euclid finds quite useful. After some experimentation he finds that |\pause| only does not work in |align| environments. He immediately writes an email about this to \beamer's author, but receives a polite answer stating that the implementation of |align| does wicked things and there is no fix for this. Also, Euclid is pointed to the last part of the user's guide, where a workaround is described.
 
 
 \subsection{Using Overlay Specifications}
 
-The next frame is to show his main argument and is put in a ``Results''
-section. Euclid desires a more complicated overlay behavior for this
-frame: In an enumeration of four points he 
-wishes to uncover the points one-by-one, but he wishes the fourth
-point to be shown at the same time as the first. The idea is to
-illustrate his new proof method, namely proof by contradiction, where
-a wrong assumption is brought to a contradiction at the end after a
-number of intermediate steps that are not important at the
-beginning. For this, Euclid uses \emph{overlay specifications}:
+The next frame is to show his main argument and is put in a ``Results'' section. Euclid desires a more complicated overlay behavior for this frame: In an enumeration of four points he wishes to uncover the points one-by-one, but he wishes the fourth point to be shown at the same time as the first. The idea is to illustrate his new proof method, namely proof by contradiction, where a wrong assumption is brought to a contradiction at the end after a number of intermediate steps that are not important at the beginning. For this, Euclid uses \emph{overlay specifications}:
 \begin{verbatim}
 \begin{frame}
   \frametitle{There Is No Largest Prime Number}
@@ -335,73 +210,39 @@ beginning. For this, Euclid uses \emph{overlay specifications}:
     \item<2-> Let $q$ be the product of the first $p$ numbers.
     \item<3-> Then $q + 1$ is not divisible by any of them.
     \item<1-> Thus $q + 1$ is also prime and greater than $p$.\qedhere
-    \end{enumerate}      
+    \end{enumerate}
   \end{proof}
   \uncover<4->{The proof used \textit{reductio ad absurdum}.}
 \end{frame}
 \end{verbatim}
-The overlay specifications are given in pointed brackets. The
-specification |<1->| means ``from slide 1 on.'' Thus, the first and
-fourth item are shown on the first slide of the frame, but the other
-two items are not shown. Rather, the second point is shown only from
-the second slide onward. \beamer\ automatically computes the number of slides
-needed for each frame. More generally, overlay specification are lists
-of numbers or number ranges where the start or ending of a range can
-be left open. For example |-3,5-6,8-| means ``on all slides, except
-for slides 4 and~7.''
+
+The overlay specifications are given in pointed brackets. The specification |<1->| means ``from slide 1 on.'' Thus, the first and fourth item are shown on the first slide of the frame, but the other two items are not shown. Rather, the second point is shown only from the second slide onward. \beamer\ automatically computes the number of slides needed for each frame. More generally, overlay specification are lists of numbers or number ranges where the start or ending of a range can be left open. For example |-3,5-6,8-| means ``on all slides, except for slides 4 and~7.''
 
 \lyxnote
-You add overlay specifications to the items by entering \TeX-mode
-(press on the little \TeX\ icon) and writing |<1->|. This \TeX-text
-should be placed right at the beginning of the item.
-
-The |\qedhere| is used to put the \textsc{qed} symbol at the end of
-the line \emph{inside} the enumeration. Normally, the \textsc{qed}
-symbol is automatically inserted at the end of a proof environment,
-but that would be on an ugly empty line here.
-
-The |\item| command is not the only command that takes overlay
-specifications. Another useful command that takes one is the
-|\uncover| command. It only shows its argument on the slides specified 
-in the overlay specification. On all other slides, the argument is
-hidden (though it still occupies space). The command |\only| is
-similar and Euclid could also have tried
+You add overlay specifications to the items by entering \TeX-mode (press on the little \TeX\ icon) and writing |<1->|. This \TeX-text should be placed right at the beginning of the item.
+
+The |\qedhere| is used to put the \textsc{qed} symbol at the end of the line \emph{inside} the enumeration. Normally, the \textsc{qed} symbol is automatically inserted at the end of a proof environment, but that would be on an ugly empty line here.
+
+The |\item| command is not the only command that takes overlay specifications. Another useful command that takes one is the |\uncover| command. It only shows its argument on the slides specified in the overlay specification. On all other slides, the argument is hidden (though it still occupies space). The command |\only| is similar and Euclid could also have tried
 \begin{verbatim}
   \only<4->{The proof used \textit{reductio ad absurdum}.}
 \end{verbatim}
-On non-specified slides the |\only| command simply ``throws its
-argument away'' and the argument does not occupy any space. This leads
-to different heights of the text on the first three slides and of the
-fourth slide. If the text is centered vertically, this will cause the
-text to ``wobble'' and thus |\uncover| should be used. However, you
-sometimes wish things to ``really disappear'' on some slides and then
-|\only| is useful. Euclid could also have used the class option
-|t|, which causes the text in frames to be vertically flushed
-to the top. Then a differing text height does not cause
-wobbling. Vertical flushing can also be achieved for only a single
-frame be by giving the optional argument |[t]| like this to the
-|frame| environment as in 
+
+On non-specified slides the |\only| command simply ``throws its argument away'' and the argument does not occupy any space. This leads to different heights of the text on the first three slides and on the fourth slide. If the text is centered vertically, this will cause the text to ``wobble'' and thus |\uncover| should be used. However, you sometimes wish things to ``really disappear'' on some slides and then |\only| is useful. Euclid could also have used the class option |t|, which causes the text in frames to be vertically flushed to the top. Then a differing text height does not cause wobbling. Vertical flushing can also be achieved for only a single frame be by giving the optional argument |[t]| like this to the |frame| environment as in
 \begin{verbatim}
 \begin{frame}[t]
   \frametitle{There Is No Largest Prime Number}
   ...
 \end{frame}
 \end{verbatim}
-Vice versa, if the |t| class option is given, a frame can be
-vertically centered using the |[c]| option for the frame.
+Vice versa, if the |t| class option is given, a frame can be vertically centered using the |[c]| option for the frame.
 
-It turns out that certain environments, including the |theorem| and
-|proof| environments above, also take overlay specifications. If such
-a specification is given, the whole theorem or proof is only shown on
-the specified slides.
+It turns out that certain environments, including the |theorem| and |proof| environments above, also take overlay specifications. If such a specification is given, the whole theorem or proof is only shown on the specified slides.
 
 
 \subsection{Structuring a Frame}
 
-On the next frame, Euclid wishes to contrast solved and open problems
-on prime numbers. Since there is no ``Solved problem'' environment
-similar to the |theorem| environment, Euclid decides to use the
-|block| environment, which allows him to give an arbitrary title:
+On the next frame, Euclid wishes to contrast solved and open problems on prime numbers. Since there is no ``Solved problem'' environment similar to the |theorem| environment, Euclid decides to use the |block| environment, which allows him to give an arbitrary title:
 \begin{verbatim}
 \begin{frame}
   \frametitle{What's Still To Do?}
@@ -413,17 +254,13 @@ similar to the |theorem| environment, Euclid decides to use the
   \end{block}
 \end{frame}
 \end{verbatim}
-He could also have defined his own theorem-like environment by putting
-the following in the preamble:
-\begin{verbatim} 
+
+He could also have defined his own theorem-like environment by putting the following in the preamble:
+\begin{verbatim}
 %\newtheorem{answeredquestions}[theorem]{Answered Questions}
 %\newtheorem{openquestions}[theorem]{Open Questions}
 \end{verbatim}
-The optional argument |[theorem]| ensures that these environments are 
-numbered the same way as everything else. Since these numbers are not
-shown anyway, it does not really matter whether they are given, but
-it's a good practice and, perhaps, Euclid might need these numbers
-some other time.
+The optional argument |[theorem]| ensures that these environments are numbered the same way as everything else. Since these numbers are not shown anyway, it does not really matter whether they are given, but it's a good practice and, perhaps, Euclid might need these numbers some other time.
 
 An alternative would be nested |itemize|:
 \begin{verbatim}
@@ -441,11 +278,8 @@ An alternative would be nested |itemize|:
   \end{itemize}
 \end{frame}
 \end{verbatim}
-Pondering on the problem some more, Euclid decides that it would be
-even nicer to have the ``Answered Questions'' on the left and the
-``Open Questions'' on the right, so as to create a stronger visual
-contrast. For this, he uses the |columns| environment. Inside this
-environment, |\column| commands create new columns.
+
+Pondering on the problem some more, Euclid decides that it would be even nicer to have the ``Answered Questions'' on the left and the ``Open Questions'' on the right, so as to create a stronger visual contrast. For this, he uses the |columns| environment. Inside this environment, |\column| commands create new columns.
 \begin{verbatim}
 \begin{frame}
   \frametitle{What's Still To Do?}
@@ -462,39 +296,26 @@ environment, |\column| commands create new columns.
   \end{columns}
 \end{frame}
 \end{verbatim}
-Trying this, he is not quite satisfied with the result as the block on
-the left has a different height than the one on the right. He thinks it
-would be nicer if they were vertically top-aligned. So he adds the
-|[t]| option to the |columns| environment. 
 
-Euclid is somewhat please to find out that a |\pause| at the end of
-the first column allows him to ``uncover'' the second column only on
-the second slide of the frame.
+Trying this, he is not quite satisfied with the result as the block on the left has a different height than the one on the right. He thinks it would be nicer if they were vertically top-aligned. So he adds the |[t]| option to the |columns| environment.
 
+Euclid is somewhat please to find out that a |\pause| at the end of the first column allows him to ``uncover'' the second column only on the second slide of the frame.
 
 
 \subsection{Adding References}
 
-Euclid decides that he would like to add a citation to his open
-questions list, since he would like to attribute the question to his
-good old friend Christian. Euclid is not really sure whether using a
-bibliography in his talk is a good idea, but he goes ahead anyway. 
+Euclid decides that he would like to add a citation to his open questions list, since he would like to attribute the question to his good old friend Christian. Euclid is not really sure whether using a bibliography in his talk is a good idea, but he goes ahead anyway.
 
-To this end, he adds an entry to the bibliography, which he
-fortunately already finds in the solution file. Having the
-bibliography in the appendix does not quite suit Euclid, so he removes
-the |\appendix| command. He also notices |<presentation>| overlay
-specification and finds them a bit strange, but they do seem to hurt
-either. Hopefully they do something useful. His bibliography looks
-like this:
+To this end, he adds an entry to the bibliography, which he fortunately already finds in the solution file. Having the bibliography in the appendix does not quite suit Euclid, so he removes the |\appendix| command. He also notices |<presentation>| overlay specifications and finds them a bit strange, but they don't seem to hurt either. Hopefully they do something useful. His bibliography looks like this:
 \begin{verbatim}
   \begin{thebibliography}{10}
   \bibitem{Goldbach1742}[Goldbach, 1742]
     Christian Goldbach.
-    \newblock A problem we should try to solve before the ISPN '43 deadline, 
+    \newblock A problem we should try to solve before the ISPN '43 deadline,
     \newblock \emph{Letter to Leonhard Euler}, 1742.
   \end{thebibliography}
 \end{verbatim}
+
 and he can then add a citation:
 \begin{verbatim}
 \begin{block}{Open Questions}
@@ -504,22 +325,14 @@ and he can then add a citation:
 \end{verbatim}
 
 
-
-
-
 \subsection{Verbatim Text}
 
-One another frame, Euclid would like to show a listing of an
-algorithm his friend Eratosthenes has send him (saying he came up with
-it while reorganizing his sieve collection). Euclid normally uses the
-|verbatim| environment and sometimes also similar environments like
-|lstlisting| to typeset listings. He can also use them in \beamer, but
-he must add the |fragile| option to the frame:
+On another frame, Euclid would like to show a listing of an algorithm his friend Eratosthenes has sent him (saying he came up with it while reorganizing his sieve collection). Euclid normally uses the |verbatim| environment and sometimes also similar environments like |lstlisting| to typeset listings. He can also use them in \beamer, but he must add the |fragile| option to the frame:
 \begin{verbatim}
 \begin{frame}[fragile]
   \frametitle{An Algorithm For Finding Primes Numbers.}
 
-%\begin{verbatim} 
+%\begin{verbatim}
 int main (void)
 {
   std::vector<bool> is_prime (100, true);
@@ -530,7 +343,7 @@ int main (void)
         for (int j = i; j < 100; is_prime [j] = false, j+=i);
       }
   return 0;
-} 
+}
 \end{verbatim}
 \unskip{\MacroFont|\end{verbatim}|}
                                 %\begin{verbatim}
@@ -541,20 +354,12 @@ int main (void)
 \end{frame}
 \end{verbatim}
 
-
-On second thought, Euclid would prefer to uncover part of the
-algorithm stepwise and to add an emphasis on certain lines or parts of
-lines. He can use package like |alltt| for this, but in simple cases
-the environment |{semiverbatim}| defined by \beamer\ is more useful:
-It works like |{verbatim}|, except that |\|, |{|, and |}| retain their
-meaning (one can typeset them by using |\\|, |\{|, and |\}|). Euclid
-might now typeset his algorithm as follows:
-
+On second thought, Euclid would prefer to uncover part of the algorithm stepwise and to add an emphasis on certain lines or parts of lines. He can use package like |alltt| for this, but in simple cases the environment |{semiverbatim}| defined by \beamer\ is more useful: It works like |{verbatim}|, except that |\|, |{|, and |}| retain their meaning (one can typeset them by using |\\|, |\{|, and |\}|). Euclid might now typeset his algorithm as follows:
 \begin{verbatim}
 \begin{frame}[fragile]
   \frametitle{An Algorithm For Finding Primes Numbers.}
 
-\begin{semiverbatim}    
+\begin{semiverbatim}
 \uncover<1->{\alert<0>{int main (void)}}
 \uncover<1->{\alert<0>{\{}}
 \uncover<1->{\alert<1>{  \alert<4>{std::}vector<bool> is_prime (100, true);}}
@@ -572,48 +377,30 @@ might now typeset his algorithm as follows:
   \visible<4->{Note the use of \alert{\texttt{std::}}.}
 \end{frame}
 \end{verbatim}
+The |\visible| command does nearly the same as |\uncover|. A difference occurs if the command |\setbeamercovered{transparent}| has been used to make covered text ``transparent'' instead, |\visible| still makes the text completely ``invisible'' on non-specified slides. Euclid has the feeling that the naming convention is a bit strange, but cannot quite pinpoint the problem.
 
-The |\visible| command does nearly the same as |\uncover|. A
-difference occurs if the command |\setbeamercovered{transparent}| has
-been used to make covered text ``transparent'' instead, |\visible| still makes the text
-completely ``invisible'' on non-specified slides. Euclid has
-the feeling that the naming convention is a bit strange, but cannot
-quite pinpoint the problem.
 
 \subsection{Changing the Way Things Look I: Theming}
 
-With the contents of this talk fixed, Euclid decides to have a second
-look at the way things look. He goes back to the beginning and finds
-the line
+With the contents of this talk fixed, Euclid decides to have a second look at the way things look. He goes back to the beginning and finds the line
 \begin{verbatim}
 \usetheme{Warsaw}
 \end{verbatim}
-By substituting other cities (he notices that these cities seem to
-have in common that there has been a workshop or conference on
-theoretical computer science there at which always the same person had
-a paper, attended, or gave a talk) Euclid can change the way his
-presentation is going to look. He decides to choose some theme that is
-reasonably simple but, since his talk is not too short, shows a bit of
-navigational information.
 
-He settles on the |Frankfurt| theme but decides that the light-dark
-contrast is too strong. He adds
+By substituting other cities (he notices that these cities seem to have in common that there has been a workshop or conference on theoretical computer science there at which always the same person had a paper, attended, or gave a talk) Euclid can change the way his presentation is going to look. He decides to choose some theme that is reasonably simple but, since his talk is not too short, shows a bit of navigational information.
+
+He settles on the |Frankfurt| theme but decides that the light-dark contrast is too strong. He adds
 \begin{verbatim}
 \usecolortheme{seahorse}
-\usecolortheme{rose} 
-\end{verbatim}  
+\usecolortheme{rose}
+\end{verbatim}
 The result seems some more subdued to him.
 
-Euclid decides that the font used for the titles is not quite
-classical enough (classical fonts are the latest chic in
-Alexandria). So, he adds
+Euclid decides that the font used for the titles is not quite classical enough (classical fonts are the latest chic in Alexandria). So, he adds
 \begin{verbatim}
 \usefonttheme[onlylarge]{structuresmallcapsserif}
 \end{verbatim}
-
-Euclid notices that the small fonts in the navigation bars
-are a bit hard to read as they are so thin. Adding the following
-helps:
+Euclid notices that the small fonts in the navigation bars are a bit hard to read as they are so thin. Adding the following helps:
 \begin{verbatim}
 \usefonttheme[onlysmall]{structurebold}
 \end{verbatim}
@@ -621,41 +408,20 @@ helps:
 
 \subsection{Changing the Way Things Look II: Colors and Fonts}
 
-Since Euclid wants to give a \emph{perfect} talk, he decides that the
-font used for the title simply has to be a serif italics. To change
-only the font used for the title, Euclid uses the following command:
+Since Euclid wants to give a \emph{perfect} talk, he decides that the font used for the title simply has to be a serif italics. To change only the font used for the title, Euclid uses the following command:
 \begin{verbatim}
 \setbeamerfont{title}{shape=\itshape,family=\rmfamily}
 \end{verbatim}
-He notices that the font is still quite large (which he likes), but
-wonders why this is the case since he did not specify this. The reason
-is that calls of |\setbeamerfont| accumulate and the size was already
-set to |\large| by some font theme. Using the starred version of
-|\setbeamerfont| ``resets'' the font.
 
-Euclid decides that he would also like to change the color of the
-title to a dashing red, though, perhaps, with a bit of black added. He
-uses the following command:
+He notices that the font is still quite large (which he likes), but wonders why this is the case since he did not specify this. The reason is that calls of |\setbeamerfont| accumulate and the size was already set to |\large| by some font theme. Using the starred version of |\setbeamerfont| ``resets'' the font.
+
+Euclid decides that he would also like to change the color of the title to a dashing red, though, perhaps, with a bit of black added. He uses the following command:
 \begin{verbatim}
 \setbeamercolor{title}{fg=red!80!black}
 \end{verbatim}
-Trying the following command, Euclid is delighted to find that
-specifying a background color also has an effect:
+Trying the following command, Euclid is delighted to find that specifying a background color also has an effect:
 \begin{verbatim}
 \setbeamercolor{title}{fg=red!80!black,bg=red!20!white}
 \end{verbatim}
 
-
-Finally, Euclid is satisfied with the presentation and goes ahead and
-gives a great talk at the conference, making many new friends. He also
-writes that email to \beamer's author containing that long list of
-things that he missed in \beamer\ or that do not work. He is a bit
-disappointed to learn that it might take till ISPN~'79 for all these
-things to be taken care of, but he also understands that \beamer's
-author also needs some time to do research or otherwise he would have
-nothing to given presentations about.
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+Finally, Euclid is satisfied with the presentation and goes ahead and gives a great talk at the conference, making many new friends. He also writes that email to \beamer's author containing that long list of things that he missed in \beamer\ or that do not work. He is a bit disappointed to learn that it might take till ISPN~'79 for all these things to be taken care of, but he also understands that \beamer's authors also need some time to do research or otherwise he would have nothing to give presentations about.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-twoscreens.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-twoscreens.tex
index a385d5f1fa3..316e2d496aa 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-twoscreens.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-twoscreens.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,117 +8,49 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-twoscreens.tex,v 1.2 2007/01/28 20:48:21 tantau Exp $
-
+% $Header$
 
 \section{Taking Advantage of Multiple Screens}
-
 \label{section-twoscreens}
 
-This section describes options provided by \beamer\ for taking
-advantage of computers that have more than one video output and 
-can display different outputs on them. For such systems, one video
-output can be attached to a projector and the main presentation is
-shown there. The second video output is attached to a small extra
-monitor (or is just shown on the display of the computer) and shows,
-for example, special notes for you. Alternatively, the two outputs
-might be attached to two different projectors. One can then show the
-main presentation on the first projection and, say, the table of
-contents on the second. Or the second projection might show a version
-translated into a different language. Or the seoncd projection might
-alwyas show the ``previous'' slide. Or \ldots---I am sure you can
-think of further useful things. 
-
-The basic idea behind \beamer's support of two video outputs is the
-following: Using special options you can ask \beamer\ to create a
-\pdf-file in which the ``pages'' are unusually wide or high. By
-default, their height will still be 128mm, but their width will be
-192mm (twice the usual 96mm). These ``superwide'' pages will show 
-the slides of the main presentation on the left and auxilliary
-material on the right (this can be switched using appropriate
-options, though hyperlinks will only work if the presentation is on
-the left and the second screen on the right).
-
-For the presentation you attach two screens to the system. The
-windowing system believe that the screen is twice as wide as it
-actually is. Everything the windowing system puts on the left half of
-this big virtual screen is redirected to the first video output,
-everything on the right half is redirected to the second video
-output. 
-
-When the presentation program displays the specially prepared
-superwide \beamer-presentation, exactly the left half of the screen
-will be filled with the main presentation, the right part is filled
-with the auxilliary material---voil�. Not all presentation programs
-support this special feature. For example, the Acrobat Reader 6.0.2 will
-only use one screen in fullscreen mode on MacOS~X. You will have to
-find out for yourself whether your display program and system support
-showing superwise presentations stretching over two screens.
-
-\beamer\ uses the package |pgfpages| to typeset two-screen
-presentations. Because of this, your first step when creating a
-two-screen presentation is to include this package:
+This section describes options provided by \beamer\ for taking advantage of computers that have more than one video output and can display different outputs on them. For such systems, one video output can be attached to a projector and the main presentation is shown there. The second video output is attached to a small extra monitor (or is just shown on the display of the computer) and shows, for example, special notes for you. Alternatively, the two outputs might be attached to two different projectors. One can then show the main presentation on the first projection and, say, the table of contents on the second. Or the second projection might show a version translated into a different language. Or the seoncd projection might alwyas show the ``previous'' slide. Or \ldots---we are sure you can think of further useful things.
+
+The basic idea behind \beamer's support of two video outputs is the following: Using special options you can ask \beamer\ to create a \pdf-file in which the ``pages'' are unusually wide or high. By default, their height will still be 128mm, but their width will be 192mm (twice the usual default 96mm). These ``superwide'' pages will show the slides of the main presentation on the left and auxilliary material on the right (this can be switched using appropriate options, though hyperlinks will only work if the presentation is on the left and the second screen on the right).
+
+For the presentation you attach two screens to the system. The windowing system believe that the screen is twice as wide as it actually is. Everything the windowing system puts on the left half of this big virtual screen is redirected to the first video output, everything on the right half is redirected to the second video output.
+
+When the presentation program displays the specially prepared superwide \beamer-presentation, exactly the left half of the screen will be filled with the main presentation, the right part is filled with the auxilliary material---voil\`a. Not all presentation programs support this special feature. For example, the Acrobat Reader 6.0.2 will only use one screen in fullscreen mode on MacOS~X. You will have to find out for yourself whether your display program and system support showing superwise presentations stretching over two screens.
+
+\beamer\ uses the package |pgfpages| to typeset two-screen presentations. Because of this, your first step when creating a two-screen presentation is to include this package:
 \begin{verbatim}
 \documentclass{beamer}
 \usepackage{pgfpages}
 \end{verbatim}
 
-The next step is to choose an appropriate option for showing something
-special on the second screen. These options are discussed in the
-following sections.
+The next step is to choose an appropriate option for showing something special on the second screen. These options are discussed in the following sections.
 
-One of the things these options do is to setup a certain
-|pgfpages|-layout that is appropriate for two-screen
-presentations. However, you can still change hte |pgfpages|-layout
-arbitrarily, afterwards. For example, you might wish to enlarge the
-virtual pages. For details, see the documentation of |pgfpages|.
+One of the things these options do is to setup a certain |pgfpages|-layout that is appropriate for two-screen presentations. However, you can still change hte |pgfpages|-layout arbitrarily, afterwards. For example, you might wish to enlarge the virtual pages. For details, see the documentation of |pgfpages|.
 
 
 \subsection{Showing Notes on the Second Screen}
 
-The first way to use a second screen is to show the presentation
-on the main screen and to show your notes on the second screen. The
-option |show notes on second screen| can be used for this. It is
-described on page~\pageref{command-notesonsecondscreen}.  
-
+The first way to use a second screen is to show the presentation on the main screen and to show your notes on the second screen. The option |show notes on second screen| can be used for this. It is described on page~\pageref{command-notesonsecondscreen}.
 
 
 \subsection{Showing Second Mode Material on the Second Screen}
 
-The second way to use the second screen is to show ``a different
-vesion'' of the presentation on the second screen. This different
-version might be a translation or it might just always be the current
-table of contents.
+The second way to use the second screen is to show ``a different vesion'' of the presentation on the second screen. This different version might be a translation or it might just always be the current table of contents.
 
-To specify what is shown on the second screen, you can use a special
-\beamer-mode called |second|. This mode behaves similar to modes like
-|handout| or |beamer|, but its effect depends on the exact options
-used:
+To specify what is shown on the second screen, you can use a special \beamer-mode called |second|. This mode behaves similar to modes like |handout| or |beamer|, but its effect depends on the exact options used:
 
 \begin{beameroption}{second mode text on second screen}{|=|\meta{location}}
-  This option causes the second screen to show the second mode
-  material. The \meta{location} of the second screen can be |left|,
-  |right|, |bottom|, or |top|.
-
-  In detail, the following happens: When a new frame needs to be
-  typeset, \beamer\ checks whether the special option |typeset second|
-  is given. If not, the frame is typeset normally and the slides are
-  put on the main presentation screen  (more precisely, on the logical
-  |pgfpages|-page number zero). The second screen (logical page number
-  one) shows whatever it showed before the frame was typeset.
-
-  If the special frame option |typeset second| is given, after each
-  slide of the frame the frame contents is typeset once more, but this
-  time for the mode |second|. This results in another slide, which
-  is put on the second screen (on logical page number one). Then the
-  whole page is shipped out.
-
-  The |second| mode behaves more like the |beamer| mode than
-  other modes: Any overlay specification for |beamer| will also apply
-  to |second| mode, unless an explicit |second| mode specification is
-  also given. In particular, |\only<1-2>{Text}| will be shown on
-  slides 1 and 2 in |second| mode, but only on the first slide in
-  |handout| mode or |trans| mode.
+  This option causes the second screen to show the second mode material. The \meta{location} of the second screen can be |left|, |right|, |bottom|, or |top|.
+
+  In detail, the following happens: When a new frame needs to be typeset, \beamer\ checks whether the special option |typeset second| is given. If not, the frame is typeset normally and the slides are put on the main presentation screen (more precisely, on the logical |pgfpages|-page number zero). The second screen (logical page number one) shows whatever it showed before the frame was typeset.
+
+  If the special frame option |typeset second| is given, after each slide of the frame the frame contents is typeset once more, but this time for the mode |second|. This results in another slide, which is put on the second screen (on logical page number one). Then the whole page is shipped out.
+
+  The |second| mode behaves more like the |beamer| mode than other modes: Any overlay specification for |beamer| will also apply to |second| mode, unless an explicit |second| mode specification is also given. In particular, |\only<1-2>{Text}| will be shown on slides 1 and 2 in |second| mode, but only on the first slide in |handout| mode or |trans| mode.
 
   \example
 \begin{verbatim}
@@ -129,7 +62,7 @@ used:
   This text is shown on the left and on the right.
   \only<second>{This text is only shown on the right.}
   \only<second:0>{This text is only shown on the left.}
-\end{document}
+\end{frame}
 \begin{frame}
   This text is shown on the left. The right shows the same as for the
   previous frame.
@@ -142,8 +75,8 @@ used:
 \end{document}
 \end{verbatim}
 
-  \example The following example shows how translations can be added
-  in a comfortable way.
+  \example
+  The following example shows how translations can be added in a comfortable way.
 \begin{verbatim}
 \documentclass{beamer}
 \usepackage{pgfpages}
@@ -166,35 +99,21 @@ used:
   \translation{Do not use line-by-line uncovering.|Man sollte Text nicht
   Zeile f\"ur Zeile aufdecken.}
 \end{frame}
-\end{document}  
+\end{document}
 \end{verbatim}
 \end{beameroption}
 
-In the last of the above example, it is a bit bothersome that the
-option |typeset second| has to be added to each frame. The following
-option globally sets this option:
+In the last of the above example, it is a bit bothersome that the option |typeset second| has to be added to each frame. The following option globally sets this option:
+
 \begin{beameroption}{always typeset second mode}{|=|\meta{true or false}}
-  When this option is set to true, every following frame will have the
-  option |typeset second| set to true.
+  When this option is set to true, every following frame will have the option |typeset second| set to true.
 \end{beameroption}
 
 
 \subsection{Showing the Previous Slide on the Second Screen}
 
 \begin{beameroption}{previous slide on second screen}{|=|\meta{location}}
-  This option causes the second screen to show the previous slide that
-  was typeset, unless this is overruled by a frame with the
-  |[typeset second]| option set. The idea is that if you have two
-  projectors you can always present ``the last two'' slides
-  simultaneously and talk about them.
-
-  Using this option will switch off the updating of external files
-  like the table of contents.
-\end{beameroption}
-
+  This option causes the second screen to show the previous slide that was typeset, unless this is overruled by a frame with the |[typeset second]| option set. The idea is that if you have two projectors you can always present ``the last two'' slides simultaneously and talk about them.
 
-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "beameruserguide"
-%%% End: 
+  Using this option will switch off the updating of external files like the table of contents.
+\end{beameroption}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-workflow.tex b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-workflow.tex
index b003a8efdfe..29c2faeb5e2 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beamerug-workflow.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beamerug-workflow.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,63 +8,32 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beamerug-workflow.tex,v 1.12 2007/01/28 20:48:21 tantau Exp $
+% $Header$
 
 \section{Workflow For Creating a Beamer Presentation}
-
 \label{section-workflow}
 
-This section presents a possible workflow for creating a \beamer\ 
-presentation and possibly a handout to go along with it. Technical
-questions are addressed, like which programs to call with 
-which parameters.
-
+This section presents a possible workflow for creating a \beamer\ presentation and possibly a handout to go along with it. Technical questions are addressed, like which programs to call with which parameters.
 
 
 \subsection{Step One: Setup the Files}
 
 \beamernote
-It is advisable that you create a folder for each
-presentation. Even though your presentation will usually reside in a
-single file, \TeX\ produces so many extra files that things can easily
-get very confusing otherwise. The folder's name should ideally start
-with the date of your talk in ISO format (like 2003-12-25 for a
-Christmas talk), followed by some reminder text of what the talk is
-all about. Putting the date at the front in this format causes your
-presentation folders to be listed nicely when you have several of them
-residing in one directory. If you use an extra directory for each
-presentation, you can call your main file |main.tex|. 
-
-To create an initial |main.tex| file for your talk, copy an
-existing file from the |beamer/solutions| directory and adapt it to
-your needs. A list of possible \beamer\ solutions that contain
-templates for presentation \TeX-files can be found below.
-
-If you wish your talk to reside in the same file as some different,
-non-presentation article version of your text, it is advisable to
-setup a more elaborate file scheme. See
-Section~\ref{section-article-version-workflow} for details.
+It is advisable that you create a folder for each presentation. Even though your presentation will usually reside in a single file, \TeX\ produces so many extra files that things can easily get very confusing otherwise. The folder's name should ideally start with the date of your talk in ISO format (like 2003-12-25 for a Christmas talk), followed by some reminder text of what the talk is all about. Putting the date at the front in this format causes your presentation folders to be listed nicely when you have several of them residing in one directory. If you use an extra directory for each presentation, you can call your main file |main.tex|.
 
-\lyxnote
-You can either open a new file and then select |beamer| as the
-document class or you say ``New from template'' and then use a
-template from the directory |beamer/solutions|.
+To create an initial |main.tex| file for your talk, copy an existing file from the |beamer/solutions| directory and adapt it to your needs. A list of possible \beamer\ solutions that contain templates for presentation \TeX-files can be found below.
 
+If you wish your talk to reside in the same file as some different, non-presentation article version of your text, it is advisable to setup a more elaborate file scheme. See Section~\ref{section-article-version-workflow} for details.
 
+\lyxnote
+You can either open a new file and then select |beamer| as the document class or you say ``New from template'' and then use a template from the directory |beamer/solutions|.
 
 
 \subsection{Step Two: Structure Your Presentation}
 
-The next step is to fill the presentation file with |\section| and
-|\subsection| to create a preliminary outline. You'll find some hints
-on how to create a good outline in
-Section~\ref{section-structure-guidelines}.
-
-Put |\section| and |\subsection| commands into
-the (more or less empty) main file. Do not create any frames until you
-have a first working version of a possible table of contents.
-The file might look like this:
+The next step is to fill the presentation file with |\section| and |\subsection| to create a preliminary outline. You'll find some hints on how to create a good outline in Section~\ref{section-structure-guidelines}.
 
+Put |\section| and |\subsection| commands into the (more or less empty) main file. Do not create any frames until you have a first working version of a possible table of contents. The file might look like this:
 \begin{verbatim}
 \documentclass{beamer}
 %% This is the file main.tex
@@ -103,71 +73,44 @@ The file might look like this:
 
 \end{document}
 \end{verbatim}
-
-The empty frame at the end (which should be deleted later) ensures
-that the sections and subsections are actually part of the table of
-contents. This frame is necessary since a |\section| or |\subsection|
-command following the last page of a document has no effect.
-
+The empty frame at the end (which should be deleted later) ensures that the sections and subsections are actually part of the table of contents. This frame is necessary since a |\section| or |\subsection| command following the last page of a document has no effect.
 
 
 \subsection{Step Three: Creating a PDF or PostScript File}
 
 \beamernote
-Once a first version of the structure is finished, you should try to
-create a first PDF or PostScript file of your (still empty) talk to
-ensure that everything is working properly. This file
-will only contain the title page and the table of contents.
-\lyxnote
-Use ``View'' to check whether the presentation compiles fine. Note
-that you must put the table of contents inside a frame, but that the
-title page is created automatically.
+Once a first version of the structure is finished, you should try to create a first PDF or PostScript file of your (still empty) talk to ensure that everything is working properly. This file will only contain the title page and the table of contents.
 
+\lyxnote
+Use ``View'' to check whether the presentation compiles fine. Note that you must put the table of contents inside a frame, but that the title page is created automatically.
 
 \subsubsection{Creating PDF}
 
 \beamernote
-To create a |PDF| version of this file, run the program
-|pdflatex| on |main.tex| at least twice. Your need to run it twice, so
-that \TeX\ can create the table of contents. (It may even be necessary
-to run it more often since all sorts of auxiliary files are
-created.) In the following example, the greater-than-sign is the prompt. 
-
+To create a |PDF| version of this file, run the program |pdflatex| on |main.tex| at least twice. You need to run it twice, so that \TeX\ can create the table of contents. (It may even be necessary to run it more often since all sorts of auxiliary files are created.) In the following example, the greater-than-sign is the prompt.
 \begin{verbatim}
 > pdflatex main.tex
     ... lots of output ...
 > pdflatex main.tex
     ... lots of output ...
 \end{verbatim}
+Alternatively, you can use |lualatex| or |xelatex| instead of |pdflatex| in above commands.
 
-You can next use a program like the Acrobat Reader or |xpdf|
-to view the resulting presentation.
-
+You can next use a program like the Acrobat Reader, |xpdf|, |evince| or |okular| to view the resulting presentation.
 \begin{verbatim}
 > acroread main.pdf
 \end{verbatim}
 
-
 \lyxnote
 Choose ``View pdf'' to view your presentation.
 
-
 \subsubsection{Creating PostScript}
 \label{section-postscript}
 
 \beamernote
-To create a PostScript version, you should first ascertain that the
-\textsc{hyperref} package (which is automatically loaded by the
-\beamer\ class) uses the option |dvips| or some compatible
-option, see the documentation of the \textsc{hyperref} package for
-details. Whether this is the case depends on the contents of your
-local |hyperref.cfg| file. You can enforce the usage of this
-option by passing |dvips| or a compatible option to the
-\beamer\ class (write |\documentclass[dvips]{beamer}|), which
-will pass this option on to the \textsc{hyperref} package.
+To create a PostScript version, you should first ascertain that the \textsc{hyperref} package (which is automatically loaded by the \beamer\ class) uses the option |dvips| or some compatible option, see the documentation of the \textsc{hyperref} package for details. Whether this is the case depends on the contents of your local |hyperref.cfg| file. You can enforce the usage of this option by passing |dvips| or a compatible option to the \beamer\ class (write |\documentclass[dvips]{beamer}|), which will pass this option on to the \textsc{hyperref} package.
 
 You can then run |latex| twice, followed by |dvips|.
-
 \begin{verbatim}
 > latex main.tex
     ... lots of output ...
@@ -176,12 +119,9 @@ You can then run |latex| twice, followed by |dvips|.
 > dvips -P pdf main.dvi
 \end{verbatim}
 
-The option (|-P pdf|) tells |dvips| to use
-Type~1 outline fonts instead of the usual Type~3 bitmap fonts. You may
-wish to omit this option if there is a problem with it. 
+The option (|-P pdf|) tells |dvips| to use Type~1 outline fonts instead of the usual Type~3 bitmap fonts. You may wish to omit this option if there is a problem with it.
 
 You can convert a PostScript file to a pdf file using
-
 \begin{verbatim}
 > ps2pdf main.ps main.pdf
 \end{verbatim}
@@ -189,40 +129,21 @@ You can convert a PostScript file to a pdf file using
 \lyxnote
 Use ``View Postscript'' to view the PostScript version.
 
-
-
-
 \subsubsection{Ways of Improving Compilation Speed}
 \label{section-speedup}
 
-While working on your presentation, it may sometimes be useful to
-\TeX\ your |.tex| file quickly and have the presentation contain only
-the most important information. This is especially true if you have a
-slow machine. In this case, you can do several things to speedup the
-compilation. First, you can use the |draft| class option.
+While working on your presentation, it may sometimes be useful to \TeX\ your |.tex| file quickly and have the presentation contain only the most important information. This is especially true if you have a slow machine. In this case, you can do several things to speed up the compilation. First, you can use the |draft| class option.
 
 \begin{classoption}{draft}
-  Causes the headlines, footlines, and sidebars to be replaced by
-  gray rectangles (their sizes are still computed, though). Many
-  other packages, including |pgf| and |hyperref|, also ``speedup''
-  when this option is given.
+  Causes the headlines, footlines, and sidebars to be replaced by gray rectangles (their sizes are still computed, though). Many other packages, including |pgf| and |hyperref|, also ``speed up'' when this option is given.
 \end{classoption}
 
 Second, you can use the following command:
 
 \begin{command}{{\includeonlyframes}\marg{frame label list}}
-  This command behaves a little bit like the |\includeonly| command:
-  Only the frames mentioned in the list are included. All other frames
-  are suppressed. Nevertheless, the section and subsection commands
-  are still executed, so that you still have the correct navigation
-  bars. By labeling the current frame as, say, |current| and then
-  saying |\includeonlyframes{current}|, you can work on a single frame
-  quickly.  
-
-  The \meta{frame label list} is a comma-separated list (without
-  spaces) of the names of frames that have been labeled. To label a
-  frame, you must pass the option |label=|\meta{name} to the |\frame|
-  command or |frame| environment.
+  This command behaves a little bit like the |\includeonly| command: Only the frames mentioned in the list are included. All other frames are suppressed. Nevertheless, the section and subsection commands are still executed, so that you still have the correct navigation bars. By labeling the current frame as, say, |current| and then saying |\includeonlyframes{current}|, you can work on a single frame quickly.
+
+  The \meta{frame label list} is a comma-separated list (without spaces) of the names of frames that have been labeled. To label a frame, you must pass the option |label=|\meta{name} to the |\frame| command or |frame| environment.
 
   \example
 \begin{verbatim}
@@ -241,124 +162,60 @@ Second, you can use the following command:
 \end{command}
 
 
-
 \subsection{Step Four: Create Frames}
 
-Once the table of contents looks satisfactory, start creating frames
-for your presentation by adding |frame| environments. You'll find
-guidelines on what to put on a frame in
-Section~\ref{section-frame-guidelines}. 
+Once the table of contents looks satisfactory, start creating frames for your presentation by adding |frame| environments. You'll find guidelines on what to put on a frame in Section~\ref{section-frame-guidelines}.
 
 \lyxnote
-To create a frame, use the style ``BeginFrame''. The frame title
-is given on the line of this style. The frame ends automatically with
-the start of the next frame, with a section or subsection command, and
-with an empty line in the style ``EndFrame''. Note that the last frame
-of your presentation must be ended using ``EndFrame'' and that the
-last frame before the appendix must be ended this way.
-
-
-
+To create a frame, use the style ``BeginFrame''. The frame title is given on the line of this style. The frame ends automatically with the start of the next frame, with a section or subsection command, and with an empty line in the style ``EndFrame''. Note that the last frame of your presentation must be ended using ``EndFrame'' and that the last frame before the appendix must be ended this way.
 
 
 \subsection{Step Five: Test Your Presentation}
 
-\emph{Always} test your presentation. For this, you should
-vocalize or subvocalize your talk in a quiet environment. Typically,
-this will show that your talk is too long. You should then remove
-parts of the presentation, such that it fits into the allotted time
-slot. Do \emph{not} attempt to talk faster in order to squeeze the
-talk into the given amount of time. You are almost sure to loose your
-audience this way.
-
-Do not try to create the ``perfect'' presentation immediately. Rather,
-test and retest the talk and modify it as needed. 
-
+\emph{Always} test your presentation. For this, you should vocalize or subvocalize your talk in a quiet environment. Typically, this will show that your talk is too long. You should then remove parts of the presentation, such that it fits into the allotted time slot. Do \emph{not} attempt to talk faster in order to squeeze the talk into the given amount of time. You are almost sure to lose your audience this way.
 
+Do not try to create the ``perfect'' presentation immediately. Rather, test and retest the talk and modify it as needed.
 
 
 \subsection{Step Six: Create a Handout}
 
 \subsubsection{Creating the Handout}
 
-Once your talk is fixed, you can create a handout, if this seems
-appropriate. For this, you can use the class option |handout| as
-explained in Section~\ref{handout}. Typically, you might wish
-to put several handout slides on one page, see below on how to do
-this easily.
-
-You may also wish to create an article version of your talk. An
-``article version'' of your presentation is a normal \TeX\ text
-typeset using, for example, the document class |article| or perhaps
-|llncs| or a similar document class. The \beamer\ class offers
-facilities to have this version coexist with your presentation version
-in one file and to share code. Also, you can include slides of your
-presentation as figures in your article version. Details on how to
-setup the article version can be found in
-Section~\ref{section-article}.  
+Once your talk is fixed, you can create a handout, if this seems appropriate. For this, you can use the class option |handout| as explained in Section~\ref{handout}. Typically, you might wish to put several handout slides on one page, see below on how to do this easily.
 
-\lyxnote
-Creating an article version is not really possible in \LyX. You
-can \emph{try}, but I would not advise it.
+You may also wish to create an article version of your talk. An ``article version'' of your presentation is a normal \TeX\ text typeset using, for example, the document class |article| or perhaps |llncs| or a similar document class. The \beamer\ class offers facilities to have this version coexist with your presentation version in one file and to share code. Also, you can include slides of your presentation as figures in your article version. Details on how to setup the article version can be found in Section~\ref{section-article}.
 
+\lyxnote
+Creating an article version is not really possible in \LyX. You can \emph{try}, but we would not advise it.
 
 \subsubsection{Printing the Handout}
 \label{section-printing-version}
 
-The easiest way to print a presentation is to user the Acrobat Reader
-with the option ``expand small pages to paper size'' form the printer
-dialog enabled. This is necessary, because slides are only 128mm times
-96mm.
+The easiest way to print a presentation is to user the Acrobat Reader with the option ``expand small pages to paper size'' form the printer dialog enabled. This is necessary, because slides are by default only 128mm by 96mm large.
 
-For the PostScript version and for printing multiple slides on a
-single page this simple approach does not work. In such cases you can
-use the |pgfpages| package, which works directly both with |pdflatex|
-and |latex| plus |dvips|. Note however \emph{that this package
-  destroys hyperlinks}. This is due to fundamental flaws in the
-\pdf-specification and not likely to change.
-
-The |pgfpages| can do all sorts of tricks with pages. The most
-important one for printing \beamer\ slides is the following command:
+For the PostScript version and for printing multiple slides on a single page this simple approach does not work. In such cases you can use the |pgfpages| package, which works directly with |pdflatex|, |lualatex|, |xelatex| and |latex| plus |dvips|. Note however \emph{that this package destroys hyperlinks}. This is due to fundamental flaws in the \pdf-specification and it is not likely to change.
 
+The |pgfpages| can do all sorts of tricks with pages. The most important one for printing \beamer\ slides is the following command:
 \begin{verbatim}
 \usepackage{pgfpages}
 \pgfpagesuselayout{resize}[a4paper,border shrink=5mm,landscape]
 \end{verbatim}
+This says ``Resize all pages to landscape A4 pages, no what their original size was, but shrink the pages by 5mm, so that there is a bit of a border around everything.'' Naturally, instead of |a4paper| you can also use |letterpaper| or any of the other standard paper sizes. For further options and details see the documentation of |pgfpages|.
 
-This says ``Resize all pages to landscape A4 pages, no what their
-original size was, but shrink the pages by 5mm, so that there is a bit
-of a border around everything.'' Naturally, instead of |a4paper| you
-can also use |letterpaper| or any of the other standard paper
-sizes. For further options and details see the documentation of
-|pgfpages|.
-
-The second thing you might wish to do is to put several slides on a
-single page. This can be done as follows:
-
+The second thing you might wish to do is to put several slides on a single page. This can be done as follows:
 \begin{verbatim}
 \usepackage{pgfpages}
 \pgfpagesuselayout{2 on 1}[a4paper,border shrink=5mm]
 \end{verbatim}
+This says ``Put two pages on one page and then resize everything so that it fits on A4 paper.'' Note that this time we do not need landscape as the resulting page is, after all, not in landscape mode.
 
-This says ``Put two pages on one page and then resize everything so
-that it fits on A4 paper.'' Note that this time we do not need
-landscape as the resulting page is, after all, not in landscape mode.
-
-Instead of |2 on 1| you can also use |4 on 1|, but then with
-|landscape| once more, and also |8 on 1| and even |16 on 1| to get a
-grand (though unreadable) overview.
-
-If you put several slides on one page and if these slides normally
-have a white background, it may be useful to write the following in
-your preamble: 
+Instead of |2 on 1| you can also use |4 on 1|, but then with |landscape| once more, and also |8 on 1| and even |16 on 1| to get a grand (though unreadable) overview.
 
+If you put several slides on one page and if these slides normally have a white background, it may be useful to write the following in your preamble:
 \begin{verbatim}
 \mode<handout>{\setbeamercolor{background canvas}{bg=black!5}}
 \end{verbatim}
-
-This will cause the slides of the handout version to have a very
-light gray background. This makes it easy to discern the slides'
-border if several slides are put on one page.
+This will cause the slides of the handout version to have a very light gray background. This makes it easy to discern the slides' border if several slides are put on one page.
 
 %% If you wish each slide to completely fill a letter-sized page, use the
 %% following commands instead:
@@ -377,7 +234,7 @@ border if several slides are put on one page.
 
 %% In order to create a white margin around the whole page (which is sometimes
 %% useful for printing), add the option |-m 1cm| to the options of
-%% |psnup|. 
+%% |psnup|.
 
 %% To put two or four slides on one page, use |-2|, respectively
 %% |-4| instead of |-1| as the first parameter for
@@ -385,6 +242,3 @@ border if several slides are put on one page.
 %% |-b 1cm| to add a bit of space around the individual slides. The same
 %% trick as for the \pdf-version can be used to make the borders of
 %% slides more pronounced in the handout version.
-
-
-
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
index ceaaa961220..6b7219120fd 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
index e1f2f1d2b7e..ceeab0a7757 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
+++ b/Master/texmf-dist/doc/latex/beamer/doc/beameruserguide.tex
@@ -1,4 +1,5 @@
-% Copyright 2007 by Till Tantau
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
 %
 % This file may be distributed and/or modified
 %
@@ -7,21 +8,25 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-% $Header: /cvsroot/latex-beamer/latex-beamer/doc/beameruserguide.tex,v 1.126 2007/03/11 18:50:44 tantau Exp $
+% $Header$
 
 \documentclass{ltxdoc}
 
-\def\version{3.07}
-\def\pgfversion{1.00}
-\def\xcolorversion{2.00}
+\def\beamerugversion{3.08}
+\def\beamerugpgfversion{1.00}
+\def\beamerugxcolorversion{2.00}
 
-\usepackage{pgf,xcolor}
-\usepackage[left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
+\usepackage{cmap}
+\usepackage{lmodern}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
 \usepackage{amsmath,amssymb}
-\usepackage[pdfborder={0 0 0},bookmarksnumbered]{hyperref}
-\usepackage[latin1]{inputenc}
 \usepackage{pifont}
 \usepackage{makeidx}
+\usepackage{pgf,xcolor}
+\usepackage[pdfborder={0 0 0},bookmarksnumbered]{hyperref}
+\usepackage[left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
+
 
 \input{beamerug-macros}
 
@@ -36,12 +41,14 @@
 \vbox{}
 \vskip 3.5cm
 \Huge
-The \textsc{beamer} \textit{class}
+The \beamer\ \textit{class}
 
 \Large
-Manual for version \version.
+User Guide for version \beamerugversion.
 \vskip 3cm
 
+
+
 \normalsize
 \begin{verbatim}
 \begin{frame}
@@ -56,46 +63,35 @@ Manual for version \version.
     \item<2-> Let $q$ be the product of the first $p$ numbers.
     \item<3-> Then $q+1$ is not divisible by any of them.
     \item<1-> Thus $q+1$ is also prime and greater than $p$.\qedhere
-    \end{enumerate}      
+    \end{enumerate}
   \end{proof}
 \end{frame}
 \end{verbatim}
 \pgfimage[width=.45\textwidth,page=2]{beamerugthemePittsburgh}\qquad\pgfimage[width=.45\textwidth,page=2]{beamerugthemeFrankfurt}
 \vskip 0cm plus 1.5fill
-\vbox{}         
+\vbox{}
 \clearpage
 }
 
 {
   \vbox{}
   \vskip0pt plus 1fill
-  F�r alle, die die Sch�nheit von Wissenschaft anderen zeigen wollen.
+  F\"ur alle, die die Sch\"onheit von Wissenschaft anderen zeigen wollen.
   \vskip0pt plus 3fill
 
   \parindent=0pt
-  Copyright 2007 by Till Tantau
-
-  \medskip  
-  Permission is granted to copy, distribute and/or modify \emph{the documentation}
-  under the terms of the \textsc{gnu} Free Documentation License, Version 1.2
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-  A copy of the license is included in the section entitled \textsc{gnu}
-  Free Documentation License.
-
-  \medskip  
-  Permission is granted to copy, distribute and/or modify \emph{the
-    code of the package} under the terms of the \textsc{gnu} Public License, Version 2
-  or any later version published by the Free Software Foundation.
-  A copy of the license is included in the section entitled \textsc{gnu}
-  Public License.
-
-  \medskip  
-  Permission is also granted to distribute and/or modify \emph{both
-    the documentation and the code} under the conditions of the LaTeX
-  Project Public License, either version 1.3 of this license or (at
-  your option) any later version. A copy of the license is included in
-  the section entitled \LaTeX\ Project Public License. 
+  Copyright 2003--2007 by Till Tantau
+
+  Copyright 2010 by Joseph Wright and Vedran Mileti\'c
+
+  \medskip
+  Permission is granted to copy, distribute and/or modify \emph{the documentation} under the terms of the \textsc{gnu} Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled \textsc{gnu} Free Documentation License.
+
+  \medskip
+  Permission is granted to copy, distribute and/or modify \emph{the code of the package} under the terms of the \textsc{gnu} General Public License, Version 2 or any later version published by the Free Software Foundation. A copy of the license is included in the section entitled \textsc{gnu} General Public License.
+
+  \medskip
+  Permission is also granted to distribute and/or modify \emph{both the documentation and the code} under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. A copy of the license is included in the section entitled \LaTeX\ Project Public License.
 
   \vbox{}
   \clearpage
@@ -109,10 +105,10 @@ Manual for version \version.
 \index{Elements|see{Beamer templates, colors, and fonts}}
 \index{Template inserts|see{Inserts}}
 
-\title{User Guide to the Beamer Class, Version \version\\
-\Large\href{http://latex-beamer.sourceforge.net}{\texttt{http://latex-beamer.sourceforge.net}}}
-\author{Till Tantau\\
-  \href{mailto:tantau@users.sourceforge.net}{\texttt{tantau@users.sourceforge.net}}}
+\title{\Huge The \beamer\ \textit{class}\\
+\Large\url{http://bitbucket.org/rivanvx/beamer}\\
+\Large User Guide for version \beamerugversion.}
+\author{\href{mailto:tantau@users.sourceforge.net}{Till Tantau}, \href{mailto:joseph.wright@morningstar2.co.uk}{Joseph Wright}, \href{mailto:vmiletic@inf.uniri.hr}{Vedran Mileti\'c}}
 
 \maketitle
 
@@ -125,27 +121,13 @@ Manual for version \version.
 
 \part{Getting Started}
 
-This part helps you getting started. It starts with an explanation of
-how to install the class. Hopefully, this will be very simple, with a
-bit of luck the whole class is already correctly installed! You will
-also find an explanation of special things you should consider when
-using certain other packages.
+This part helps you getting started. It starts with an explanation of how to install the class. Hopefully, this will be very simple, with a bit of luck the whole class is already correctly installed! You will also find an explanation of special things you should consider when using certain other packages.
 
-Next, a short tutorial is given that explains most of the features
-that you'll need in a typical presentation. Following the tutorial you
-will find a ``possible workflow'' for creating a
-presentation. Following this workflow may help you avoid problems
-later on.
+Next, a short tutorial is given that explains most of the features that you'll need in a typical presentation. Following the tutorial you will find a ``possible workflow'' for creating a presentation. Following this workflow may help you avoid problems later on.
 
-This part includes a guidelines sections. Following these guidelines
-can help you create good presentations (no guarantees, though). This
-guideline section is kept as general as possible; most what is said in
-that section applies to presentations in general, independently of
-whether they have been created using \beamer\ or not.
+This part includes a guidelines sections. Following these guidelines can help you create good presentations (no guarantees, though). This guideline section is kept as general as possible; most of what is said in that section applies to presentations in general, independent of whether they have been created using \beamer\ or not.
 
-At the end of this part you will find a summary of the solutions
-templates that come with \beamer. You can use solutions templates to
-kick-start the creation of your presentation.
+At the end of this part you will find a summary of the solutions templates that come with \beamer. You can use solutions templates to kick-start the creation of your presentation.
 
 \include{beamerug-installation}
 \include{beamerug-tutorial}
@@ -158,20 +140,11 @@ kick-start the creation of your presentation.
 
 \part{Building a Presentation}
 
-This part contains an explanation of all the commands that are used to
-create presentations. It starts with a section treating the commands
-and environments used to create \emph{frames}, the basic building
-blocks of presentations. Next, the creation of overlays is
-explained.
+This part contains an explanation of all the commands that are used to create presentations. It starts with a section treating the commands and environments used to create \emph{frames}, the basic building blocks of presentations. Next, the creation of overlays is explained.
 
-The following three sections concern commands and methods
-of \emph{structuring} a presentation. In order, the \emph{static
-  global} structure, the \emph{interactive global} structure, and the
-\emph{local} structure are treated.
+The following three sections concern commands and methods of \emph{structuring} a presentation. In order, the \emph{static global} structure, the \emph{interactive global} structure, and the \emph{local} structure are treated.
 
-Two further sections treat graphics and animations. Much of the
-material in these sections applies to other packages as well, not just
-to \beamer.
+Two further sections treat graphics and animations. Much of the material in these sections applies to other packages as well, not just to \beamer.
 
 \include{beamerug-frames}
 \include{beamerug-overlays}
@@ -183,20 +156,11 @@ to \beamer.
 
 
 
-
 \part{Changing the Way Things Look}
 
-\beamer\ offers ways to change the appearance of an appearance at all
-levels of detail. On the top level, \emph{themes} can be used to
-globally change the appearance conveniently. On the bottom level,
-\emph{templates} allow you to specify the appearance of every minute
-detail individually.
+\beamer\ offers ways to change the appearance of a presentation at all levels of detail. On the top level, \emph{themes} can be used to globally change the appearance conveniently. On the bottom level, \emph{templates} allow you to specify the appearance of every minute detail individually.
 
-Two important aspects of the ``appearance'' of a presentation are
-treated in extra sections: colors and fonts. Here, too, color and
-font themes can be used to globally change the colors or fonts used in
-a presentation, while you can still change the color or font of, say,
-block titles independently of everything else. 
+Two important aspects of the ``appearance'' of a presentation are treated in extra sections: colors and fonts. Here, too, color and font themes can be used to globally change the colors or fonts used in a presentation, while you can still change the color or font of, say, block titles independently of everything else.
 
 \include{beamerug-themes}
 \include{beamerug-elements}
@@ -205,32 +169,21 @@ block titles independently of everything else.
 
 
 
-
 \part{Creating Supporting Material}
 
-The objective of the \beamer\ class is to simplify the creation of
-presentations using a projector. However, a presentation rarely exists
-in isolation. Material that accompanies a presentation includes:
+The objective of the \beamer\ class is to simplify the creation of presentations using a projector. However, a presentation rarely exists in isolation. Material that accompanies a presentation includes:
 \begin{itemize}
 \item
-  Presentations should normally be accompanied by 
-  \emph{handouts}, written text that the audience can read during
-  and/or after your presentation is given.
+  Presentations should normally be accompanied by \emph{handouts}, written text that the audience can read during and/or after your presentation is given.
 \item
-  You might wish to create notes for yourself that, ideally, are shown
-  to you on your computer screen while the audience sees the
-  presentation. 
+  You might wish to create notes for yourself that, ideally, are shown to you on your computer screen while the audience sees the presentation.
 \item
-  You might wish to create a printout of your talk, either for
-  yourself for checking for errors.
+  You might wish to create a printout of your talk, either for yourself for checking for errors.
 \item
-  You might wish to create a transparancies version of your talk as a
-  fall-back.
+  You might wish to create a transparancies version of your talk as a fall-back.
 \end{itemize}
 
-This part dicusses how \beamer\ helps you with the creation of the
-above.
-
+This part dicusses how \beamer\ helps you with the creation of the above.
 
 \include{beamerug-notes}
 \include{beamerug-transparancies}
@@ -239,18 +192,13 @@ above.
 
 
 
-
 \part{Howtos}
 
-This part contains explanations-of-how-to-do-things (commonly known as
-\emph{howtos}). These explanations are not really part of the
-``\beamer\ core.'' Rather, they explain how to use \beamer\ to achieve
-a certain effect or how get something special done.
+This part contains explanations-of-how-to-do-things (commonly known as \emph{howtos}). These explanations are not really part of the ``\beamer\ core.'' Rather, they explain how to use \beamer\ to achieve a certain effect or how get something special done.
 
 The first howto is about tricky uncovering situations.
 
-The second howto explains how you can import (parts or) presentations
-created using some other \LaTeX-presentation class, like \prosper. 
+The second howto explains how you can import (parts or) presentations created using some other \LaTeX-presentation class, like \prosper.
 
 \include{beamerug-tricks}
 \include{beamerug-emulation}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/LICENSE b/Master/texmf-dist/doc/latex/beamer/doc/licenses/LICENSE
index 34453179c01..b034cdc5fba 100644
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/LICENSE
+++ b/Master/texmf-dist/doc/latex/beamer/doc/licenses/LICENSE
@@ -1,34 +1,36 @@
 Licenses for the Beamer class
 =============================
 
-Different parts of the Beamer class package are distributed 
-under different licenses:
+Different parts of the Beamer class package are distributed under different
+licenses:
 
-1. The code of the package is dual-license. This means that
-   you can decide which license you wish to use when using the
-   beamer class. The two options are:
+1. The code of the package is dual-license. This means that you can decide which
+   license you wish to use when using the beamer package. The two options are:
 
-   a) You can use the GNU Public License, version 2.
-   b) You can use the LaTeX Project Public License, version 1.3c.
+   a) You can use the GNU General Public License, Version 2 or any later version
+      published by the Free Software Foundation.
+   b) You can use the LaTeX Project Public License, version 1.3c or (at your
+      option) any later version.
    
-2. The documentation of the package is also dual-license. Again,
-   you can choose between two options:
+2. The documentation of the package is also dual-license. Again, you can choose
+   between two options:
 
-   a) You can use the GNU Free Documentation License, version 1.2.
-   b) You can use the LaTeX Project Public License, version 1.3c.
+   a) You can use the GNU Free Documentation License, Version 1.3 or any later
+      version published by the Free Software Foundation.
+   b) You can use the LaTeX Project Public License, version 1.3c or (at your
+      option) any later version).
 
-The ``documentation of the package'' refers to all files in the
-subdirectory doc of the beamer package. A detailed listing can be
-found in the file
+The ``documentation of the package'' refers to all files in the subdirectory
+doc of the beamer package. A detailed listing can be found in the file
 
   doc/licenses/manifest-documentation.txt
 
-All files in other directories are part of the ``code of the
-class and package.'' A detailed listing can be found in the file
+All files in other directories are part of the ``code of the package.''
+A detailed listing can be found in the file
 
   doc/licenses/manifest-code.txt
 
-You will find the licenses in the manual and also as plain text
-versions in the directory
+You will find the licenses in the manual and also as plain text versions in the
+directory
 
   doc/licenses
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-free-documentation-license-1.2.txt b/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-free-documentation-license-1.2.txt
deleted file mode 100644
index 4a0fe1c8dee..00000000000
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-free-documentation-license-1.2.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-		GNU Free Documentation License
-		  Version 1.2, November 2002
-
-
- Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-public-license-2.txt b/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-public-license-2.txt
deleted file mode 100644
index d511905c164..00000000000
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/gnu-public-license-2.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/latex-project-public-license-1.3c.txt b/Master/texmf-dist/doc/latex/beamer/doc/licenses/latex-project-public-license-1.3c.txt
deleted file mode 100644
index 90e5e3ab797..00000000000
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/latex-project-public-license-1.3c.txt
+++ /dev/null
@@ -1,416 +0,0 @@
-The LaTeX Project Public License
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-LPPL Version 1.3c  2006-05-20
-
-Copyright 1999 2002-2006 LaTeX3 Project
-    Everyone is allowed to distribute verbatim copies of this
-    license document, but modification of it is not allowed.
-
-
-PREAMBLE
-========
-
-The LaTeX Project Public License (LPPL) is the primary license under
-which the the LaTeX kernel and the base LaTeX packages are distributed.
-
-You may use this license for any work of which you hold the copyright
-and which you wish to distribute.  This license may be particularly
-suitable if your work is TeX-related (such as a LaTeX package), but 
-it is written in such a way that you can use it even if your work is 
-unrelated to TeX.
-
-The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
-below, gives instructions, examples, and recommendations for authors
-who are considering distributing their works under this license.
-
-This license gives conditions under which a work may be distributed
-and modified, as well as conditions under which modified versions of
-that work may be distributed.
-
-We, the LaTeX3 Project, believe that the conditions below give you
-the freedom to make and distribute modified versions of your work
-that conform with whatever technical specifications you wish while
-maintaining the availability, integrity, and reliability of
-that work.  If you do not see how to achieve your goal while
-meeting these conditions, then read the document `cfgguide.tex'
-and `modguide.tex' in the base LaTeX distribution for suggestions.
-
-
-DEFINITIONS
-===========
-
-In this license document the following terms are used:
-
-   `Work'
-    Any work being distributed under this License.
-    
-   `Derived Work'
-    Any work that under any applicable law is derived from the Work.
-
-   `Modification' 
-    Any procedure that produces a Derived Work under any applicable
-    law -- for example, the production of a file containing an
-    original file associated with the Work or a significant portion of
-    such a file, either verbatim or with modifications and/or
-    translated into another language.
-
-   `Modify'
-    To apply any procedure that produces a Derived Work under any
-    applicable law.
-    
-   `Distribution'
-    Making copies of the Work available from one person to another, in
-    whole or in part.  Distribution includes (but is not limited to)
-    making any electronic components of the Work accessible by
-    file transfer protocols such as FTP or HTTP or by shared file
-    systems such as Sun's Network File System (NFS).
-
-   `Compiled Work'
-    A version of the Work that has been processed into a form where it
-    is directly usable on a computer system.  This processing may
-    include using installation facilities provided by the Work,
-    transformations of the Work, copying of components of the Work, or
-    other activities.  Note that modification of any installation
-    facilities provided by the Work constitutes modification of the Work.
-
-   `Current Maintainer'
-    A person or persons nominated as such within the Work.  If there is
-    no such explicit nomination then it is the `Copyright Holder' under
-    any applicable law.
-
-   `Base Interpreter' 
-    A program or process that is normally needed for running or
-    interpreting a part or the whole of the Work.    
-
-    A Base Interpreter may depend on external components but these
-    are not considered part of the Base Interpreter provided that each
-    external component clearly identifies itself whenever it is used
-    interactively.  Unless explicitly specified when applying the
-    license to the Work, the only applicable Base Interpreter is a
-    `LaTeX-Format' or in the case of files belonging to the 
-    `LaTeX-format' a program implementing the `TeX language'.
-
-
-
-CONDITIONS ON DISTRIBUTION AND MODIFICATION
-===========================================
-
-1.  Activities other than distribution and/or modification of the Work
-are not covered by this license; they are outside its scope.  In
-particular, the act of running the Work is not restricted and no
-requirements are made concerning any offers of support for the Work.
-
-2.  You may distribute a complete, unmodified copy of the Work as you
-received it.  Distribution of only part of the Work is considered
-modification of the Work, and no right to distribute such a Derived
-Work may be assumed under the terms of this clause.
-
-3.  You may distribute a Compiled Work that has been generated from a
-complete, unmodified copy of the Work as distributed under Clause 2
-above, as long as that Compiled Work is distributed in such a way that
-the recipients may install the Compiled Work on their system exactly
-as it would have been installed if they generated a Compiled Work
-directly from the Work.
-
-4.  If you are the Current Maintainer of the Work, you may, without
-restriction, modify the Work, thus creating a Derived Work.  You may
-also distribute the Derived Work without restriction, including
-Compiled Works generated from the Derived Work.  Derived Works
-distributed in this manner by the Current Maintainer are considered to
-be updated versions of the Work.
-
-5.  If you are not the Current Maintainer of the Work, you may modify
-your copy of the Work, thus creating a Derived Work based on the Work,
-and compile this Derived Work, thus creating a Compiled Work based on
-the Derived Work.
-
-6.  If you are not the Current Maintainer of the Work, you may
-distribute a Derived Work provided the following conditions are met
-for every component of the Work unless that component clearly states
-in the copyright notice that it is exempt from that condition.  Only
-the Current Maintainer is allowed to add such statements of exemption 
-to a component of the Work. 
-
-  a. If a component of this Derived Work can be a direct replacement
-     for a component of the Work when that component is used with the
-     Base Interpreter, then, wherever this component of the Work
-     identifies itself to the user when used interactively with that
-     Base Interpreter, the replacement component of this Derived Work
-     clearly and unambiguously identifies itself as a modified version
-     of this component to the user when used interactively with that
-     Base Interpreter.
-     
-  b. Every component of the Derived Work contains prominent notices
-     detailing the nature of the changes to that component, or a
-     prominent reference to another file that is distributed as part
-     of the Derived Work and that contains a complete and accurate log
-     of the changes.
-  
-  c. No information in the Derived Work implies that any persons,
-     including (but not limited to) the authors of the original version
-     of the Work, provide any support, including (but not limited to)
-     the reporting and handling of errors, to recipients of the
-     Derived Work unless those persons have stated explicitly that
-     they do provide such support for the Derived Work.
-
-  d. You distribute at least one of the following with the Derived Work:
-
-       1. A complete, unmodified copy of the Work; 
-          if your distribution of a modified component is made by
-          offering access to copy the modified component from a
-          designated place, then offering equivalent access to copy
-          the Work from the same or some similar place meets this
-          condition, even though third parties are not compelled to
-          copy the Work along with the modified component;
-
-       2. Information that is sufficient to obtain a complete,
-          unmodified copy of the Work.
-
-7.  If you are not the Current Maintainer of the Work, you may
-distribute a Compiled Work generated from a Derived Work, as long as
-the Derived Work is distributed to all recipients of the Compiled
-Work, and as long as the conditions of Clause 6, above, are met with
-regard to the Derived Work.
-
-8.  The conditions above are not intended to prohibit, and hence do not
-apply to, the modification, by any method, of any component so that it
-becomes identical to an updated version of that component of the Work as
-it is distributed by the Current Maintainer under Clause 4, above.
-
-9.  Distribution of the Work or any Derived Work in an alternative
-format, where the Work or that Derived Work (in whole or in part) is
-then produced by applying some process to that format, does not relax or
-nullify any sections of this license as they pertain to the results of
-applying that process.
-     
-10. a. A Derived Work may be distributed under a different license
-       provided that license itself honors the conditions listed in
-       Clause 6 above, in regard to the Work, though it does not have
-       to honor the rest of the conditions in this license.
-      
-    b. If a Derived Work is distributed under a different license, that
-       Derived Work must provide sufficient documentation as part of
-       itself to allow each recipient of that Derived Work to honor the 
-       restrictions in Clause 6 above, concerning changes from the Work.
-
-11. This license places no restrictions on works that are unrelated to
-the Work, nor does this license place any restrictions on aggregating
-such works with the Work by any means.
-
-12.  Nothing in this license is intended to, or may be used to, prevent
-complete compliance by all parties with all applicable laws.
-
-
-NO WARRANTY
-===========
-
-There is no warranty for the Work.  Except when otherwise stated in
-writing, the Copyright Holder provides the Work `as is', without
-warranty of any kind, either expressed or implied, including, but not
-limited to, the implied warranties of merchantability and fitness for a
-particular purpose.  The entire risk as to the quality and performance
-of the Work is with you.  Should the Work prove defective, you assume
-the cost of all necessary servicing, repair, or correction.
-
-In no event unless required by applicable law or agreed to in writing
-will The Copyright Holder, or any author named in the components of the
-Work, or any other party who may distribute and/or modify the Work as
-permitted above, be liable to you for damages, including any general,
-special, incidental or consequential damages arising out of any use of
-the Work or out of inability to use the Work (including, but not limited
-to, loss of data, data being rendered inaccurate, or losses sustained by
-anyone as a result of any failure of the Work to operate with any other
-programs), even if the Copyright Holder or said author or said other
-party has been advised of the possibility of such damages.
-
-
-MAINTENANCE OF THE WORK
-=======================
-
-The Work has the status `author-maintained' if the Copyright Holder
-explicitly and prominently states near the primary copyright notice in
-the Work that the Work can only be maintained by the Copyright Holder
-or simply that it is `author-maintained'.
-
-The Work has the status `maintained' if there is a Current Maintainer
-who has indicated in the Work that they are willing to receive error
-reports for the Work (for example, by supplying a valid e-mail
-address). It is not required for the Current Maintainer to acknowledge
-or act upon these error reports.
-
-The Work changes from status `maintained' to `unmaintained' if there
-is no Current Maintainer, or the person stated to be Current
-Maintainer of the work cannot be reached through the indicated means
-of communication for a period of six months, and there are no other
-significant signs of active maintenance.
-
-You can become the Current Maintainer of the Work by agreement with
-any existing Current Maintainer to take over this role.
-
-If the Work is unmaintained, you can become the Current Maintainer of
-the Work through the following steps:
-
- 1.  Make a reasonable attempt to trace the Current Maintainer (and
-     the Copyright Holder, if the two differ) through the means of
-     an Internet or similar search.
-
- 2.  If this search is successful, then enquire whether the Work
-     is still maintained.
-
-  a. If it is being maintained, then ask the Current Maintainer
-     to update their communication data within one month.
-     
-  b. If the search is unsuccessful or no action to resume active
-     maintenance is taken by the Current Maintainer, then announce
-     within the pertinent community your intention to take over
-     maintenance.  (If the Work is a LaTeX work, this could be
-     done, for example, by posting to comp.text.tex.)
-
- 3a. If the Current Maintainer is reachable and agrees to pass
-     maintenance of the Work to you, then this takes effect
-     immediately upon announcement.
-     
-  b. If the Current Maintainer is not reachable and the Copyright
-     Holder agrees that maintenance of the Work be passed to you,
-     then this takes effect immediately upon announcement.  
-    
- 4.  If you make an `intention announcement' as described in 2b. above
-     and after three months your intention is challenged neither by
-     the Current Maintainer nor by the Copyright Holder nor by other
-     people, then you may arrange for the Work to be changed so as
-     to name you as the (new) Current Maintainer.
-     
- 5.  If the previously unreachable Current Maintainer becomes
-     reachable once more within three months of a change completed
-     under the terms of 3b) or 4), then that Current Maintainer must
-     become or remain the Current Maintainer upon request provided
-     they then update their communication data within one month.
-
-A change in the Current Maintainer does not, of itself, alter the fact
-that the Work is distributed under the LPPL license.
-
-If you become the Current Maintainer of the Work, you should
-immediately provide, within the Work, a prominent and unambiguous
-statement of your status as Current Maintainer.  You should also
-announce your new status to the same pertinent community as
-in 2b) above.
-
-
-WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
-======================================================
-
-This section contains important instructions, examples, and
-recommendations for authors who are considering distributing their
-works under this license.  These authors are addressed as `you' in
-this section.
-
-Choosing This License or Another License
-----------------------------------------
-
-If for any part of your work you want or need to use *distribution*
-conditions that differ significantly from those in this license, then
-do not refer to this license anywhere in your work but, instead,
-distribute your work under a different license.  You may use the text
-of this license as a model for your own license, but your license
-should not refer to the LPPL or otherwise give the impression that
-your work is distributed under the LPPL.
-
-The document `modguide.tex' in the base LaTeX distribution explains
-the motivation behind the conditions of this license.  It explains,
-for example, why distributing LaTeX under the GNU General Public
-License (GPL) was considered inappropriate.  Even if your work is
-unrelated to LaTeX, the discussion in `modguide.tex' may still be
-relevant, and authors intending to distribute their works under any
-license are encouraged to read it.
-
-A Recommendation on Modification Without Distribution
------------------------------------------------------
-
-It is wise never to modify a component of the Work, even for your own
-personal use, without also meeting the above conditions for
-distributing the modified component.  While you might intend that such
-modifications will never be distributed, often this will happen by
-accident -- you may forget that you have modified that component; or
-it may not occur to you when allowing others to access the modified
-version that you are thus distributing it and violating the conditions
-of this license in ways that could have legal implications and, worse,
-cause problems for the community.  It is therefore usually in your
-best interest to keep your copy of the Work identical with the public
-one.  Many works provide ways to control the behavior of that work
-without altering any of its licensed components.
-
-How to Use This License
------------------------
-
-To use this license, place in each of the components of your work both
-an explicit copyright notice including your name and the year the work
-was authored and/or last substantially modified.  Include also a
-statement that the distribution and/or modification of that
-component is constrained by the conditions in this license.
-
-Here is an example of such a notice and statement:
-
-  %% pig.dtx
-  %% Copyright 2005 M. Y. Name
-  %
-  % This work may be distributed and/or modified under the
-  % conditions of the LaTeX Project Public License, either version 1.3
-  % of this license or (at your option) any later version.
-  % The latest version of this license is in
-  %   http://www.latex-project.org/lppl.txt
-  % and version 1.3 or later is part of all distributions of LaTeX
-  % version 2005/12/01 or later.
-  %
-  % This work has the LPPL maintenance status `maintained'.
-  % 
-  % The Current Maintainer of this work is M. Y. Name.
-  %
-  % This work consists of the files pig.dtx and pig.ins
-  % and the derived file pig.sty.
-
-Given such a notice and statement in a file, the conditions
-given in this license document would apply, with the `Work' referring
-to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
-generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
-referring to any `LaTeX-Format', and both `Copyright Holder' and
-`Current Maintainer' referring to the person `M. Y. Name'.
-
-If you do not want the Maintenance section of LPPL to apply to your
-Work, change `maintained' above into `author-maintained'.  
-However, we recommend that you use `maintained', as the Maintenance
-section was added in order to ensure that your Work remains useful to
-the community even when you can no longer maintain and support it
-yourself.
-
-Derived Works That Are Not Replacements
----------------------------------------
-
-Several clauses of the LPPL specify means to provide reliability and
-stability for the user community. They therefore concern themselves
-with the case that a Derived Work is intended to be used as a
-(compatible or incompatible) replacement of the original Work. If
-this is not the case (e.g., if a few lines of code are reused for a
-completely different task), then clauses 6b and 6d shall not apply.
-
-
-Important Recommendations
--------------------------
-
- Defining What Constitutes the Work
-
-   The LPPL requires that distributions of the Work contain all the
-   files of the Work.  It is therefore important that you provide a
-   way for the licensee to determine which files constitute the Work.
-   This could, for example, be achieved by explicitly listing all the
-   files of the Work near the copyright notice of each file or by
-   using a line such as:
-
-    % This work consists of all files listed in manifest.txt.
-   
-   in that place.  In the absence of an unequivocal list it might be
-   impossible for the licensee to determine what is considered by you
-   to comprise the Work and, in such a case, the licensee would be
-   entitled to make reasonable conjectures as to which files comprise
-   the Work.
-
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-code.txt b/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-code.txt
deleted file mode 100644
index 512f3797e4f..00000000000
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-code.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-pgf-1.10/context/pgf/basiclayer/t-pgf.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbim.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbla.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbpl.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbpt.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbsh.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfbsn.tex
-pgf-1.10/context/pgf/basiclayer/t-pgfcor.tex
-pgf-1.10/context/pgf/frontendlayer/t-tikz.tex
-pgf-1.10/context/pgf/systemlayer/t-pgfsys.tex
-pgf-1.10/context/pgf/utilities/t-pgffor.tex
-pgf-1.10/context/pgf/utilities/t-pgfmod.tex
-pgf-1.10/context/pgf/utilities/t-pgfrcs.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbaseimage.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbaselayers.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbasepatterns.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbaseplot.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbaseshapes.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfbasesnakes.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcore.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorearrows.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcoregraphicstate.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcoremath.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcoreobjects.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorepathconstruct.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorepathprocessing.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorepathusage.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorepoints.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorequick.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcorescopes.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcoreshade.code.tex
-pgf-1.10/generic/pgf/basiclayer/pgfcoretransformations.code.tex
-pgf-1.10/generic/pgf/frontendlayer/tikz.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibraryarrows.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarypatterns.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibraryplothandlers.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibraryplotmarks.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibraryshapes.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarysnakes.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikz3d.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzarrows.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzautomata.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzbackgrounds.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzer.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzmindmap.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzpatterns.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzpetri.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzplothandlers.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzplotmarks.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzshapes.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikzsnakes.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikztopaths.code.tex
-pgf-1.10/generic/pgf/libraries/pgflibrarytikztrees.code.tex
-pgf-1.10/generic/pgf/systemlayer/pgf.cfg
-pgf-1.10/generic/pgf/systemlayer/pgfsys-common-pdf.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-common-postscript.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-common-svg.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-dvi.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-dvipdfm.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-dvips.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-pdftex.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-tex4ht.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-textures.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys-vtex.def
-pgf-1.10/generic/pgf/systemlayer/pgfsys.code.tex
-pgf-1.10/generic/pgf/systemlayer/pgfsysprotocol.code.tex
-pgf-1.10/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
-pgf-1.10/generic/pgf/utilities/pgfutil-common.tex
-pgf-1.10/generic/pgf/utilities/pgfutil-latex.def
-pgf-1.10/generic/pgf/utilities/pgfutil-context.def
-pgf-1.10/generic/pgf/utilities/pgfutil-plain.def
-pgf-1.10/generic/pgf/utilities/pgffor.code.tex
-pgf-1.10/generic/pgf/utilities/pgfrcs.code.tex
-pgf-1.10/latex/pgf/basiclayer/pgf.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbaseimage.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbaselayers.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbasepatterns.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbaseplot.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbaseshapes.sty
-pgf-1.10/latex/pgf/basiclayer/pgfbasesnakes.sty
-pgf-1.10/latex/pgf/basiclayer/pgfcore.sty
-pgf-1.10/latex/pgf/compatibility/pgflibraryautomata.sty
-pgf-1.10/latex/pgf/compatibility/pgflibraryarrows.sty
-pgf-1.10/latex/pgf/compatibility/pgflibraryplothandlers.sty
-pgf-1.10/latex/pgf/compatibility/pgflibraryplotmarks.sty
-pgf-1.10/latex/pgf/compatibility/pgflibraryshapes.sty
-pgf-1.10/latex/pgf/compatibility/pgflibrarysnakes.sty
-pgf-1.10/latex/pgf/compatibility/pgflibrarytikzbackgrounds.sty
-pgf-1.10/latex/pgf/compatibility/pgflibrarytikztrees.sty
-pgf-1.10/latex/pgf/compatibility/pgfarrows.sty
-pgf-1.10/latex/pgf/compatibility/pgfautomata.sty
-pgf-1.10/latex/pgf/compatibility/pgfcomp-version-0-65.sty
-pgf-1.10/latex/pgf/compatibility/pgfheaps.sty
-pgf-1.10/latex/pgf/compatibility/pgfnodes.sty
-pgf-1.10/latex/pgf/compatibility/pgfshade.sty
-pgf-1.10/latex/pgf/frontendlayer/pgfpict2e.sty
-pgf-1.10/latex/pgf/frontendlayer/tikz.sty
-pgf-1.10/latex/pgf/systemlayer/pgfsys.sty
-pgf-1.10/latex/pgf/utilities/pgffor.sty
-pgf-1.10/latex/pgf/utilities/pgfpages.sty
-pgf-1.10/latex/pgf/utilities/pgfrcs.sty
-pgf-1.10/latex/pgf/utilities/pgfreadexternal.sty
-pgf-1.10/latex/pgf/utilities/pgfwriteexternal.sty
-pgf-1.10/latex/pgf/utilities/xxcolor.sty
-pgf-1.10/plain/pgf/basiclayer/pgf.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbaseimage.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbaselayers.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbasepatterns.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbaseplot.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbaseshapes.tex
-pgf-1.10/plain/pgf/basiclayer/pgfbasesnakes.tex
-pgf-1.10/plain/pgf/basiclayer/pgfcore.tex
-pgf-1.10/plain/pgf/frontendlayer/tikz.tex
-pgf-1.10/plain/pgf/systemlayer/pgfsys.tex
-pgf-1.10/plain/pgf/utilities/pgffor.tex
-pgf-1.10/plain/pgf/utilities/pgfrcs.tex
-pgf-1.10/README
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-documentation.txt b/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-documentation.txt
deleted file mode 100644
index b19995769fa..00000000000
--- a/Master/texmf-dist/doc/latex/beamer/doc/licenses/manifest-documentation.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-pgf-1.10/doc/generic/pgf/AUTHORS
-pgf-1.10/doc/generic/pgf/ChangeLog
-pgf-1.10/doc/generic/pgf/FILES
-pgf-1.10/doc/generic/pgf/images/brave-gnu-world-logo-mask.jpg
-pgf-1.10/doc/generic/pgf/images/brave-gnu-world-logo.25.eps
-pgf-1.10/doc/generic/pgf/images/brave-gnu-world-logo.25.jpg
-pgf-1.10/doc/generic/pgf/images/brave-gnu-world-logo.eps
-pgf-1.10/doc/generic/pgf/images/brave-gnu-world-logo.jpg
-pgf-1.10/doc/generic/pgf/images/pgfmanual-mindmap-1.pdf
-pgf-1.10/doc/generic/pgf/images/pgfmanual-mindmap-2.pdf
-pgf-1.10/doc/generic/pgf/INSTALL
-pgf-1.10/doc/generic/pgf/licenses/gnu-free-documentation-license-1.2.txt
-pgf-1.10/doc/generic/pgf/licenses/gnu-public-license-2.txt
-pgf-1.10/doc/generic/pgf/licenses/latex-project-public-license-1.3c.txt
-pgf-1.10/doc/generic/pgf/licenses/manifest-documentation.txt
-pgf-1.10/doc/generic/pgf/licenses/manifest-code.txt
-pgf-1.10/doc/generic/pgf/licenses/LICENSE
-pgf-1.10/doc/generic/pgf/macros/pgfmanual-en-macros.tex
-pgf-1.10/doc/generic/pgf/README
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-actions.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-arrows.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-design.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-images.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-layers.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-nodes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-paths.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-patterns.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-plots.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-points.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-quick.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-scopes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-shadings.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-snakes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-base-transformations.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-drivers.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-guidelines.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-installation.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-introduction.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-3d.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-arrows.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-automata.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-backgrounds.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-edges.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-er.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-mindmaps.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-patterns.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-petri.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-plot-handlers.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-plot-marks.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-shapes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-snakes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-library-trees.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-license.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-main.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pages.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pgffor.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pgfsys-commands.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pgfsys-overview.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pgfsys-paths.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-pgfsys-protocol.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-actions.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-coordinates.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-design.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-paths.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-scopes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-shapes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-transformations.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tikz-trees.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tutorial-nodes.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-tutorial.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-en-xxcolor.tex
-pgf-1.10/doc/generic/pgf/text-en/pgfmanual-main.tex
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-asymptotic-example.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-asymptotic-example.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-exp.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-exp.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-parametric-example.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-parametric-example.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-sin.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-sin.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-x.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgf-x.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgfmanual-sine.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgfmanual-sine.table
-pgf-1.10/doc/generic/pgf/text-en/plots/pgfplotgnuplot-example.gnuplot
-pgf-1.10/doc/generic/pgf/text-en/plots/pgfplotgnuplot-example.table
-pgf-1.10/doc/generic/pgf/TODO
-pgf-1.10/doc/generic/pgf/version-for-dvipdfm/en/Makefile
-pgf-1.10/doc/generic/pgf/version-for-dvipdfm/en/pgfmanual.tex
-pgf-1.10/doc/generic/pgf/version-for-dvipdfm/pgfmanual-dvipdfm.cfg
-pgf-1.10/doc/generic/pgf/version-for-dvips/en/Makefile
-pgf-1.10/doc/generic/pgf/version-for-dvips/en/pgfmanual.tex
-pgf-1.10/doc/generic/pgf/version-for-dvips/pgfmanual-dvips.cfg
-pgf-1.10/doc/generic/pgf/version-for-pdftex/en/Makefile
-pgf-1.10/doc/generic/pgf/version-for-pdftex/en/pgfmanual.pdf
-pgf-1.10/doc/generic/pgf/version-for-pdftex/en/pgfmanual.tex
-pgf-1.10/doc/generic/pgf/version-for-pdftex/pgfmanual-pdftex.cfg
-pgf-1.10/doc/generic/pgf/version-for-tex4ht/en/Makefile
-pgf-1.10/doc/generic/pgf/version-for-tex4ht/en/pgfmanual.tex
-pgf-1.10/doc/generic/pgf/version-for-tex4ht/pgfmanual-tex4ht.cfg
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/Makefile
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/pgfmanual.tex
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-asymptotic-example.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-asymptotic-example.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-exp.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-exp.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-parametric-example.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-parametric-example.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-sin.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-sin.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-x.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgf-x.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgfmanual-sine.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgfmanual-sine.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgfplotgnuplot-example.gnuplot
-pgf-1.10/doc/generic/pgf/version-for-vtex/en/plots/pgfplotgnuplot-example.table
-pgf-1.10/doc/generic/pgf/version-for-vtex/pgfmanual-vtex.cfg
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthemeexample.tex b/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthemeexample.tex
new file mode 100644
index 00000000000..32733150994
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthemeexample.tex
@@ -0,0 +1,65 @@
+% Copyright 2003--2007 by Till Tantau
+% Copyright 2010 by Vedran Mileti\'c
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Free Documentation License.
+%
+% See the file doc/licenses/LICENSE for more details.
+
+% $Header$
+
+
+\documentclass{beamer}
+
+\ifx\themename\undefined
+  \def\themename{default}
+\fi
+
+\usetheme{\themename}
+
+\beamertemplatetransparentcovered
+
+\usepackage{times}
+\usepackage[T1]{fontenc}
+
+\title{There Is No Largest Prime Number}
+\subtitle{With an introduction to a new proof technique}
+
+\author{Euklid of Alexandria}
+\institute{Department of Mathematics\\ University of Alexandria}
+\date{Symposium on Prime Number, --280}
+
+\begin{document}
+
+\begin{frame}
+  \titlepage
+\end{frame}
+
+\begin{frame}
+  \frametitle{Outline}
+  \tableofcontents
+\end{frame}
+
+\section{Results}
+\subsection{Proof of the Main Theorem}
+
+\begin{frame}<1>
+  \frametitle{Proof That There Is No Largest Prime Number}
+  \framesubtitle{A proof using \textit{reductio ad absurdum}.}
+
+  \begin{theorem}
+    There is no largest prime number.
+  \end{theorem}
+  \begin{proof}
+    \begin{enumerate}
+    \item<1-> Suppose $p$ were the largest prime number.
+    \item<2-> Let $q := 1 + \prod_{i=1}^p i = 1+p!$.
+    \item<3-> Then $q$ is not divisible by any $p' \in \{1,\dots,p\}$.
+    \item<1-> Thus $q>p$ is also prime.\qedhere
+    \end{enumerate}
+  \end{proof}
+\end{frame}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthememakeexamples.sh b/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthememakeexamples.sh
new file mode 100644
index 00000000000..7fa8ccca045
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamer/doc/themeexamples/beamerthememakeexamples.sh
@@ -0,0 +1,11 @@
+#$/bin/sh
+
+for i in \
+  Antibes Berkeley Berlin Copenhagen Darmstadt \
+  Dresden Goettingen Hannover Ilmenau JuanLesPins \
+  Luebeck Malmoe Marburg Montpellier PaloAlto \
+  Pittsburgh Rochester Singapore Szeged Warsaw; do 
+  pdflatex \\def\\theme\{"$i"\}\\input beamerthemeexample.tex;
+  mv beamerthemeexample.pdf beameruserguideexample"$i".pdf;
+done
+
diff --git a/Master/texmf-dist/doc/latex/beamer/emacs/beamer.el b/Master/texmf-dist/doc/latex/beamer/emacs/beamer.el
new file mode 100644
index 00000000000..54de42fd14a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamer/emacs/beamer.el
@@ -0,0 +1,134 @@
+;;; beamer.el --- AUCTeX style for the latex-beamer class
+
+;; Copyright (C) 2004 Thomas Baumann
+;; License: GPL, see the file COPYING in the base directory of AUCTeX
+
+;; Author: Thomas Baumann <thomas.baumann@ch.tum.de>
+;; Created: 2003-12-20
+;; Version: $Id$
+;; Keywords: tex
+
+;;; Commentary:
+
+;; This file adds support for the latex-beamer class.
+;;
+;; This file is intended to be used with the AUCTeX-Package.
+;; Put this File into your TeX-style-path. You may also
+;; byte-compile this file.
+
+;;; Code:
+(TeX-add-style-hook "beamer"
+ (function
+  (lambda ()
+    (defvar beamer-use-section-labels-flag nil
+      "Controls whether section labels are added")
+    (unless beamer-use-section-labels-flag
+      (make-local-variable 'LaTeX-section-hook)
+      (setq LaTeX-section-hook
+             '(LaTeX-section-heading
+               LaTeX-section-title
+               LaTeX-section-section)))
+
+    (setq LaTeX-item-list
+          (append '(("itemize" . LaTeX-item-beamer)
+                    ("enumerate" . LaTeX-item-beamer))
+                  LaTeX-item-list))
+
+    (TeX-add-symbols
+     '("alert" 1)
+     '("alt" TeX-arg-beamer-overlay-spec 2)
+     '("beamerbutton" 1)
+     '("beamergotobutton" 1)
+     '("beamerreturnbutton" 1)
+     '("beamerskipbutton" 1)
+     '("frame" TeX-arg-beamer-frametitle)
+     '("frametitle" 1)
+     '("hyperlink" TeX-arg-beamer-overlay-spec 2)
+     '("hyperlinkslideprev" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkslidenext" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkframestart" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkframeend" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkframestartnext" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkframeendprev" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkpresentationstart" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkpresentationend" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkappendixstart" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkappendixend" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkdocumentstart" TeX-arg-beamer-overlay-spec 1)
+     '("hyperlinkdocumentend" TeX-arg-beamer-overlay-spec 1)
+     '("hypertarget" TeX-arg-beamer-overlay-spec 2)
+     '("institute" 1)
+     '("invisible" TeX-arg-beamer-overlay-spec 1)
+     '("label" TeX-arg-beamer-overlay-spec 1)
+     '("logo" 1)
+     '("note" TeX-arg-beamer-note 1)
+     '("only" TeX-arg-beamer-overlay-spec 1)
+     '("onslide" TeX-arg-beamer-overlay-spec)
+     '("partpage")
+     '("pause")
+     '("structure" TeX-arg-beamer-overlay-spec 1)
+     '("temporal" TeX-arg-beamer-overlay-spec 3)
+     '("titlepage")
+     '("titlegraphic" 1)
+     '("uncover" TeX-arg-beamer-overlay-spec 1)
+     '("visible" TeX-arg-beamer-overlay-spec 1)
+     )
+    
+    (LaTeX-add-environments
+     '("actionenv")
+     '("alertblock" 1)
+     '("beamerboxesrounded" 1)
+     '("block" 1)
+     '("column" "Width")
+     "columns"
+     "columnsonlytextwidth"
+     '("exampleblock" 1)
+     '("onlyenv" (lambda (env &rest ignore)
+                   (LaTeX-insert-environment
+                    env
+                    (let ((overlay (read-input "Overlay: ")))
+                      (if (not (zerop (length overlay)))
+                          (format "<%s>" overlay))))))
+     '("overlayarea" "Area width" "Area height")
+     '("overprint"  (lambda (env &rest ignore)
+                      (LaTeX-insert-environment
+                       env
+                       (let ((overlay (read-input "Overlay: ")))
+                         (if (not (zerop (length overlay)))
+                             (format "{%s}" overlay)))))))
+
+    )))
+
+(defun TeX-arg-beamer-overlay-spec (optional &optional prompt)
+  "Prompt for overlay specification." 
+  (let ((overlay (read-input "Overlay: ")))
+    (if (not (zerop (length overlay)))
+        (progn (insert "<" overlay ">")))
+    (indent-according-to-mode)))
+
+(defun TeX-arg-beamer-frametitle (optional &optional prompt)
+  "Prompt for the frametitle."
+  (let ((title (read-input "What title: ")))
+    (if (not (zerop (length title)))
+        (progn (insert TeX-grop TeX-esc "frametitle" TeX-grop 
+                       title TeX-grcl TeX-grcl))
+      (progn (insert TeX-grop TeX-grcl)))))
+
+(defun LaTeX-item-beamer ()
+  "Insert a new item with an optional overlay argument."
+  (TeX-insert-macro "item")
+  (delete-horizontal-space)
+  (TeX-arg-beamer-overlay-spec 0)
+  (insert " ")
+  (indent-according-to-mode))
+  
+(defun TeX-arg-beamer-note (optional &optional prompt)
+  "Prompt for overlay specification and optional argument."
+  (let ((overlay (read-input "Overlay: "))
+        (options (read-input "Options: ")))
+    (if (not (zerop (length overlay)))
+        (progn (insert "<" overlay ">")))
+    (if (not (zerop (length options)))
+        (progn (insert "[" options "]")))
+    (indent-according-to-mode)))
+
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/Makefile b/Master/texmf-dist/doc/latex/beamer/examples/Makefile
new file mode 100644
index 00000000000..f58c04d8c75
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/beamer/examples/Makefile
@@ -0,0 +1,18 @@
+examples = \
+  beamerexample1 \
+  beamerexample2.article \
+  beamerexample2.beamer \
+  beamerexample3 \
+  beamerexample5 \
+  beamerexample6
+
+all: $(examples:%=%.pdf)
+
+beamerexample2.article.pdf: beamerexample2.article.tex \
+  beamerexample2.beamer.pdf 
+	pdflatex $(@:%.pdf=%.tex)
+	pdflatex $(@:%.pdf=%.tex)
+
+%.pdf: %.tex
+	pdflatex $(@:%.pdf=%.tex)
+	pdflatex $(@:%.pdf=%.tex)
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/a-conference-talk/beamerexample-conference-talk.pdf b/Master/texmf-dist/doc/latex/beamer/examples/a-conference-talk/beamerexample-conference-talk.pdf
index 449567937b9..808c03428b0 100644
--- a/Master/texmf-dist/doc/latex/beamer/examples/a-conference-talk/beamerexample-conference-talk.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/examples/a-conference-talk/beamerexample-conference-talk.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-beamer-version.pdf b/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-beamer-version.pdf
index 2dade4ae2d7..e7a272fb143 100644
--- a/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-beamer-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-beamer-version.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-print-version.pdf b/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-print-version.pdf
index f553a319c56..fa5566f6b97 100644
--- a/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-print-version.pdf
+++ b/Master/texmf-dist/doc/latex/beamer/examples/a-lecture/beamerexample-lecture-print-version.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.de.tex b/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.de.tex
index c5a773d35c7..7f602b73475 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.de.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.de.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/conference-talks/conference-ornate-20min.de.tex,v 1.8 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.en.tex b/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.en.tex
index 66e5838f680..6b9195dc674 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.en.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/conference-talks/conference-ornate-20min.en.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/conference-talks/conference-ornate-20min.en.tex,v 1.7 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.de.tex b/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.de.tex
index 573a4910206..ea2729cd8cc 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.de.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.de.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/generic-talks/generic-ornate-15min-45min.de.tex,v 1.5 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.en.tex b/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.en.tex
index d4769e2f47a..a07a6f15df0 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.en.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/generic-talks/generic-ornate-15min-45min.en.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/generic-talks/generic-ornate-15min-45min.en.tex,v 1.5 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.de.tex b/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.de.tex
index 3459da3bda6..a64b6e3ac4c 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.de.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.de.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/short-talks/speaker_introduction-ornate-2min.de.tex,v 1.5 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}
 
diff --git a/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.en.tex b/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.en.tex
index 135c791d743..35a654a3847 100644
--- a/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.en.tex
+++ b/Master/texmf-dist/doc/latex/beamer/solutions/short-talks/speaker_introduction-ornate-2min.en.tex
@@ -1,4 +1,4 @@
-% $Header: /cvsroot/latex-beamer/latex-beamer/solutions/short-talks/speaker_introduction-ornate-2min.en.tex,v 1.5 2007/01/28 20:48:23 tantau Exp $
+% $Header$
 
 \documentclass{beamer}