am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '148ce2322c5ce119b2dc6881d60dc60f8c336bfa':
  delete obsolete tips/references to cupcake