Skip to content

Commit a82f5be

Browse files
committed
Merge branch 'master' into develop
2 parents c0704a4 + 37bffaf commit a82f5be

6 files changed

+10
-10
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ AdaML must be used locally to get quality graphics. You can generate diagrams in
7575
- Remove default lines and paste the following code:
7676

7777
```
78-
!include https://raw.github.com/rocher/AdaML/develop/AdaML.puml
78+
!include https://raw.github.com/rocher/AdaML/release/0.1.1/AdaML.puml
7979
scale 300 width
8080
8181
begin_type("Pan_Dimensional")
@@ -88,7 +88,7 @@ private()
8888
variable("The_Answer", "Natural", 42)
8989
end()
9090
91-
depends("Pan_Dimensional", "Deep_Thought", "ask")
91+
depends("Pan_Dimensional", "Deep_Thought", "ask >")
9292
```
9393

9494
### Embed Diagrams in GitHub

diagram/deep-thought-02.aml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@startuml
22

3-
!include https://raw.github.com/rocher/AdaML/develop/AdaML.puml
3+
!include https://raw.github.com/rocher/AdaML/master/AdaML.puml
44
scale 300 width
55

66
begin_type("Pan_Dimensional")

diagram/self-AdaML-01.aml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@startuml
22

3-
!include https://raw.github.com/rocher/AdaML/develop/AdaML.puml
3+
!include https://raw.github.com/rocher/AdaML/master/AdaML.puml
44
scale 600 width
55

66
package("AdaML")

doc/AdaML.org

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#+TITLE: AdaML
22
# -- version settings
3-
#+MACRO: gitbranch develop
4-
#+MACRO: version develop
5-
#+LATEX_HEADER: \newcommand{\AdaMLVersion}{ develop }
3+
#+MACRO: gitbranch 0.1.1
4+
#+MACRO: version 0.1.1
5+
#+LATEX_HEADER: \newcommand{\AdaMLVersion}{ 0.1.1 }
66
# -- subtitle settings
77
#+LATEX_HEADER: \newcommand{\PDFSubtitle}{Ada tailored UML Modeling Language}
88
#+LATEX_HEADER: \newcommand{\AdaMLSubtitle}{\vspace{.77cm}\ding{125}\ \textit{Ada-tailored UML\newline Modeling Language} \ding{126}\vspace{1cm}}

doc/appendix.org

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
** Release
33
*** Status
44
+ AdaML is available under the terms of the GPLv3 License
5-
+ Current release is =develop=
5+
+ Current release is =0.1.1=
66

77
*** ChangeLog
88
+ First public release including everything you see in this overview document

doc/introduction.org

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
- Remove default lines and paste the following code:
2323

2424
#+begin_example
25-
!include https://raw.github.com/rocher/AdaML/develop/AdaML.puml
25+
!include https://raw.github.com/rocher/AdaML/release/0.1.1/AdaML.puml
2626
begin_type("Pan_Dimensional")
2727
procedure("Ask_The_Question", "in out Natural")
2828
end()
@@ -42,7 +42,7 @@ In case you want to test the examples in this doc
4242
- Visit one of the several available PlantUML online servers
4343
- Copy and paste the =AdaML= code shown in the examples
4444
- Replace the line '=!include AdaML.puml=' with\newline \newline
45-
\scriptsize{!include https://raw.github.com/rocher/AdaML/develop/AdaML.puml}
45+
\scriptsize{!include https://raw.github.com/rocher/AdaML/release/0.1.1/AdaML.puml}
4646
\newline
4747
*** Warning
4848
Depending on the PlantUML version used in the web site you can obtain different

0 commit comments

Comments
 (0)