From 61be125bd874bb1ccce3c473b0fbe9705d344c2b Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Thu, 14 Nov 2019 14:51:19 +0100
Subject: [PATCH] doc: fix line references in tutorial

---
 config.tutorial.yaml |  2 +-
 doc/tutorial.rst     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config.tutorial.yaml b/config.tutorial.yaml
index 6a22356c..e753a756 100644
--- a/config.tutorial.yaml
+++ b/config.tutorial.yaml
@@ -158,7 +158,7 @@ solving:
     clip_p_max_pu: 0.01
     #nhours: 10
   solver:
-    name: glpk
+    name: cbc
   # solver:
     # name: gurobi
     # threads: 4
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
index 32ee5d8e..51164c73 100644
--- a/doc/tutorial.rst
+++ b/doc/tutorial.rst
@@ -38,47 +38,47 @@ The model can be adapted to only include selected countries (e.g. Germany) inste
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 13
+   :lines: 14
    
 Likewise, the example's temporal scope can be restricted (e.g. to a single month).
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 15-18
+   :lines: 16-19
 
 It is also possible to allow less or more carbon-dioxide emissions. Here, we limit the emissions of Germany 100 Megatonnes per year.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 26
+   :lines: 28
 
 PyPSA-Eur also includes a database of existing conventional powerplants.
 We can select which types of powerplants we like to be included with fixed capacities:
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 36
+   :lines: 40
 
 To accurately model the temporal and spatial availability of renewables such as wind and solar energy, we rely on historical weather data.
 It is advisable to adapt the required range of coordinates to the selection of countries.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 38-47
+   :lines: 42-50
 
 We can also decide which weather data source should be used to calculate potentials and capacity factor time-series for each carrier.
 For example, we may want to use the ERA-5 dataset for solar and not the default SARAH-2 dataset.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 48,91-92
+   :lines: 52,95-96
 
 Finally, it is possible to pick a solver. For instance, this tutorial uses the open-source solvers CBC and Ipopt and does not rely
 on the commercial solvers Gurobi or CPLEX (for which free academic licenses are available).
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 156-157
+   :lines: 151,160-161
 
 .. note::
 
@@ -120,7 +120,7 @@ orders ``snakemake`` to run the script ``solve_network`` that produces the solve
 .. warning::
     On Windows the previous command may currently cause a ``MissingRuleException`` due to problems with output files in subfolders.
     This is an `open issue < https://github.com/snakemake/snakemake/issues/46>`_ at `snakemake <https://snakemake.readthedocs.io/>`_.
-    Windows users should instead run ``snakemake solve_all_elec_networks``.
+    Windows users should add the option ``--keep-target-files`` to the command or instead run ``snakemake solve_all_elec_networks``.
 
 This triggers a workflow of multiple preceding jobs that depend on each rule's inputs and outputs:
     
@@ -262,7 +262,7 @@ the wildcards given in ``scenario`` in the configuration file ``config.yaml`` ar
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 6-11
+   :lines: 7-12
 
 In this example we would not only solve a 6-node model of Germany but also a 2-node model.