typos and merge problems

doc/src/week48/week48.do.txt

@@ -57,19 +57,19 @@ space using other basis expansions such as higher-order polynomials,
 wavelets, splines etc.
 
 If our feature space is not easy to separate, as shown in the figure
-<<<<<<< HEAD
-here, we can achieve a better separation by introducing more complex
-basis functions. The ideal would be, as shown in the next figure, to,
+generated by the code below, we can achieve a better separation by introducing a more complex
+basis functions. The ideal would be, as shown by the code example below, to,
 via a specific transformation to obtain a separation between the
-classes which is almost linear.
-=======
-here generated by the code below (see also Figures 12.2 and 12.3 of "Hastie et al.":"https://www.springer.com/gp/book/9780387848570"), we can achieve a better separation by introducing more complex
+classes that is almost linear. See also Figures 12.2 and 12.3 of "Hastie et al.":"https://www.springer.com/gp/book/9780387848570".
+
+We can achieve a better separation by introducing more complex
 basis functions. The ideal would be (see Figures 12.2 and 12.3) to, via a specific transformation to 
 obtain a separation between the classes which is almost linear. 
->>>>>>> origin/master
 
-The change of basis, from $x\rightarrow z=\phi(x)$ leads to the same type of equations to be solved, except that
-we need to introduce, for example, a polynomial transformation to a two-dimensional training set.
+The change of basis, from $x\rightarrow z=\phi(x)$ leads to the same
+type of equations to be solved, except that we need to introduce, for
+example, a polynomial transformation to a two-dimensional training
+set.
 
 !bc pycod
 import numpy as np
@@ -589,7 +589,7 @@ o To set up the matrix $\bm{G}$ we note that the inequalities $0\leq \lambda_i \
 !split
 =====  Setting up $\bm{G}\bm{\lambda} \preceq \bm{h}$ =====
 
-We have two constraints, $0\le \lambda_i$ and $\lambda_i \le C$. To do this we multiply the ones with the contraint
+We have two constraints, $0\le \lambda_i$ and $\lambda_i \le C$. To do this we multiply the ones with the constraint
 $\ge$ with $-1$ in order to get $\le$. It means that the problem $\bm{G}\bm{\lambda} \preceq \bm{h}$
 can be written as
 !bt
@@ -610,7 +610,7 @@ can be written as
 \lambda_3 \\
 \dots \\
 \lambda_n \\
-\end{bmatrix}\wedge 
+\end{bmatrix} \preceq 
 \begin{bmatrix} 0 \\
 0 \\
 0 \\