diff --git a/doc/manual/source/installation-and-configuration.rst b/doc/manual/source/installation-and-configuration.rst index 8543fa3e2c4b629cbd2918f25eeb85cac28081b1..146101c6a4fe947bebbad5cf3060e1a151cddea3 100644 --- a/doc/manual/source/installation-and-configuration.rst +++ b/doc/manual/source/installation-and-configuration.rst @@ -15,7 +15,7 @@ are necessary in that case. In order to run Dynare, you need one of the following: * MATLAB version 7.9 (R2009b) or above; -* GNU Octave version 4.2.1 or above, with the statistics package from `Octave-Forge`_. +* Octave version 4.2.1 or above, with the statistics package from `Octave-Forge`_. The following optional extensions are also useful to benefit from extra features, but are in no way required: @@ -23,7 +23,7 @@ extra features, but are in no way required: * If under MATLAB: the Optimization Toolbox, the Statistics Toolbox, the Control System Toolbox; -* If under GNU Octave, the following `Octave-Forge`_ packages: ``optim, io, +* If under Octave, the following `Octave-Forge`_ packages: ``optim, io, control``. @@ -192,8 +192,8 @@ installation to MATLAB path. You have two options for doing that: MATLAB will remember this setting next time you run it. -For GNU Octave --------------- +For Octave +---------- You need to add the ``matlab`` subdirectory of your Dynare installation to Octave path, using the ``addpath`` at the Octave diff --git a/doc/manual/source/introduction.rst b/doc/manual/source/introduction.rst index ce44b991bbab8b661778631b05cce8869302bd6f..f34d1e69e52b3e3af7d3ea74d2e783892c87c808 100644 --- a/doc/manual/source/introduction.rst +++ b/doc/manual/source/introduction.rst @@ -55,7 +55,7 @@ manual. Part of Dynare is programmed in C++, while the rest is written using the `MATLAB`_ programming language. The latter implies that commercially-available MATLAB software is required in order to run Dynare. However, as an alternative to MATLAB, Dynare is also able to -run on top of `GNU Octave`_ (basically a free clone of MATLAB): this +run on top of `Octave`_ (basically a free clone of MATLAB): this possibility is particularly interesting for students or institutions who cannot afford, or do not want to pay for, MATLAB and are willing to bear the concomitant performance loss. @@ -128,7 +128,7 @@ https://www.dynare.org. .. _MATLAB: http://www.mathworks.com/products/matlab/ -.. _GNU Octave: http://www.octave.org/ +.. _Octave: http://www.octave.org/ .. _CEPREMAP: http://www.cepremap.fr/ .. _web forum: https://forum.dynare.org/ .. _official Dynare website: http://www.dynare.org/ diff --git a/doc/manual/source/running-dynare.rst b/doc/manual/source/running-dynare.rst index 9b6ee34a29fd04206f2d3d4925a948e1c9b8ddfd..25f95ce05d8f0e7aaf84db02a7353944c612f831 100644 --- a/doc/manual/source/running-dynare.rst +++ b/doc/manual/source/running-dynare.rst @@ -22,7 +22,7 @@ command at the MATLAB or Octave prompt (with the filename of the In practice, the handling of the model file is done in two steps: in the first one, the model and the processing instructions written by the user in a *model file* are interpreted and the proper MATLAB or -GNU Octave instructions are generated; in the second step, the program +Octave instructions are generated; in the second step, the program actually runs the computations. Both steps are triggered automatically by the ``dynare`` command.