Do octopi contain thorns, or claws in their tentacles ?

I was talking with friend about the difference between squids and octopi, for our oceanology cl and the section about tentacles arose. (weird topic all together I know.) I told her that in 1978 it was found that squids have claws in their tentacles. She argued weakly, that octopi have claws in their tentacles too. I've tried to search and find any information on this, and cannot find any information (or perhaps had over looked) on octopi containing claws. but does anyone know if they do in fact have them?