From 6958370ed9e6f347e40077209b51b4bf7d9c6d8c Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 24 Mar 2016 07:35:44 +1100 Subject: Fix bad formatting that somehow went into the doco. --- user/start/depend.rst | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'user') diff --git a/user/start/depend.rst b/user/start/depend.rst index a8ce290..87ca161 100644 --- a/user/start/depend.rst +++ b/user/start/depend.rst @@ -214,69 +214,69 @@ make sure you have the correct type and version of Python installed. We cannot use the Python executables created by the Python project (python.org) as they are built by Microsoft's C (MSC) compiler. Linking the MSC Python libraries with the MinGW64 executables is not easy and MSYS provided us with a -| simple solution so we do not support linking MSC libraries. +simple solution so we do not support linking MSC libraries. -| MSYS2 provides two types and versions of Python executables, MinGW and MSYS and -| Python version 2 and 3. For Windows we need the MinGW executable so we have -| suitables libraries and we have to have Python version 2 because on Windows GDB -| only builds with Python2. +MSYS2 provides two types and versions of Python executables, MinGW and MSYS and +Python version 2 and 3. For Windows we need the MinGW executable so we have +suitables libraries and we have to have Python version 2 because on Windows GDB +only builds with Python2. -| You also need to install the MSYS version of Python along with the MinGW64 -| Python2 package. The MSYS Python is version 3 and the RSB can support version 2 -| and 3 of Python and it helps handle some of the long paths building GCC can -| generate. +You also need to install the MSYS version of Python along with the MinGW64 +Python2 package. The MSYS Python is version 3 and the RSB can support version 2 +and 3 of Python and it helps handle some of the long paths building GCC can +generate. -| Installing MSYS2 -| ~~~~~~~~~~~~~~~~ +Installing MSYS2 +~~~~~~~~~~~~~~~~ -| MSYS2 is installed on a new machine using the MSYS2 installer found on -| https://msys2.github.io/. Please select the ``x86_64`` variant for 64bit -| support. Run the installer following the 7 steps listed on the page. +MSYS2 is installed on a new machine using the MSYS2 installer found on +https://msys2.github.io/. Please select the ``x86_64`` variant for 64bit +support. Run the installer following the 7 steps listed on the page. -| MSYS2 uses the ``pacman`` package manager. The Arch Linux project has detailed -| documentation on how to use ``pacman``. What is shown here is a just few -| examples of what you can do. +MSYS2 uses the ``pacman`` package manager. The Arch Linux project has detailed +documentation on how to use ``pacman``. What is shown here is a just few +examples of what you can do. -| .. sidebar:: **Pin MSYS2 Shell to Taskbar** +.. sidebar:: **Pin MSYS2 Shell to Taskbar** -| Pin the MSYS2 64bit Shell to the Taskbar so you always use it rather than -| the 32bit Shell. + Pin the MSYS2 64bit Shell to the Taskbar so you always use it rather than the + 32bit Shell. -| Open a 64bit MSYS shell from the Start Menu: +Open a 64bit MSYS shell from the Start Menu: -| .. figure:: msys2-minw64-start-menu.png -| :width: 50% -| :align: center -| :alt: MSYS2 64bit Shell Start Menu +.. figure:: msys2-minw64-start-menu.png + :width: 50% + :align: center + :alt: MSYS2 64bit Shell Start Menu -| The packages we require are: +The packages we require are: -| * python -| * mingw-w64-x86_64-python2 -| * mingw-w64-x86_64-gcc -| * git -| * bison -| * cvs -| * diffutils -| * make -| * patch -| * tar -| * texinfo -| * unzip +* python +* mingw-w64-x86_64-python2 +* mingw-w64-x86_64-gcc +* git +* bison +* cvs +* diffutils +* make +* patch +* tar +* texinfo +* unzip -| .. note:: +.. note:: -| The actual output provided may vary due to changes in the dependent packages -| or newer package versions. +The actual output provided may vary due to changes in the dependent packages or +newer package versions. -| Install the packages using ``pacman``: +Install the packages using ``pacman``: -| .. code-block:: shell +.. code-block:: shell -| ~ -| $ pacman -S python mingw-w64-x86_64-python2 mingw-w64-x86_64-gcc \ -| bison cvs diffutils git make patch tar texinfo unzip -| resolving dependencies... + ~ + $ pacman -S python mingw-w64-x86_64-python2 mingw-w64-x86_64-gcc \ + bison cvs diffutils git make patch tar texinfo unzip + resolving dependencies... looking for conflicting packages... Packages (74) db-5.3.28-2 expat-2.1.0-2 gdbm-1.11-3 heimdal-1.5.3-8 -- cgit v1.2.3