diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index c509d12c54..db12ca518d 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -3900,13 +3900,13 @@
 
             <para>
                 As an example, to launch Gdbserver on the target and make it 
-                ready to "debug" a program located in the  
-                <filename>/usr/bin/hello</filename> directory, from the host
+                ready to "debug" a binary named
+                <filename>helloworld</filename>, from the host
                 you need to enter a command like the following.
                 This command connects to the target and launches Gdbserver
                 on the target:
                 <literallayout class='monospaced'>
-     $ gdbserver localhost:2345 /usr/bin/hello
+     $ gdbserver localhost:2345 /usr/bin/helloworld
                 </literallayout>
                 Gdbserver should now be listening on port 2345 for debugging
                 commands coming from a remote GDB process that is running on 
@@ -4005,12 +4005,12 @@
                     Finally, switch to the directory where the binary resides
                     and run the <filename>cross-gdb</filename> binary.
                     Provide the binary file you are going to debug.
-                    For example, the following command form continues with the
-                    example used in the previous section.
-                    This command form loads the <filename>helloworld</filename> 
-                    binary as well as the debugging information:
+                    For example, the following command continues with the
+                    example used in the previous section by loading
+                    the <filename>helloworld</filename> binary as well as the 
+                    debugging information:
                     <literallayout class='monospaced'>
-     $ i586-poky-linux-gdb helloworld
+     $ arm-poky-linux-gnuabi-gdb helloworld
                     </literallayout>
                     The commands in your <filename>.gdbinit</filename> execute
                     and the GDB prompt appears.