From 3766fb841d3a0232a3d414abaa864b1ab66884d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Fri, 14 Oct 2016 11:12:56 +0200 Subject: [PATCH] Get rid of references to 2.0 [skip ci] --- doc/architecture.md | 2 +- doc/running/unix.md | 2 +- doc/running/windows.md | 2 +- doc/upgrading/rhel.md | 4 ++-- doc/upgrading/ubuntu.md | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/architecture.md b/doc/architecture.md index eba10dd00451..81f37117c85c 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -1,7 +1,7 @@ Architecture of the OpenQuake Engine v2 ========================================= -The OpenQuake Engine version 2.0 is a complete rewrite of version +The OpenQuake Engine version 2 is a complete rewrite of version 1.0, so a new document describing the overall architecture is needed. Whereas in the past the Engine was database-centric and structured as a Web application with an Object Relational Mapper, now diff --git a/doc/running/unix.md b/doc/running/unix.md index 136e9f6fcfcb..efab5c41fd53 100644 --- a/doc/running/unix.md +++ b/doc/running/unix.md @@ -15,7 +15,7 @@ An example of running the `AreaSourceClassicalPSHA` demo: The output should look something like this: ``` -[2016-06-14 16:47:35,202 #2 INFO] Using engine version 2.0.0 +[2016-06-14 16:47:35,202 #2 INFO] Using engine version 2 [2016-06-14 16:47:35,333 #2 INFO] Read 528 hazard site(s) [2016-06-14 16:47:35,386 #2 INFO] Parsed 1 sources from /usr/share/openquake/engine/demos/hazard/AreaSourceClassicalPSHA/source_model.xml [2016-06-14 16:47:35,491 #2 INFO] Processed source model 1/1 with 1 gsim path(s) diff --git a/doc/running/windows.md b/doc/running/windows.md index f527411c2281..4e3c0d1f86fd 100644 --- a/doc/running/windows.md +++ b/doc/running/windows.md @@ -22,7 +22,7 @@ C:\Program Files(x86)\OpenQuake Engine>oq engine --run demos\hazard\AreaSourceCl The output should look something like this: ``` -[2016-06-14 16:47:35,202 #2 INFO] Using engine version 2.0.0 +[2016-06-14 16:47:35,202 #2 INFO] Using engine version 2 [2016-06-14 16:47:35,333 #2 INFO] Read 528 hazard site(s) [2016-06-14 16:47:35,386 #2 INFO] Parsed 1 sources from C:\Programmi\OpenQuake Engine\demos\hazard\AreaSourceClassicalPSHA\source_model.xml [2016-06-14 16:47:35,491 #2 INFO] Processed source model 1/1 with 1 gsim path(s) diff --git a/doc/upgrading/rhel.md b/doc/upgrading/rhel.md index 9d4f2e0f83f0..cdadbaab0c18 100644 --- a/doc/upgrading/rhel.md +++ b/doc/upgrading/rhel.md @@ -6,9 +6,9 @@ To upgrade the OpenQuake Engine and its libraries run sudo yum upgrade python-oq-* ``` -### Coming from release 1.0 +### Coming from OpenQuake Engine 1.x -The following dependencies are not used anymore by the OpenQuake Engine 2.0: +The following dependencies are not used anymore by the OpenQuake Engine 2: - postgresql-server and postgis - other minor dependencies diff --git a/doc/upgrading/ubuntu.md b/doc/upgrading/ubuntu.md index 8c6d08372f31..e7f253e7e37a 100644 --- a/doc/upgrading/ubuntu.md +++ b/doc/upgrading/ubuntu.md @@ -17,15 +17,15 @@ sudo add-apt-repository -y ppa:openquake/ppa sudo apt-get update ``` -### Coming from release 1.0 +### Coming from OpenQuake Engine 1.x -If you are upgrading from OpenQuake Engine release 1.*, before you can process you have to run this command: +If you are upgrading from OpenQuake Engine release 1.x, before you can process you have to run this command: ```bash sudo apt-get remove --purge python-oq.* sudo rm -Rf /usr/openquake ``` -The following dependencies are not used anymore by the OpenQuake Engine 2.0: +The following dependencies are not used anymore by the OpenQuake Engine 2: - redis-server (used only by the OQ Engine 1.0) - postgresql-server and postgis - other minor dependencies