am d27b1083: docs only. add Searchable resource information to the Available Resources doc and update some some of the attribute documentation to indicate that the icon label is not recommended. and fixing merge issue...

Merge commit 'd27b10837525f341eee7d46013e2177b0bad3c60' into eclair

* commit 'd27b10837525f341eee7d46013e2177b0bad3c60':
  docs only.