From 8ebbe3a44d5fc4035a239ad530d30c3478112466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 3 Oct 2012 17:22:28 +0200
Subject: [PATCH] Update Octave pointers (cherry picked from commit
78d9cb92d4802b71a8744f373e925b1426be0b65)
---
doc/dynare.texi | 4 ++--
doc/macroprocessor/macroprocessor.tex | 2 --
windows/README.txt | 12 ++++++------
windows/dynare.nsi | 2 +-
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/doc/dynare.texi b/doc/dynare.texi
index df19e80bc..68ed4619c 100644
--- a/doc/dynare.texi
+++ b/doc/dynare.texi
@@ -378,8 +378,8 @@ MATLAB version 7.0 (R14) or above;
GNU Octave version 3.2.2 or above.
@end itemize
-Some installation instructions for GNU Octave can be found on the
-@uref{http://www.dynare.org/DynareWiki/DynareOctave,Dynare Wiki}.
+Packages of GNU Octave can be downloaded on the
+@uref{http://www.dynare.org/download/octave,Dynare website}.
The following optional extensions are also useful to benefit from extra
features, but are in no way required:
diff --git a/doc/macroprocessor/macroprocessor.tex b/doc/macroprocessor/macroprocessor.tex
index 8ecaf9510..432aaefc5 100644
--- a/doc/macroprocessor/macroprocessor.tex
+++ b/doc/macroprocessor/macroprocessor.tex
@@ -608,8 +608,6 @@ rhos = [ 0.8, 0.9, 1];
\item Since version 4.0, Dynare works on top of Octave
\item This makes Dynare 100\% free software
\item Almost all features of Dynare work with Octave (very few exceptions)
- \item For more information: \\
- \url{http://www.dynare.org/DynareWiki/DynareOctave}
\end{itemize}
\end{frame}
diff --git a/windows/README.txt b/windows/README.txt
index c03aed769..40eaf9e42 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -57,11 +57,11 @@ Using Dynare with Octave
Dynare also works on top of GNU Octave, a free clone of MATLAB (R) (see
<http://www.octave.org>).
-This version of Dynare is compiled for Octave 3.6.1 (MinGW), and may not work
-with other versions of Octave. You can download an installer for the right
-version of Octave at:
+This version of Dynare is compiled for Octave 3.6 (MinGW), and may not work
+with other versions of Octave. The recommended version of Octave can be
+downloaded at:
- http://www.dynare.org/octave/Octave3.6.1_gcc4.6.2_20120303-setup.exe
+ http://www.dynare.org/download/octave/windows
Every time you run Octave, you should type the two following commands (assuming
that you have installed Dynare at the standard location, and replacing '4.x.y'
@@ -71,8 +71,8 @@ by correct version number):
NOTE: if you don't want to type this command every time you run Octave, you can
put it in a file called '.octaverc' in your home directory ('c:\Documents and
-Settings\USERNAME\' for Windows XP or 'c:\Users\USERNAME' for Windows 7). This
-file is run by Octave at every startup.
+Settings\USERNAME' for Windows XP or 'c:\Users\USERNAME' for Windows Vista/7).
+This file is run by Octave at every startup.
You can test your installation by typing 'dynare' at the Octave prompt. This
should give you an error message complaining that you did not specify a MOD
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 716a3c989..6ec57ee02 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -120,7 +120,7 @@ SectionEnd
SectionGroupEnd
-Section "MEX files for Octave 3.6.1 (MinGW)"
+Section "MEX files for Octave 3.6 (MinGW)"
SetOutPath $INSTDIR\mex\octave
File ..\mex\octave\*.mex ..\mex\octave\*.oct
SectionEnd
--
GitLab