Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

docs/web/docs/Basics/Basic_Computer_Skills.md

@@ -66,7 +66,7 @@ potentially more comfortable for repetitive tasks than using a GUI.
 Commands look like this
 
 ```
-netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml
+netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml
 ```
 Here *netconvert* is the name of the program and the rest of the command
 sets options for this program.
@@ -95,7 +95,7 @@ makes sure that you can execute SUMO-programs.
 3.  enter a command such as
 
 ```
-netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml
+netconvert --node-files=hello.nod.xml --edge-files=hello.edg.xml --output-file=hello.net.xml
 ```
 
 and press `enter`

docs/web/docs/Basics/Notation.md

@@ -11,7 +11,7 @@ described.
 If you encounter something like this:
 
 ```
-netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml
+netconvert --visum=MyVisumNet.inp --output-file=MySUMONet.net.xml
 ```
 
 you should know that this is a call on the command line. There may be
@@ -21,8 +21,8 @@ following newline). The following example means exactly the same as the
 one above:
 
 ```
-netconvert --visum=MyVisumNet.inp \
-  --output-file=MySUMONet.net.xml
+netconvert --visum=MyVisumNet.inp \
+  --output-file=MySUMONet.net.xml
 ```
 
 ## Application Options

docs/web/docs/Basics/Using_the_Command_Line_Applications.md

@@ -33,11 +33,11 @@ has been given, the application does not know what to do and prints only
 an information about itself:
 
 ```
-Eclipse SUMO netgenerate Version {{Version}}
- Build features: Linux-4.1.39-56-default Proj GDAL GUI
- Copyright (C) 2001-2020 German Aerospace Center (DLR) and others; https://sumo.dlr.de
- License EPL-2.0: Eclipse Public License Version 2 <https://eclipse.org/legal/epl-v20.html>
- Use --help to get the list of options.
+Eclipse SUMO netgenerate Version {{Version}}
+ Build features: Linux-4.1.39-56-default Proj GDAL GUI
+ Copyright (C) 2001-2020 German Aerospace Center (DLR) and others; https://sumo.dlr.de
+ License EPL-2.0: Eclipse Public License Version 2 <https://eclipse.org/legal/epl-v20.html>
+ Use --help to get the list of options.
 ```
 
 # Options
@@ -61,7 +61,7 @@ example, if one wants the simulation to load a certain road network,
 "mynet.net.xml", the following must be written:
 
 ```
---net mynet.net.xml
+--net mynet.net.xml
 ```
 
 The '--' in front indicates that the option's long name is following
@@ -77,7 +77,7 @@ Some often used options can be abbreviated. The abbreviation for the
 above:
 
 ```
--n mynet.net.xml
+-n mynet.net.xml
 ```
 
 Please note that an abbreviation is indicated using a single '-'.
