Skip to content

Commit a01ceac

Browse files
committed
#22 minor
1 parent 2795f2c commit a01ceac

9 files changed

Lines changed: 17 additions & 17 deletions

File tree

docs/web/docs/Developer/Tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ to follow the [TextTest installation
4040
instructions](https://texttest.sourceforge.net/index.php?page=documentation_trunk&n=install_texttest)
4141
and the additional info there.
4242

43-
For MacOS the following command should install all dependencies:
43+
For macOS the following command should install all dependencies:
4444

4545
`brew install python py3cairo pygobject3 gtk+3 adwaita-icon-theme`
4646

docs/web/docs/Developer/Translating.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use `WRITE_MESSAGEF(TL("The vehicle '%' has a problem."), id);` (this works for
3232

3333
Please be aware that changing a translatable string in the code (even if you just fix a typo)
3434
will invalidate (i.e. remove) all translations. This does not mean you should not do it, you
35-
should just review the changes to the translation files as well. In case you want to keep the translations
35+
should just review the changes to the translation files as well. In case you want to keep the translations
3636
but fix a typo in the translatable string, please consider using [our helper scripts](#change_original_strings) for that task.
3737

3838
The translations should not be applied to debug and developer messages. This includes everything
@@ -78,9 +78,9 @@ or run `tools/build_config/i18n.py -l <lang>` and make a pull request with the r
7878

7979
# For developers
8080

81-
The translated strings from Weblate are not pushed automatically to our github repo because automatic pushing
81+
The translated strings from Weblate are not pushed automatically to our GitHub repo because automatic pushing
8282
is generally a bad idea and weblate does not have the rights. If you want to merge the commits in weblate into
83-
the main github you have to do the following in your local git clone of SUMO:
83+
the main GitHub you have to do the following in your local git clone of SUMO:
8484
```
8585
git pull # make sure you are up to date and on the target branch (usually main)
8686
git remote add weblate https://hosted.weblate.org/git/eclipse-sumo/sumo-gui-netedit/ # add Weblate repo (only necessary once)

docs/web/docs/FAQ.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ Under windows these settings must be configured using `regedit` i.e. at the regi
12371237

12381238
Starting with version 1.26.0 (specifically v1_25_0-454), it is possible to scale fonts and icons sizes in the gui-settings ('UI Scaling' in the openGL tab). The application must be restarted for the setting to take effect.
12391239

1240-
In older versions the fox-registry (see above) must be used to change the 'normalfont'. On Linux and MaCOS this can be accomplished by creating the file *~/.foxrc/Desktop* with the following line:
1240+
In older versions the fox-registry (see above) must be used to change the 'normalfont'. On Linux and macOS this can be accomplished by creating the file *~/.foxrc/Desktop* with the following line:
12411241
`normalfont="Arial,200"`
12421242
(with any desired font or size)
12431243

docs/web/docs/Simulation/Rerouter.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jams, caused by spontaneous road closing.
129129
!!! caution
130130
When using modified permissions together with option/param **device.rerouting.mode=8**, there should be at most one rerouter definition at any one time in the simulation that contains all closings. Otherwise vehicles may loop endlessly between two closed edges (because all closings other than the current rerouter are ignored).
131131

132-
!!! note
132+
!!! note
133133
Closing lanes or edges by setting attribute 'allow' or 'disallow' may cause emergency braking. This can be mitigated by placing [VariableSpeedSigns](../Simulation/Variable_Speed_Signs.md) ahead of the closing and slowing down traffic briefly before the closing.
134134

135135
## Closing a Lane
@@ -365,7 +365,7 @@ Parameter Name | Default value | Description
365365

366366
### Reserving a parking space
367367

368-
Whenever a [parkingArea] defines attribute `reservable="true"`, vehicles that reroute to such a parkingArea will reserve a parking space which acts to decrease the remaining capacity of that parkingArea and prevents other vehicles from taking the spot.
368+
Whenever a [parkingArea] defines attribute `reservable="true"`, vehicles that reroute to such a parkingArea will reserve a parking space which acts to decrease the remaining capacity of that parkingArea and prevents other vehicles from taking the spot.
369369

370370
### Destination after rerouting
371371

@@ -402,14 +402,14 @@ The attributes used within such definitions are:
402402

403403
| Attribute Name | Value Type | Description |
404404
| -------------- | ----------------------- | ---------------------------------------------------------------------------------------------------------- |
405-
| **main** | edge ids (stringList) | The ids of consecutive edges that a train must take at some point after the rerouter edge to be considered for being overtaken |
405+
| **main** | edge ids (stringList) | The ids of consecutive edges that a train must take at some point after the rerouter edge to be considered for being overtaken |
406406
| **siding** | edge ids (stringList) | The ids of consecutive edges that will be used instead of the main edges for waiting to be overtaken. |
407407
| minSaving | float | The minimum time saving in seconds to trigger an overtaking maneuver (see below for the saving computation) |
408408
| defer | bool | Whether a slow train may elect to be overtaking at some downstream location (defaults to *true* if more than one `<overtakingReroute>` element is defined within the rerouter) |
409409

410410
Requirements for the siding:
411411
- one of the edges of the saiding must have a rail_signal at it's end
412-
- the siding must be long enough to accomodate the train being overtaken ahead of the rail signal
412+
- the siding must be long enough to accommodate the train being overtaken ahead of the rail signal
413413

414414
Definitions for `<overtakingReroute>` can be created with the tool [createOvertakingReroutes.py](../Tools/Railways.md#createovertakingreroutespy).
415415

@@ -436,7 +436,7 @@ The value of *accelTimeLossFast* is non-zero, only if the faster train reaches t
436436
<interval begin="<BEGIN_TIME>" end="<END_TIME>">
437437
<stationReroute id="ts_5"/>
438438
<stationReroute id="ts_5b"/>
439-
<stationReroute id="ts_5c"/>
439+
<stationReroute id="ts_5c"/>
440440
</interval>
441441
</rerouter>
442442
```

docs/web/docs/Simulation/Waterways.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ They can also be explicitly specified by setting `allow="ship"`.
2626

2727
To allow overtaking, it is recommended to build a network that enables [opposite direction driving](OppositeDirectionDriving.md).
2828

29-
If a linear body of water is wide enough to accomodate more than two ships, it can either be modelled by
29+
If a linear body of water is wide enough to accommodate more than two ships, it can either be modelled by
3030

3131
- defining multiple lanes per direction
3232
- defining a single wide lane per direction and enabling the [sublane model](SublaneModel.md#sublane-model)

docs/web/docs/Specification/Containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ vehicle's stop, the container will be loaded onto the vehicle. If such a
122122
vehicle exists but the container is not positioned between the start and
123123
end position of the vehicle's stop, the container will still be loaded
124124
if the vehicle is triggered by the a container and the distance between
125-
container and vehicle is at most 10 metres. It will not be checked
125+
container and vehicle is at most 10 meters. It will not be checked
126126
whether the vehicle has the aspired destination on the current route.
127127
The first time the vehicle stops (on a well defined stop) at the
128128
destination edge, the transport is finished and the container proceeds

docs/web/docs/Specification/Persons.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ the following conditions are met
142142
- the vehicle is stopped in range of the person
143143
- if the vehicle is stopped at a busStop or other stoppling place, all locations along the stop are in range
144144
- if the vehicle stop defines attributes `startPos` and `endPos` any location within these values is in range
145-
- if the vehicle is within range of option **--ride.stop-tolerance** (default *10*)
145+
- if the vehicle is within range of option **--ride.stop-tolerance** (default *10*)
146146

147147
!!! note
148148
The `lines` attribute can be used to hail taxis, see [taxi](../Simulation/Taxi.md) for more information
@@ -202,7 +202,7 @@ to be inside the range of the stop.
202202
Stops define a delay until the next element of a plan is started. They
203203
can be used to model activities such as working or shopping. Stops for
204204
persons follow the specification at
205-
[Specification\#Stops](index.md#stops). However, the attributes `index`, `triggered`, `containerTriggered` and `parking` are not evaluated.
205+
[Specification\#Stops](index.md#stops). However, the attributes `index`, `triggered`, `containerTriggered` and `parking` are not evaluated.
206206
With a `<stop>` it is possible to model activities with a fixed duration as well as those with
207207
a fixed end time. If a person needs to be transferred between two
208208
positions without delay, it is possible to use two stops at different locations in sequence and set attribute `jump` for the first stop.
@@ -228,7 +228,7 @@ person will enter the vehicle and start its ride. If such a vehicle
228228
exists but the person is not positioned between the start and end
229229
position of the vehicle's stop, the person will still enter if the
230230
vehicle is triggered by the person and the distance between person and
231-
vehicle is at most 10 metres. It does not check whether the vehicle has
231+
vehicle is at most 10 meters. It does not check whether the vehicle has
232232
the aspired destination on the current route. The first time the vehicle
233233
stops (on a well defined stop) at the destination edge, the ride is
234234
finished and the person proceeds with the next step in the plan.

docs/web/docs/Tutorials/CityMobil.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ One thing to note here is the usage of the dispatch algorithm which will determi
244244
which request to serve next.
245245

246246
## Running the scenario generation and the scenario
247-
Now finally we can run by double clicking the script or if you are on a Linux / MacOS console:
247+
Now finally we can run by double clicking the script or if you are on a Linux / macOS console:
248248
```
249249
./createNetTaxi.py
250250
```

docs/web/docs/Versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ There is only one line of development.
2929

3030
It is denoted by a string consisting of a "v", the last release (e.g. "1_6_0"), a plus sign with the number of
3131
commits since last release (e.g. "+1520") and a minus followed by the first letters of the hash of the last commit to
32-
the main branch on github (e.g. "-cb474809f6"). For the python packages this is translated into "1.6.0.post1520" to be compliant
32+
the main branch on GitHub (e.g. "-cb474809f6"). For the python packages this is translated into "1.6.0.post1520" to be compliant
3333
with PEP440.
3434

3535
## Network version

0 commit comments

Comments
 (0)