I'm using a rather awkward set of tools/software to edit OpenStreetMap.
Using a Samsung H1 smartphone with GPS and the app honeylocation from http://honeylocation.com, I record my tracks and upload them via WLAN to the Internet on the same webpage. From there, I download them as KMZ-files (Google Earth file format) and prune them using PRUNE (http://wiki.openstreetmap.org/wiki/Prune) and export the data in GPX files. Using JOSM, I display my GPS data and upload changes/additions etc. to OSM.
I wish there was an easier way to create my GPS traces on that phone! :(