There are also a lot of great smartphone apps. Select OS scroll down and there is a table which apps allow you to edit: http://wiki.openstreetmap.org/wiki/Software/Mobile

Pushpin is my favorite for iOS right now, because you can just mark the location and while moving on you can select what type of POI it is. It's also all in your edit history so at home you can for example then look up the restaurant and add more information in the browser. http://pushpinosm.org/