Skip to content

Commit

Permalink
Merge pull request #1 from openpermissions/opp
Browse files Browse the repository at this point in the history
Add copyright notices to markdown. Update requirements
  • Loading branch information
louisnayegon committed May 9, 2016
2 parents 505757d + d6934bf commit e137559
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) Copyright Connected Digital Economy Catapult Limited 2015
# (C) Copyright Open Permissions Platform Coalition 2016
.PHONY: clean requirements docs

# You should not set these variables from the command line.
Expand Down
3 changes: 3 additions & 0 deletions documents/markdown/arch/TECHSPEC_V0.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,3 +232,6 @@ Note that currently a recommended Hub Key field has been defined only for photog
|Photographic images|http://www.iptc.org/std/photometadata/specification/IPTC-PhotoMetadata |IPTC Core Rights: Usage Terms|

**TBD:** Include an example of the XML?

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
2 changes: 2 additions & 0 deletions documents/markdown/arch/TECHSPEC_V1.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,5 @@ The Hub Key **must not** contain Unicode characters, to ensure that it can be us
Instead, when a Hub Key is generated the `resolver_id` is encoded using the Internationalized Domain Names in Applications (IDNA) ptotocol, see [RFC5891](https://www.ietf.org/rfc/rfc5891.txt).
The remaining components are percent encoded, see [RFC3987](https://www.ietf.org/rfc/rfc3987.txt) and [RFC3490](https://www.ietf.org/rfc/rfc3490.txt).

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
5 changes: 4 additions & 1 deletion documents/markdown/arch/arch-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

This document provides a high level overview of the Open Permissions Platform, including system features and design principles. It is intended to provide basic orientation and context for those new to the project, as well as a first introduction for technical audiences.

For information, issues, and support, contact [support[email protected].org.uk](mailto:support[email protected].org.uk) by email.
For information, issues, and support, contact [support@openpermissions.org](mailto:support@openpermissions.org) by email.

### See also

Expand Down Expand Up @@ -214,3 +214,6 @@ To use the Open Permissions Platform, applications must be known to the system.
In implementation terms, a decorator object is added to an endpoint.

[Link TBD to forthcoming Security Principles doc]

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
11 changes: 5 additions & 6 deletions documents/markdown/auth/howto-ssl.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!-- howto-ssl.md
Written by BenM, Thu Oct 1 18:23:00 2015
-->

# How to set up and test authenticated access to Hub services

## Contents
Expand All @@ -20,7 +16,7 @@ This How-to provides a step by step guide to setting up and testing
SSL authentication against Open Permissions Platform services.

For issues and support, contact
[support[email protected].org.uk](mailto:support[email protected].org.uk) by email.
[support@openpermissions.org](mailto:support@openpermissions.org) by email.

### See also

Expand All @@ -29,7 +25,7 @@ guide to the Accounts service.~~

__NOTE:__ The Accounts service UI is not yet available to third parties
using the current Hub release. Contact
[support[email protected].org.uk](mailto:support[email protected].org.uk) by email
[support@openpermissions.org](mailto:support@openpermissions.org) by email
for more information about registration.

## Overview
Expand Down Expand Up @@ -358,3 +354,6 @@ certificate files:
|`COMODORSAAddTrustCA.crt`|Intermediate certificate|Y|
|`COMODORSADomainValidationSecureServerCA.crt`|Root certificate|Y|
|`www_yourdomain_com.crt`|SSL server certificate for your domain|Y|

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 3 additions & 4 deletions documents/markdown/tocs/account-toc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
(C) Copyright Digital Catapult Limited 2016
-->

# APIs & Doc

## Support Documentation
Expand All @@ -24,3 +20,6 @@ The Accounts Service also exposes a RESTful API providing programmatic
access to account management functions:

+ [API reference](https://github.com/openpermissions/accounts-srv/blob/master/documents/apiary/api.md)

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 3 additions & 4 deletions documents/markdown/tocs/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
(C) Copyright Digital Catapult Limited 2016
-->

# APIs & Doc

## Support Documentation
Expand Down Expand Up @@ -81,3 +77,6 @@ they are used in OPP
[Open Permissions Platform](http://www.openpermissions.org) OPP instance,
[Source ID Types](../types/source-id-types.md)
lists the source asset types currently supported by that instance

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 3 additions & 4 deletions documents/markdown/tocs/onboard-toc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
(C) Copyright Digital Catapult Limited 2016
-->

# APIs & Doc

## Support Documentation
Expand All @@ -28,3 +24,6 @@ application clients that use the Onboarding APIs:

+ [How to use the Onboarding Service](https://github.com/openpermissions/onboarding-srv/blob/master/documents/markdown/how-to-onboard.md)
+ [API reference](https://github.com/openpermissions/onboarding-srv/blob/master/documents/apiary/api.md)

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 3 additions & 4 deletions documents/markdown/tocs/query-toc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
(C) Copyright Digital Catapult Limited 2016
-->

# APIs & Doc

## Support Documentation
Expand All @@ -25,3 +21,6 @@ application clients that use the Query Service APIs:

+ [How to use the Query Service](https://github.com/openpermissions/query-srv/blob/master/documents/markdown/how-to-query.md)
+ [API reference](https://github.com/openpermissions/query-srv/blob/master/documents/apiary/api.md)

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 3 additions & 4 deletions documents/markdown/types/source-id-types.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<!--
(C) Copyright Digital Catapult Limited 2016
-->

# Source ID Types

## About
Expand Down Expand Up @@ -29,3 +25,6 @@ Currently supported source id types are
| mirrorpixpictureid | An image ID from [mirrorpix](http://www.mirrorpix.com/) |
| ouimagespictureid | An image ID from [Oxford University Images](http://www.oxforduniversityimages.com/) |
| picscoutpictureid | An image ID from [PicScout](http://www.picscout.com/) |

<!-- Copyright Notice -->
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git+ssh://[email protected]/catapultbamboo/file_translate.git@0.0.3
file-translate==0.0.3
grip==3.3.0

0 comments on commit e137559

Please sign in to comment.