Use the last diagram it is the safest way of doing it and use the optional diode.
The line after the triangle indicates you should put the end of the diode with the black band that way round.
Use diodes over resistors as it is a newer and safer method.
You do not need to solder the 3 jtag wires until you are part way through the process.
Jama