1. Make sure the water is boiling and add all ingredients, except octopus. Let boil for 15 to 20 minutes. Add the octopus and bring back to a rolling boil.
2. Cook for 25 minutes if you like the creature a bit firm or, for a bit tenderer dish, try 1½ hours or until octopus pierces easily with a fork.
3. Remove the octopus and cool. Strip off its outer skin and tentacles. Trim the tentacles and save for the salad. Cut the leg into 1/8-inch slices and marinate for 2 hours.
THE MARINADE:
1. Mix all the ingredients together and toss with the octopus slices.