From bb31b7e66d4ab9bef791a9d87f4790f085c99a4b Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 19 Jun 2017 17:32:33 +0200 Subject: [PATCH] Fix pdf paging and make-units rendering (svg to png). Change-Id: I60b5ab02602b993d8d92504b25f0a35d340d5444 Signed-off-by: Sebastien Douheret --- docs/2.1-widgets.md | 5 - docs/2.2-config.xml.md | 11 +- docs/5.2-security-framework.md | 1 - docs/README.md | 3 - docs/pictures/make-units.svg | 2071 +++++++++------------------------------- 5 files changed, 438 insertions(+), 1653 deletions(-) diff --git a/docs/2.1-widgets.md b/docs/2.1-widgets.md index fa571e1..d1777c8 100644 --- a/docs/2.1-widgets.md +++ b/docs/2.1-widgets.md @@ -130,7 +130,6 @@ The data of a user are in its directory and are labelled by the security-manager [widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" [widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" [app-manifest]: http://www.w3.org/TR/appmanifest "Web App Manifest" - [meta-intel]: https://github.com/01org/meta-intel-iot-security "A collection of layers providing security technologies" [widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" [widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" @@ -145,7 +144,3 @@ The data of a user are in its directory and are labelled by the security-manager [app-manifest]: http://www.w3.org/TR/appmanifest "Web App Manifest" [tizen-security]: https://wiki.tizen.org/wiki/Security "Tizen security home page" [tizen-secu-3]: https://wiki.tizen.org/wiki/Security/Tizen_3.X_Overview "Tizen 3 security overview" - - - - diff --git a/docs/2.2-config.xml.md b/docs/2.2-config.xml.md index 87d139f..c50567d 100644 --- a/docs/2.2-config.xml.md +++ b/docs/2.2-config.xml.md @@ -398,6 +398,7 @@ out at the moment. - ***application/vnd.agl.html.hybrid*** + The configuration file afm-unit.conf ==================================== @@ -418,7 +419,7 @@ describes graphically the workflow of creating the unit files for systemd `afm-unit.conf` from the configuration file of the widget `config.xml`: -![make-units][make-units] +![make-units](pictures/make-units.svg) In a first step, and because [mustache][] is intended to work on JSON representations, the configuration file is @@ -477,20 +478,13 @@ Variables starting with `X-AFM--` are private to the framework. By example, the variable `X-AFM--http-port` is used to record the allocated port for applications. - [mustach]: https://gitlab.com/jobol/mustach "basic C implementation of mustache" [mustache]: http://mustache.github.io/mustache.5.html "mustache - Logic-less templates" -[make-units]: pictures/make-units.svg [widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" [widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" [libxml2]: http://xmlsoft.org/html/index.html "libxml2" [app-manifest]: http://www.w3.org/TR/appmanifest "Web App Manifest" - - [meta-intel]: https://github.com/01org/meta-intel-iot-security "A collection of layers providing security technologies" -[widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" -[widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" -[libxml2]: http://xmlsoft.org/html/index.html "libxml2" [openssl]: https://www.openssl.org "OpenSSL" [xmlsec]: https://www.aleksey.com/xmlsec "XMLSec" [json-c]: https://github.com/json-c/json-c "JSON-c" @@ -498,7 +492,6 @@ record the allocated port for applications. [libzip]: http://www.nih.at/libzip "libzip" [cmake]: https://cmake.org "CMake" [security-manager]: https://wiki.tizen.org/wiki/Security/Tizen_3.X_Security_Manager "Security-Manager" -[app-manifest]: http://www.w3.org/TR/appmanifest "Web App Manifest" [tizen-security]: https://wiki.tizen.org/wiki/Security "Tizen security home page" [tizen-secu-3]: https://wiki.tizen.org/wiki/Security/Tizen_3.X_Overview "Tizen 3 security overview" [semantic-version]: http://semver.org/ "Semantic versioning" diff --git a/docs/5.2-security-framework.md b/docs/5.2-security-framework.md index 61b01bb..45f1851 100644 --- a/docs/5.2-security-framework.md +++ b/docs/5.2-security-framework.md @@ -36,7 +36,6 @@ How to manage that? - [meta-intel]: https://github.com/01org/meta-intel-iot-security "A collection of layers providing security technologies" [widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" [widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" diff --git a/docs/README.md b/docs/README.md index a148ed5..bb89613 100644 --- a/docs/README.md +++ b/docs/README.md @@ -225,8 +225,6 @@ This basis is not meant as being rigid and it can be extended in the future to include for example incremental delivery. - - [meta-intel]: https://github.com/01org/meta-intel-iot-security "A collection of layers providing security technologies" [widgets]: http://www.w3.org/TR/widgets "Packaged Web Apps" [widgets-digsig]: http://www.w3.org/TR/widgets-digsig "XML Digital Signatures for Widgets" @@ -241,6 +239,5 @@ future to include for example incremental delivery. [app-manifest]: http://www.w3.org/TR/appmanifest "Web App Manifest" [tizen-security]: https://wiki.tizen.org/wiki/Security "Tizen security home page" [tizen-secu-3]: https://wiki.tizen.org/wiki/Security/Tizen_3.X_Overview "Tizen 3 security overview" - [AppFW-APP_install_sequences]: pictures/AppFW-APP_install_sequences.svg [Security_model_history]: pictures/Security_model_history.svg diff --git a/docs/pictures/make-units.svg b/docs/pictures/make-units.svg index 496aeff..d52a8c7 100644 --- a/docs/pictures/make-units.svg +++ b/docs/pictures/make-units.svg @@ -1,1635 +1,436 @@ - -image/svg+xml \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + config.xml + + + + + + + /etc/afm/afm-unit.conf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + json description + + + + + + + + + Mustache engine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + units description + + + + + + + *.service + + + + + + + *.socket + + + + + + virtualdata + + + + + + + + + + + + + + + + + + + + + + + Unit installer + + + + + + + + + Config engine + + + + + + + ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + configurationfile + + + + + + systemdunits + + + + + + + \ No newline at end of file -- 2.16.6