From: Fabien Le Mentec <texane@gmail.com>
Date: Fri, 21 Oct 2011 09:28:45 +0000 (-0500)
Subject: Merge branch 'master' into local/stm32l_flash
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bd0492f50a5f8736635f9125b69ff1ebbb08a0fb;hp=ebaf5ac5be01306be8d806bfaa33834d9615552c;p=fw%2Fstlink

Merge branch 'master' into local/stm32l_flash
---

diff --git a/doc/tutorial/tutorial.pdf b/doc/tutorial/tutorial.pdf
index a237871..9202ed4 100644
Binary files a/doc/tutorial/tutorial.pdf and b/doc/tutorial/tutorial.pdf differ
diff --git a/doc/tutorial/tutorial.tex b/doc/tutorial/tutorial.tex
index c0d90b3..d1ba4fd 100644
--- a/doc/tutorial/tutorial.tex
+++ b/doc/tutorial/tutorial.tex
@@ -69,7 +69,7 @@ STLINK should run on any system meeting the above constraints.
 The STLINK software source code is retrieved using:\\
 \begin{small}
 \begin{lstlisting}[frame=tb]
-git clone https://github.com/texane/stlink stlink.git
+$> git clone https://github.com/texane/stlink stlink.git
 \end{lstlisting}
 \end{small}
 
@@ -77,8 +77,8 @@ git clone https://github.com/texane/stlink stlink.git
 Everything can be built from the top directory:\\
 \begin{small}
 \begin{lstlisting}[frame=tb]
-$> cd stlink.git ;
-$> make ;
+$> cd stlink.git
+$> make CONFIG_USE_LIBSG=0
 \end{lstlisting}
 \end{small}
 It includes: