am 2a9de021: Clean up and extend the linkify sample.

* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
  Clean up and extend the linkify sample.