Merge branch 'Pamela_Branch_4' into 'Pamela_Branch_5'

Pamela 4 into Pamela 5

See merge request !54

models/Application_examples/Dining_Philosophers.mp

@@ -56,9 +56,16 @@
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ References ]─────────────────────────────────────┐ │
+│*│ │ "Example 25: Dining Philosophers." from            │ │
+│*│ │    Auguston, M. "Monterey Phoenix System and       │ │
+│*│ │    Software Architecture and Workflow Modeling     │ │
+│*│ │    Language Manual" (Version 4). 2020. Available   │ │
+│*│ │    online:                                         │ │
+│*│ │    https://wiki.nps.edu/display/MP/Documentation   │ │
+│*│ │                                                    │ │
 │*│ │ "Dining philosophers problem." Wikipedia.          │ │
-│*│ │ Wikimedia Foundation, August 6, 2021.              │ │
-│*│ │ https://en.wikipedia.org/wiki/Dining_philosophers_problem
+│*│ │    Wikimedia Foundation, August 6, 2021.           │ │
+│*│ │    https://en.wikipedia.org/wiki/Dining_philosophers_problem
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ Search Terms ]───────────────────────────────────┐ │

models/Application_examples/Railroad_Crossing_Safety.mp

@@ -32,9 +32,16 @@
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ References ]─────────────────────────────────────┐ │
+│*│ │ "Example 24: Railroad crossing example" from       │ │
+│*│ │    Auguston, M. "Monterey Phoenix System and       │ │
+│*│ │    Software Architecture and Workflow Modeling     │ │
+│*│ │    Language Manual" (Version 4). 2020. Available   │ │
+│*│ │    online:                                         │ │
+│*│ │    https://wiki.nps.edu/display/MP/Documentation   │ │
+│*│ │                                                    │ │
 │*│ │ Heitmeyer, Constance, and Dino Mandrioli. Formal   │ │
-│*│ │ Methods for Real-Time Computing. New York, NY:     │ │
-│*│ │ John Wiley & Sons, Inc., 1996.                     │ │
+│*│ │    Methods for Real-Time Computing. New York, NY:  │ │
+│*│ │    John Wiley & Sons, Inc., 1996.                  │ │
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ Search Terms ]───────────────────────────────────┐ │

models/Application_examples/Replay_Attack.mp

@@ -19,9 +19,16 @@
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ References ]─────────────────────────────────────┐ │
+│*│ │ "Example 20: Simple MP model for the Replay        │ │
+│*│ │    Attack." from Auguston, M. "Monterey Phoenix    │ │ 
+│*│ │    System and Software Architecture and Workflow   │ │
+│*│ │    Modeling Language Manual" (Version 4). 2020.    │ │
+│*│ │    Available online:                               │ │
+│*│ │    https://wiki.nps.edu/display/MP/Documentation   │ │
+│*│ │                                                    │ │
 │*│ │ "Replay attack." Wikipedia. Wikimedia Foundation,  │ │
-│*│ │ July 1, 2021.                                      │ │
-│*│ │ https://en.wikipedia.org/wiki/Replay_attack        │ │
+│*│ │    July 1, 2021.                                   │ │
+│*│ │    https://en.wikipedia.org/wiki/Replay_attack     │ │
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ Search Terms ]───────────────────────────────────┐ │

models/Application_examples/Web_Browser_Formal_Security.mp

@@ -33,6 +33,13 @@
 │*│ └────────────────────────────────────────────────────┘ │
 │*│                                                        │
 │*│ ┌─[ References ]─────────────────────────────────────┐ │
+│*│ │ "Example 19: Web browsers formal security model."  │ │
+│*│ │    from Auguston, M. "Monterey Phoenix System and  │ │
+│*│ │    Software Architecture and Workflow Modeling     │ │
+│*│ │    Language Manual" (Version 4). 2020. Available   │ │
+│*│ │    online:                                         │ │
+│*│ │    https://wiki.nps.edu/display/MP/Documentation   │ │
+│*│ │                                                    │ │
 │*│ │ Jackson, Daniel. "Alloy: A Language and Tool for   │ │
 │*│ │    Exploring Software Designs." Communications of  │ │
 │*│ │    the ACM 62, no. 9 (September 2019): 66–76.      │ │

models/Example17_SharedEvents_ProbabilityCalculationsType1.mp

@@ -34,7 +34,7 @@
 │*│ │ probability by that sum. This prorating operation  │ │
 │*│ │ distributes the contributions that would have been │ │
 │*│ │ made by the rejected traces equally across the     │ │
-│*│ │valid traces. The resulting probabilities show how  │ │
+│*│ │ valid traces. The resulting probabilities show how │ │
 │*│ │ "SHARE ALL" increases the chances of the shared    │ │
 │*│ │ event.                                             │ │
 │*│ └────────────────────────────────────────────────────┘ │