@@ -89,7 +89,7 @@ If you want to append options to a list of values given in a
 [configuration file](#configuration_files_vs_command_line_parameter) you will use the following syntax:
 
 ```
-+a myAdditional.add.xml
++a myAdditional.add.xml
 ```
 
 Please note that you can use the abbreviated or the non-abbreviated name here but always a single '+'.
@@ -156,7 +156,7 @@ The according [sumo](../sumo.md) execution call - working with both
 configuration versions - would be:
 
 ```
-sumo.exe -c test.sumocfg
+sumo.exe -c test.sumocfg
 ```
 
 This means that instead of the parameters, we only give the name of the
@@ -165,7 +165,7 @@ options on the command line it is possible to leave out the "-c" as
 well:
 
 ```
-sumo.exe test.sumocfg
+sumo.exe test.sumocfg
 ```
 
 ## Naming Conventions for Configuration Files
@@ -393,7 +393,7 @@ the python tools. The easiest (but somewhat cumbersome) method is to run
 the tool using its full path:
 
 ```
-C:\Users\yourname>D:\path_to_sumo\tools\randomTrips.py  ... arguments ...
+C:\Users\yourname>D:\path_to_sumo\tools\randomTrips.py  ... arguments ...
 ```
 
 Alternatively, you can add the directory in which the tool lies to your

docs/web/docs/ChangeLog/Changes_from_version_0.9.0_up_to_0.9.10.md

@@ -501,7 +501,7 @@ Together with this extension, the import of ArcView-files has been
 rechecked and now allows to import networks stored in other schemes than
 the one NavTeq uses. The new options are described [here](../Networks/Import/ArcView.md).
 
-Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](https://frida.intevation.org/download.html).
+Some further comments on importing ArcView-files are available [here](../Networks/Import/ArcView.md#arcview_import_options). By now, they include only some comments on importing an open-source network of Osnabrück. You can take a look at this [here](../Networks/Import/ArcView.md#frida_network_city_of_osnabruck) and also download it from [here](https://frida.intevation.org/download.html).
 
 
 **3.** The developer documentation has been split into several parts.

docs/web/docs/ChangeLog/Changes_in_2011_releases.md

@@ -186,9 +186,9 @@ to get a list of supported options including synonyms.
     correct code for reading length is:
 
 ```
-int length = readByte()
-if length==0:
-length = readInt()
+int length = readByte()
+if length==0:
+length = readInt()
 ```
 
 - added [Contributed/SUMO Traffic Modeler](../Contributed/SUMO_Traffic_Modeler.md)

docs/web/docs/Contributed/SUMOPlayer.md

@@ -73,7 +73,7 @@ title: SUMOPlayer
 You can run the player as following:
 
 ```
-sumo ... --no-step-log --netstate-dump - | java -jar SUMOPlayer.jar -d - -c <probability> -n <used_network_file> ...
+sumo ... --no-step-log --netstate-dump - | java -jar SUMOPlayer.jar -d - -c <probability> -n <used_network_file> ...
 ```
 
 ("-" redirects the dump to stdout)

docs/web/docs/Contributed/SUMOPy.md

@@ -21,7 +21,7 @@ as a simple to use scripting language which facilitates the use of SUMO.
 # Introduction
 
 SUMO rapidly developed into a flexible and powerful open-source
-micro-simulator for multi-modal urban traffic networks . The features
+micro-simulator for multi-modal urban traffic networks . The features
 and the number of tools provided are constantly increasing, making
 simulations ever more realistic. However, the different functionalities
 consist at the present state of a large number of binaries and scripts

docs/web/docs/Contributed/SmallMaps.md

@@ -16,21 +16,21 @@ improvements. SUMO 0.17.1 was the last release this tool was part of.
 ## Original Message
 
 ```
-Von: Florides Andreas [xxx]
-Gesendet: Freitag, 8. Dezember 2006 15:43
-An: Krajzewicz, Daniel
-Betreff: Frida map pruning
+Von: Florides Andreas [xxx]
+Gesendet: Freitag, 8. Dezember 2006 15:43
+An: Krajzewicz, Daniel
+Betreff: Frida map pruning
 
-Hello Daniel,
-I have added a simple GUI to the script that makes the pruning to the
-Frida maps and I believe that is more usable now.
-You can find attached the sources and a compiled file for Linux that
-you can try out. A lot of information are still hard-coded in the
-source code which means that the program is not totally generic but
-maybe is useful for a lot of people that are looking for small maps
-that can "play"with in SUMO.
-The readme file contains some general information.
+Hello Daniel,
+I have added a simple GUI to the script that makes the pruning to the
+Frida maps and I believe that is more usable now.
+You can find attached the sources and a compiled file for Linux that
+you can try out. A lot of information are still hard-coded in the
+source code which means that the program is not totally generic but
+maybe is useful for a lot of people that are looking for small maps
+that can "play"with in SUMO.
+The readme file contains some general information.
 
 Regards
-Andreas Florides
+Andreas Florides
 ```

docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md

@@ -239,7 +239,7 @@ device](Demand/Automatic_Routing.md).
 
 ```xml
 <additional>
-  <taz id="<TAZ_ID>" edges="<EDGE_ID> <EDGE_ID> ..."/>
+  <taz id="<TAZ_ID>" edges="<EDGE_ID> <EDGE_ID> ..."/>
   ...
 </additional>
 ```
@@ -599,14 +599,14 @@ Note, that the given type id refers to an edge type rather than a vehicle type.
 Define a flow of vehicles that desire to drive at 120% of the speed limit without any deviation:
 
 ```xml
-  <vType id="example" speedFactor="1.2" speedDev="0"/>
+  <vType id="example" speedFactor="1.2" speedDev="0"/>
   <flow id="f" type="example" begin="0" end="3600" probability="0.2" from="A" to="B"/>
 ```
 
 Define a vehicle type with high speed deviation and no cut-off
 
 ```xml
-  <vType id="example2" speedFactor="norm(1.0,0.5)"/>
+  <vType id="example2" speedFactor="norm(1.0,0.5)"/>
 ```
 
 ## Vehicle Length
@@ -1005,7 +1005,7 @@ the driver has to stop unintentionally (i.e. due to a jam or waiting at
 an intersection). The impatience value is computed as
 
 ```xml
-MAX(0, MIN(1.0, baseImpatience + waitingTime / timeToMaxImpatience))
+MAX(0, MIN(1.0, baseImpatience + waitingTime / timeToMaxImpatience))
 ```
 
 Where baseImpatience is configured by setting the vType-attribute
@@ -1280,7 +1280,7 @@ By default color components should be given as integers in the range of
 (0,255) but other definitions are also supported:
 
 ```xml
-color="0.5, 0.5, 1.0"
+color="0.5, 0.5, 1.0"
 color="#FF0000"
 color="red"
 ```

docs/web/docs/Demand/Activity-based_Demand_Generation.md

@@ -11,7 +11,7 @@ have their start or stop location outside the map.
 ## Typical Command Line
 
 ```
-activitygen --net-file <NET> --stat-file <STATISTICS> --output-file <TRIPS> --random
+activitygen --net-file <NET> --stat-file <STATISTICS> --output-file <TRIPS> --random
 ```
 
 <NET\> is a map in form of a SUMO net file, <STATISTICS\> contains the
@@ -32,18 +32,18 @@ files [{{SUMO}}/tests/activitygen/activitygen-example.net.xml]({{Source}}tests/a
 To run this example, use the following commands:
 
 ```
-activitygen --net-file activitygen-example.net.xml \
-            --stat-file activitygen-example.stat.xml \
-            --output-file activitygen-example.trips.rou.xml \
-            --random
-
-duarouter --net-file activitygen-example.net.xml \
-          --route-files activitygen-example.trips.rou.xml \
-          --output-file activitygen-example.rou.xml \
-          --ignore-errors
-
-sumo --net-file activitygen-example.net.xml \
-     --route-files activitygen-example.rou.xml
+activitygen --net-file activitygen-example.net.xml \
+            --stat-file activitygen-example.stat.xml \
+            --output-file activitygen-example.trips.rou.xml \
+            --random
+
+duarouter --net-file activitygen-example.net.xml \
+          --route-files activitygen-example.trips.rou.xml \
+          --output-file activitygen-example.rou.xml \
+          --ignore-errors
+
+sumo --net-file activitygen-example.net.xml \
+     --route-files activitygen-example.rou.xml
 ```
 
 The first command generates the net file from the node and edge
@@ -69,8 +69,8 @@ the time of their departure into account during routing (see
 [Demand/Automatic_Routing](../Demand/Automatic_Routing.md))
 
 ```
-sumo --net-file activitygen-example.net.xml \
-     --route-files activitygen-example.trips.rou.xml
+sumo --net-file activitygen-example.net.xml \
+     --route-files activitygen-example.trips.rou.xml
 ```
 
 ## The Statistics File

docs/web/docs/Demand/Automatic_Routing.md

@@ -69,7 +69,7 @@ interval may be altered using the ".adaptation-interval" option.
 By setting the option **--device.rerouting.adaptation-weight** {{DT_FLOAT}} the travel speed of each edge is computed as
 
 ```
-FLOAT * priorValue + (1 - FLOAT) * currentMeanSpeed
+FLOAT * priorValue + (1 - FLOAT) * currentMeanSpeed
 ```
 
 This averaging takes place with the period set by **--device.rerouting.adaptation-interval**.

docs/web/docs/Demand/Dynamic_User_Assignment.md

@@ -31,7 +31,7 @@ The tool [duaIterate.py](../Tools/Assign.md#duaiteratepy) can be used to compute
     This script will require copious amounts of disk space
 
 ```
-python tools/assign/duaIterate.py -n <network-file> -t <trip-file> -l <nr-of-iterations>
+python tools/assign/duaIterate.py -n <network-file> -t <trip-file> -l <nr-of-iterations>
 ```
 
 *duaIterate.py* supports many of the same options as

docs/web/docs/Demand/Further_Ways_to_import_VISUM_Demand_Definitions.md

@@ -24,7 +24,7 @@ probabilities from VISUM, and the name of the file into which the
 converted turning probabilities shall be written:
 
 ```
-visum_convertTurnPercentages.py <SUMO_NET> <VISUM_TURNINGS> <OUTPUT>
+visum_convertTurnPercentages.py <SUMO_NET> <VISUM_TURNINGS> <OUTPUT>
 ```
 
 The script is located in {{SUMO}}/tools/import/visum. It is written in Python.
@@ -70,7 +70,7 @@ written. Additional options are shown in the following table:
 Example call:
 
 ```
-visum_convertRoutes.py -n <SUMO_NET> -r <VISUM_ROUTES> -o <OUTPUT> --uniform
+visum_convertRoutes.py -n <SUMO_NET> -r <VISUM_ROUTES> -o <OUTPUT> --uniform
 ```
 
 The script is located in {{SUMO}}/tools/import/visum. It is written

docs/web/docs/Demand/Further_Ways_to_import_Vissim_Demand_Definitions.md

@@ -24,7 +24,7 @@ route definitions, you may also (ab)use this facility to delete the edge
 from all relevant routes, e.g. edgemap\["10000"\] = ""
 
 ```
-vissim_parseRoutes.py <VISSIM_NETWORK> <OUTPUT_PREFIX>
+vissim_parseRoutes.py <VISSIM_NETWORK> <OUTPUT_PREFIX>
 ```
 
 The script is located in {{SUMO}}/tools/import/vissim. It is written in Python.
@@ -38,7 +38,7 @@ parameter). The read bus lines are saved as
 renamed by setting them within "edgemap" variable (see below).
 
 ```
-vissim_parseBusStops.py <VISSIM_NETWORK> <OUTPUT_PREFIX>
+vissim_parseBusStops.py <VISSIM_NETWORK> <OUTPUT_PREFIX>
 ```
 
 The script is located in {{SUMO}}/tools/import/vissim. It is written in Python.