Skip to content
This repository has been archived by the owner on Aug 27, 2021. It is now read-only.

Commit

Permalink
Section 2 (#6)
Browse files Browse the repository at this point in the history
* add content for section-2

* index

* Update docs/2.policies/3.terms.md

apply @taliaga review

* section 1 (#5)

* initial toc

* fixed index for readthedocs

* added mkdocs for forcing the toc structure

* fixed indentation

* fixed node operation error in mkdocs compilation

* restructured the repository

* added missing index page in mkdocs.yml

* fixed linter issues

* enabled readthedocs build in the ci process

* fixing few linting issues and applying comments

* added new rules to the md linting added python 2.7 to the ci-build

* include section 1

* minor fixes

* fix code print

* try to fix index

* fix index

* fix levels and code

* fix code

* increase indent

* fixes

* fix syntax

* disable md41

* apply @taliaga review

* clean old toc

initial toc

fixed index for readthedocs

added mkdocs for forcing the toc structure

fixed indentation

fixed node operation error in mkdocs compilation

restructured the repository

fixed linter issues

fixing few linting issues and applying comments

include section 1

increase indent
  • Loading branch information
chicco785 committed Nov 9, 2018
1 parent 9174662 commit 3f163d8
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/1.essentials/5.steps_status.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ following operation:
```

Take note of 2015.1.1 and go to
[*https://wiki.openstack.org/wiki/Release\_Naming*](https://wiki.openstack.org/wiki/Release_Naming)
[*https://wiki.openstack.org/wiki/Release_Naming*](https://wiki.openstack.org/wiki/Release_Naming)
to see the corresponding OpenStack release (in this example Kilo).

- HOW TO CHECK THE MONITORING VERSION
Expand Down Expand Up @@ -60,4 +60,4 @@ following operation:
- HOW TO CHECK THE FEDERATION STATUS

Go to [*http://backlog.fiware.org/lab/backlog*](http://backlog.fiware.org/lab/backlog)
and check the closing date of the corresponding workitem.
and check the closing date of the corresponding workitem.
13 changes: 13 additions & 0 deletions docs/2.policies/1.privacy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Privacy Policy

The Privacy Policy is changed taking into account the change of
ownership of the data from Telefónica I+D, S.A.U. to FIWARE Foundation,
e.V.

Additionally, a depth revision of the content of this policy was made in
order to update the content and provide a more detailed information
about it. The result of this update can be seen in the corresponding
Annex E: Private Policy updated and it will be updated at the following
URL:

[*http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/FIWARE\_Privacy\_Policy*](http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/FIWARE_Privacy_Policy)
8 changes: 8 additions & 0 deletions docs/2.policies/2.cookies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
## Cookies policy

An update of the current Cookies Policy was driven in order to reflect
the changes in the ownership of the data. The Annex F: Cookies Policy
updated reflects these changes and in the same way reflected in the
following URL:

[*http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/Cookies\_Policy\_FIWARE*](http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/Cookies_Policy_FIWARE)
13 changes: 13 additions & 0 deletions docs/2.policies/3.terms.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Terms & Conditions

The Terms & Conditions is also updated following the last updated in the
FIWARE ecosystem. This content makes reference to the use of the FIWARE
Lab resources and the definition of the rights and obligations of both
FIWARE Lab and user of these resources. It also covers the termination of these
conditions and how to apply it w.r.t. the intellectual property
and proprietary rights. This content is reflected in the following URL:

[*http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/FIWARE\_LAB\_Terms\_and\_Conditions*](http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/FIWARE_LAB_Terms_and_Conditions)

The update of these Terms & Conditions will be notified to the users via
email in order that they will be notified about the changes.
4 changes: 4 additions & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ and connect it to the FIWARE Lab.
- [Steps to become a New FIWARE Lab node](1.essentials/3.steps_join.md)
- [Steps to discontinue a FIWARE Lab node](1.essentials/4.steps_leave.md)
- [Steps to show the current status of your FIWARE Lab node](1.essentials/5.steps_status.md)
1. Policies
- [Privacy Policy](2.policies/1.privacy.md)
- [Cookies policy](2.policies/2.cookies.md)
- [Terms & Conditions](2.policies/3.terms.md)
4 changes: 4 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ pages:
- 'Steps to become a New FIWARE Lab node': '1.essentials/3.steps_join.md'
- 'Steps to discontinue a FIWARE Lab node': '1.essentials/4.steps_leave.md'
- 'Steps to show the current status of your FIWARE Lab node': '1.essentials/5.steps_status.md'
- 'Policies':
- 'Privacy Policy': '2.policies/1.privacy.md'
- 'Cookies policy': '2.policies/2.cookies.md'
- 'Terms & Conditions': '2.policies/3.terms.md'

markdown_extensions: [toc,fenced_code]
extra_css: ["https://fiware.org/style/fiware_readthedocs.css"]

0 comments on commit 3f163d8

Please sign in to comment.