From 32644a4e4ef86d7d6a0e0f2e3f3a92d3b662985f Mon Sep 17 00:00:00 2001 From: Rodrigo Caballero Date: Tue, 31 Oct 2017 11:46:07 -0600 Subject: [PATCH] Fix ambiguous language and merge conflict. Signed-off-by: Rodrigo Caballero --- source/clear-linux/tutorials/fmv.rst | 4 ++-- source/clear-linux/tutorials/tutorials.rst | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/clear-linux/tutorials/fmv.rst b/source/clear-linux/tutorials/fmv.rst index 95e4b18d..bd05bd3e 100644 --- a/source/clear-linux/tutorials/fmv.rst +++ b/source/clear-linux/tutorials/fmv.rst @@ -210,8 +210,8 @@ To follow the same approach with a package like FFT, we must use the patching fftw-3.3.6-pl2/libbench2/caset.c @ lines (5) patching fftw-3.3.6-pl2/libbench2/verify-r2r.c @ lines (44 187 197 207 316 333 723) -Thus, files like :file:`fftw-3.3.6-pl2/tools/fftw-wisdom.c.patch` generate -patches like this: +For example, the :file:`fftw-3.3.6-pl2/tools/fftw-wisdom.c.patch` file +generates the following patches: .. code-block:: git diff --git a/source/clear-linux/tutorials/tutorials.rst b/source/clear-linux/tutorials/tutorials.rst index 0949f1c6..04998c58 100644 --- a/source/clear-linux/tutorials/tutorials.rst +++ b/source/clear-linux/tutorials/tutorials.rst @@ -14,4 +14,5 @@ specific |CLOSIA| use cases. machine-learning/machine-learning azure multi-boot/multi-boot + hadoop fmv