Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 330-332)
commitf2d355a4b8951e6ebf51525cd4c7a97d3c0199af
authorMichael Olson <mwolson@gnu.org>
Sat, 2 Jun 2007 20:56:24 +0000 (2 20:56 +0000)
committerMichael Olson <mwolson@gnu.org>
Sat, 2 Jun 2007 20:56:24 +0000 (2 20:56 +0000)
tree63a303efbfcb8afae60d37acead67d2923f43787
parentdccddd513691c57bade5a2a96e6fa2db0aa3c388
parent92c401c395a6cbbdbd7ee49788acc3a23b89012d
Merged from mwolson@gnu.org--2006/muse--main--1.0 (patch 330-332)

Patches applied:

 * mwolson@gnu.org--2006/muse--main--1.0--patch-330
   Fix failure to recognize images in description before images in link

 * mwolson@gnu.org--2006/muse--main--1.0--patch-331
   manual: Clarify what image-link, link, and link-and-anchor mean

 * mwolson@gnu.org--2006/muse--main--1.0--patch-332
   Make it possible to not inline an image
git-archimport-id: mwolson@gnu.org--2006-muse-el/muse-el--devel--0--patch-140