Tycho-
Either should work. See usage:
usage: DiabloMiner -u myuser -p mypassword [args]
-d,--debug enable extra debug output
-f,--fps target execution timing
-g,--getwork seconds between getwork refresh
-h,--help this help
-o,--host bitcoin host IP
-p,--pass password for host
-r,--port bitcoin host port
-u,--user username for host
-w,--worksize override worksize
-x,--proxy optional proxy settings IP:PORT<:username:password>