Merge doctest fixes in functional howto with 3.3.