This is also available via
git pull git://github.com/jboecker/org-mode.git for-carsten

I tried to document the new behaviour as concise and clear as possible.

(If anyone reads this and finds it too confusing in any way, please say
so . I introduced the changes, so I know what they do and why, but the
docstring has to explain this to people who do not.)

While I could not make it any shorter than my first draft, I hope that
the clear separation of the three possible interpretations of a string
as the file identifier and the short example for each one will allow the
reader to quickly find what they need without having to understanding
all of the complexity first.

Regards,
  Jan