X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=doc%2Fopenocd.texi;h=1749034d136173d6c859ba600256736e45240a4c;hb=68bd107c6db941ec7b22f3e491e314041a95224b;hp=8ee328bd54d111ebe1099982556c19f2df489d3e;hpb=7cd2617384f4ac620c468343c1f2009fbfa2fc79;p=openocd.git

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 8ee328bd54..1749034d13 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2319,10 +2319,32 @@ This is a write-once setting.
 
 @deffn {Interface Driver} {jlink}
 Segger jlink USB adapter
-@c command:	jlink_info
+@c command:	jlink caps
+@c     dumps jlink capabilities
+@c command:	jlink config
+@c     access J-Link configurationif no argument this will dump the config
+@c command:	jlink config kickstart [val]
+@c     set Kickstart power on JTAG-pin 19.
+@c command:	jlink config mac_address [ff:ff:ff:ff:ff:ff]
+@c     set the MAC Address
+@c command:	jlink config ip [A.B.C.D[/E] [F.G.H.I]]
+@c     set the ip address of the J-Link Pro, "
+@c     where A.B.C.D is the ip,
+@c     E the bit of the subnet mask
+@c     F.G.H.I the subnet mask
+@c command:	jlink config reset
+@c     reset the current config
+@c command:	jlink config save
+@c     save the current config
+@c command:	jlink config usb_address [0x00 to 0x03 or 0xff]
+@c     set the USB-Address,
+@c     This will change the product id
+@c command:	jlink info
 @c     dumps status
-@c command:	jlink_hw_jtag (2|3)
+@c command:	jlink hw_jtag (2|3)
 @c     sets version 2 or 3
+@c command:	 jlink pid
+@c     set the pid of the interface we want to use
 @end deffn
 
 @deffn {Interface Driver} {parport}
@@ -2633,7 +2655,7 @@ with this signal behave exactly like pressing a RESET button.
 @emph{JTAG TAP Reset} ... the @emph{TRST} hardware signal resets
 just the TAP controllers connected to the JTAG adapter.
 Such resets should not be visible to the rest of the system; resetting a
-device's the TAP controller just puts that controller into a known state.
+device's TAP controller just puts that controller into a known state.
 @item
 @emph{Emulation Reset} ... many devices can be reset through JTAG
 commands.  These resets are often distinguishable from system
@@ -2673,7 +2695,7 @@ Use the @command{reset_config} @var{signals} options to say
 when either of those signals is not connected.
 When SRST is not available, your code might not be able to rely
 on controllers having been fully reset during code startup.
-Missing TRST is not a problem, since JTAG level resets can
+Missing TRST is not a problem, since JTAG-level resets can
 be triggered using with TMS signaling.
 
 @item @emph{Signals shorted} ... Sometimes a chip, board, or