Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
weedySeaDragon committed Mar 11, 2019
2 parents 84a6b21 + 3d79fa0 commit 1b3f024
Show file tree
Hide file tree
Showing 341 changed files with 367 additions and 2,088 deletions.
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/Activity.puml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ endif

end

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/Class.puml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml
title Class diagram
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml


abstract class AbstractList
Expand All @@ -27,5 +27,5 @@ HOURS
MINUTES
}

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/Component.puml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml
title Component diagram
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

package "Some Group" {
HTTP - [First Component]
Expand All @@ -13,5 +13,5 @@ FTP - [Second Component]
[First Component] --> FTP
}

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/Deployment.puml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml


title Deployment diagram: elements
Expand Down Expand Up @@ -29,5 +29,5 @@ rectangle "Rectangle" <<Stereotype>> {
actor X
}

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/Deployment2.puml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

title Deployment elements\n(Component = UML2 style)

Expand All @@ -25,5 +25,5 @@ storage storage
usecase usecase


'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/Object.puml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

title Object diagram

Expand All @@ -20,5 +20,5 @@ Object03 *-- Object04
Object05 o-- "4" Object06
Object07 .. Object08 : some labels

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/SaltWireframe.puml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ salt
"Enter text here "
^This is a droplist^
}
'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/Sequence.puml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Bob --> Alice: Authentication Response
Alice -> Bob: Another authentication Request
Alice <-- Bob: another authentication Response

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/State.puml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml
title State diagram
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

[*] --> NotShooting

Expand All @@ -21,5 +21,5 @@ state Configuring {
}

}
'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/UseCase.puml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@startuml
title Use Case diagram
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

:Main Admin: as Admin
(Use the application) as (Use)
Expand All @@ -21,5 +21,5 @@ note "This note is connected\nto several objects." as N2
(Start) .. N2
N2 .. (Use)

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/current_path.puml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
' This prints the current directory (Current Dir) of... ??
' and the "default path" (which is really the current directory!)
path
'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
4 changes: 2 additions & 2 deletions src/site/sphinx/diagrams/puml/example-other-shapes.puml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@startuml
'!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml
!include ../../plantuml-styles/plantuml-ae-noshadowing.iuml

actor a order 1

Expand Down Expand Up @@ -43,5 +43,5 @@ a <<-->> b
a o<->o b


'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-actor-simple-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ actor "Alice" as A #SaddleBrown

actorI -> A

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-arrow-colors.puml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ A --[#939393]> B:--[#939393]> creates a gray filled arrow with a dashed line
A o-[#blue]>> B:o-[#blue]>> creates a blue, solid line found message
A -[#red]>x B: -[#red]>x creates a red, solid line deletion message

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-arrow-heads.puml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ A->]:\t a "]" shows a message going to outside the scope of the diagram



'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-arrow-long.puml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ A <- D

caption: \nEven though you made the arrow line\n from A to B the longest,\n their lengths are calculated and this\n calculated length is what's drawn.

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-boundary-simple-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ boundary "System Boundary" as sysBoundary #orange

boundaryB -> sysBoundary

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-control-simple-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ control "Controller C" as A #lightGreen

controlC -> A

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-create-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Alice -> authSys: Authentication Request
create wrappedRequest
authSys -> wrappedRequest: new request()
Alice <-- authSys: response
'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-database-simple-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ database "Auth DB" as A #AliceBlue

db -> A

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/seq-entity-simple-ex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ entity "Authorizer" as A #lavender

entityE -> A

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ end critical

end par

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ person->>panel:digit
end
end

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ ob1c1->[: opti

deactivate ob1c1

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ a->>b:no

end

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ end



'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Bob -> RequestHandler: validated Authenticated Request
RequestHandler --> Bob: Authenticated Response (OK)
Bob --> Alice: Authentication Response (OK)

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/sequence-2-bob-alice.puml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Bob --> RH: formatted Authenticated Request (INVALID)
RH --> Bob: Request Authenticated Response (DENIED)
Alice <-- Bob: Authentication Response (DENIED)

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/sequence-2complex.puml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ deactivate B
A --> User: Done
deactivate A

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/usecase-arrows.puml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Admin -[#blue]-> (Manage Users): This arrow is -[#blue]->
manager -[#blue]->> (Manage Users): This arrow is -[#blue]->>


'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/usecase-notes-connected.puml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ note "This note is connected to \n two use cases \n and the User actor." as N2
N2 .[#magenta].|> (Use)
User <==[#DeepSkyBlue]==> N2

'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml
2 changes: 1 addition & 1 deletion src/site/sphinx/diagrams/puml/usecase-notes.puml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ note as freeFloatingNote #white
end note


'!include ../../plantuml-styles/ae-copyright-footer.txt
!include ../../plantuml-styles/ae-copyright-footer.txt
@enduml

0 comments on commit 1b3f024

Please sign in to comment.