diff --git a/doc/aadl-editors.png b/doc/aadl-editors.png new file mode 100644 index 0000000000000000000000000000000000000000..aa522551f75c0a975cc6efe3cf0a9b8b623fdfe3 Binary files /dev/null and b/doc/aadl-editors.png differ diff --git a/doc/aadl-mode.png b/doc/aadl-mode.png deleted file mode 100644 index 7835a9e2e3df6c6d892b2255df35fc229b1f967e..0000000000000000000000000000000000000000 Binary files a/doc/aadl-mode.png and /dev/null differ diff --git a/doc/aadl-mode_vim.png b/doc/aadl-mode_vim.png deleted file mode 100644 index f44e874ced2fef71e787b0c6d9a3392d175926dc..0000000000000000000000000000000000000000 Binary files a/doc/aadl-mode_vim.png and /dev/null differ diff --git a/doc/editors.rst b/doc/editors.rst index bd9f73422ac9a3b2aa39ae8ef6336f62a135cdb1..8b8a35412970fb6e16dbc4458fcd0813ed42758a 100644 --- a/doc/editors.rst +++ b/doc/editors.rst @@ -9,6 +9,12 @@ Editor support The AADL modes for Emacs and vim provide syntax coloration and automatic indentation features when editing AADL files. +.. figure:: aadl-editors.png + :align: center + :scale: 75 % + + AADL mode for emacs and vim + Emacs ===== @@ -19,10 +25,6 @@ your emacs configuration file (usually located in :file:`~/.emacs`) :: For more details on this mode, please refer to the emacs contextual help. -.. figure:: aadl-mode.png - :align: center - - AADL mode for Emacs vim === @@ -40,10 +42,3 @@ named :file:`~/.vim/filetype.vim`, in which you write:: augroup END For more details, please read the documentation of vim. - - -.. figure:: aadl-mode_vim.png - :align: center - - AADL mode for vim - diff --git a/doc/index.rst b/doc/index.rst index 94cf95a75b8c105b6456f7e1cbc64f44d85667f5..d5ba23c61b2e79e9a398a9f2d0eb619a08ee5b61 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -7,6 +7,7 @@ Ocarina User's Guide ==================== .. toctree:: + :numbered: :maxdepth: 2 about diff --git a/doc/introduction.rst b/doc/introduction.rst index d97a80b319f081631299204449c41feac2f8877d..83b7214ac479ec1ab5eda3d6ae9d3709bff0ee54 100644 --- a/doc/introduction.rst +++ b/doc/introduction.rst @@ -37,6 +37,24 @@ standards and proposes the following features : scheduling analysis tool from the Université de Bretagne Occidentale, and MAST from the University of Cantabria + +Ocarina is distributed under the GNAT Modified GPL licence, or +GMGPL. The GMGPL is an extension of GPLv2, adding the following +provision: + + As a special exception, if other files instantiate generics + from this unit, or you link this unit with other files to + produce an executable, this unit does not by itself cause the + resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU + Public License. + +The GMGPL guarantees that Ocarina, but also the code it generates can +be distributed under customer-specific terms and +conditions. Specifically, the GMGPL ensures that you can generate +proprietary, classified, or otherwise restricted executables. + About AADL ##########