Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: okfn/opendefinition
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 857e161
Choose a base ref
...
head repository: okfn/opendefinition
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d8ba73db2f4c244a07564df751b357ffb0c7280
Choose a head ref

Commits on Jan 15, 2015

  1. Update version numbers

    hlainchb committed Jan 15, 2015
    Copy the full SHA
    cdba9ea View commit details
  2. Copy the full SHA
    b60383c View commit details
  3. Copy the full SHA
    6593b96 View commit details
  4. Copy the full SHA
    014bd67 View commit details
  5. 2.2.5

    towards #61
    mlinksva committed Jan 15, 2015
    10
    Copy the full SHA
    6ee94fe View commit details

Commits on Jan 26, 2015

  1. Merge pull request #1 from okfn/master

    update my Master
    wolftune committed Jan 26, 2015
    Copy the full SHA
    5d43e02 View commit details

Commits on Jan 27, 2015

  1. Copy the full SHA
    d2bac54 View commit details
  2. Merge pull request #82 from wolftune/master

    more consistent wording, clearer 2.2.5
    mlinksva committed Jan 27, 2015
    Copy the full SHA
    3850628 View commit details
  3. adjustment to 2.2.3

    wolftune committed Jan 27, 2015
    Copy the full SHA
    7486bd8 View commit details
  4. oops typo again, fixed

    wolftune committed Jan 27, 2015
    Copy the full SHA
    21f396c View commit details
  5. Merge pull request #83 from wolftune/master

    adjustment to 2.2.3
    hlainchb committed Jan 27, 2015
    Copy the full SHA
    1659305 View commit details

Commits on Feb 27, 2015

  1. Copy the full SHA
    ac7eace View commit details

Commits on Feb 28, 2015

  1. Minor language proposal to improve conssitency.

    There is no difference between the meaning of “shall” and “must” in
    RFC2119 and there does not appear to be a reason for using them
    interchangeably in the definition here, so I propose that a single term
    is used instead of two.
    
    Ken Adam’s “Manual of Style for Contract Drafting” recommends that
    “shall” is used as a replacement for “has a duty to” while “must” is
    used in all other situations. Therefore “must” is the more appropriate
    term for this.
    bluechi committed Feb 28, 2015
    Copy the full SHA
    d2c5fb3 View commit details
  2. Merge pull request #85 from bluechi/master

    Minor language proposal to improve consistency.
    mlinksva committed Feb 28, 2015
    Copy the full SHA
    8aca1a9 View commit details

Commits on Mar 17, 2015

  1. make links to OSD/FSD/DFCW go to wikipedia for historical context & s…

    …o they are translatable (translations should change 'en' in links)
    
    close #56
    mlinksva committed Mar 17, 2015
    Copy the full SHA
    e9a481f View commit details
  2. simplified 2.2.5

    wolftune committed Mar 17, 2015
    Copy the full SHA
    e8861f7 View commit details
  3. Merge pull request #89 from wolftune/master

    simplified 2.2.5, close #61
    mlinksva committed Mar 17, 2015
    Copy the full SHA
    8fdfc00 View commit details

Commits on Apr 23, 2015

  1. specified "machine-readable" to be data-specific

    We can figure out further updates later about whether we formally approve of Open Formats or otherwise flesh out the definition. For now, we *must* not require that all works be machine-readable as that detail is really a data-specific concern.
    wolftune committed Apr 23, 2015
    Copy the full SHA
    423f262 View commit details
  2. typo fix

    wolftune committed Apr 23, 2015
    Copy the full SHA
    77edb52 View commit details
  3. Merge pull request #94 from wolftune/patch-4

    specified "machine-readable" to be data-specific
    hlainchb committed Apr 23, 2015
    Copy the full SHA
    91b3028 View commit details

Commits on May 11, 2015

  1. Better use and formatting of "should"

    1.2 replaced "preferably" with "and *should* be"
    1.3 Added italics to "should"
    Stephen-Gates committed May 11, 2015
    Copy the full SHA
    f80cbc7 View commit details
  2. Copy the full SHA
    60fcb18 View commit details
  3. Copy the full SHA
    6b7c259 View commit details
  4. Consistent formatting of special words in 1.2

    - italics on first "must"
    - bold "work" in last sentence.
    Stephen-Gates committed May 11, 2015
    Copy the full SHA
    2725d56 View commit details
  5. consistent use of "must" in 1. Open Works

    addresses #96
    Stephen-Gates committed May 11, 2015
    Copy the full SHA
    28a66fe View commit details
  6. Merge pull request #99 from Stephen-Gates/master

    Better use and formatting of "should" fixes #97
    mlinksva committed May 11, 2015
    Copy the full SHA
    8e008b3 View commit details
  7. Merge branch 'Stephen-Gates-patch-1'

    Conflicts:
    	source/open-definition-2.1-dev.markdown
    mlinksva committed May 11, 2015
    Copy the full SHA
    b4dfa9f View commit details

Commits on May 15, 2015

  1. rm unnecessary use of word should

    which in context is not in contrast with must
    mlinksva committed May 15, 2015
    Copy the full SHA
    2766b3f View commit details
  2. bulk is an access matter, form shouldn't be specific to data, machine…

    …-readability
    
    implied by processable by floss tool
    mlinksva committed May 15, 2015
    Copy the full SHA
    6c97682 View commit details
  3. italicize should

    mlinksva committed May 15, 2015
    Copy the full SHA
    29641a3 View commit details

Commits on May 18, 2015

  1. Copy the full SHA
    d07eae1 View commit details

Commits on May 23, 2015

  1. Copy the full SHA
    4e8b43b View commit details
  2. Merge pull request #104 from mlinksva/form

    bulk is an access matter and already covered by "whole work", form shouldn't be specific to data, machine…
    mlinksva committed May 23, 2015
    Copy the full SHA
    5bc6f84 View commit details

Commits on Jun 11, 2015

  1. available->provided

    mlinksva committed Jun 11, 2015
    Copy the full SHA
    aae5d3a View commit details
  2. fix #77 as discussed on OD call

    mlinksva committed Jun 11, 2015
    Copy the full SHA
    22a12d0 View commit details
  3. rfc2119 ref, fixes #65

    mlinksva committed Jun 11, 2015
    Copy the full SHA
    dcde75b View commit details

Commits on Jul 15, 2015

  1. italicize "must not"

    hlainchb committed Jul 15, 2015
    Copy the full SHA
    0e26b1d View commit details

Commits on Jul 16, 2015

  1. add attribution

    hlainchb committed Jul 16, 2015
    Copy the full SHA
    0d8ba73 View commit details
Showing with 94 additions and 21 deletions.
  1. +67 −0 licenses/inreview/OGL-Surrey-BC-2.0.md
  2. +27 −21 source/open-definition-2.1-dev.markdown
67 changes: 67 additions & 0 deletions licenses/inreview/OGL-Surrey-BC-2.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
Open Government Licence - Surrey
====

You are encouraged to use the Information that is available under this license with only a few conditions.

Using Information under this license
----
* Use of any Information indicates your acceptance of the terms below.
* The Information Provider grants you a worldwide, royalty-free, perpetual, non-exclusive license to use the Information, including for commercial purposes, subject to the terms below.

You are free to:
----
Copy, modify, publish, translate, adapt, distribute or otherwise use the Information in any medium, mode or format for any lawful purpose.

You must, where you do any of the above:
----
* Acknowledge the source of the Information by including any attribution statement specified by the Information Provider(s) and, where possible, provide a link to this license.

* If the Information Provider does not provide a specific attribution statement, or if you are using Information from several Information Providers and multiple attributions are not practical for your product or application, you must use the following attribution statement:

> Contains information licensed under the Open Government License – City of Surrey.
* The terms of this license are important, and if you fail to comply with any of them, the rights granted to you under this license, or any similar license granted by the Information Provider, will end automatically.

Exemptions
----
This license does not grant you any right to use:

* Personal Information;
* Third party rights the Information Provider is not authorized to license;
* The names, crests, logos, or other official marks of the Information Provider; and
* Information subject to other intellectual property rights, including patents, trade-marks and official marks.

Non-endorsement
----
* This license does not grant you any right to use the Information in a way that suggests any official status or that the Information Provider endorses you or your use of the Information.

No warranty
----
* The Information is licensed “as is”, and the Information Provider excludes all representations, warranties, obligations, and liabilities, whether express or implied, to the maximum extent permitted by law.

* The Information Provider is not liable for any errors or omissions in the Information, and will not under any circumstances be liable for any direct, indirect, special, incidental, consequential, or other loss, injury or damage caused by its use or otherwise arising in connection with this license or the Information, even if specifically advised of the possibility of such loss, injury or damage.

Governing Law
----
* This license is governed by the laws of the province of British Columbia and the applicable laws of Canada.
* Legal proceedings related to this license may only be brought in the courts of British Columbia.

Definitions
----
In this license, the terms below have the following meanings:

"Information"
Means information resources protected by copyright or other information that is are offered for use under the terms of this license.

"Information Provider"
* Means the City of Surrey.

"Personal Information"
* Has the meaning set out in Schedule 1 of the Freedom of Information and Protection of Privacy Act (B.C.).

"You"
* Means the natural or legal person or body of persons corporate or incorporate, acquiring rights under this license.

Versioning
----
This is version 2.0 of the Open Government License for the City of Surrey. The Information Provider may make changes to the terms of this license from time to time and issue a new version of the license. Your use of the Information will be governed by the terms of the license in force as of the date you accessed the Information.
48 changes: 27 additions & 21 deletions source/open-definition-2.1-dev.markdown
Original file line number Diff line number Diff line change
@@ -3,52 +3,55 @@ title: Open Definition
layout: page
redirect_from:
- /okd/
- /od/2.0/
- /od/2.1/
---

Version 2.0
Version 2.1 dev

The Open Definition makes precise the meaning of "open" with respect to knowledge, promoting a robust commons in which anyone may participate, and interoperability is maximized.

**Summary:** *Knowledge is open if anyone is free to access, use, modify, and share it — subject, at most, to measures that preserve provenance and openness.*

This essential meaning matches that of "open" with respect to software as in the [Open Source Definition](http://www.opensource.org/docs/osd) and is synonymous with "free" or "libre" as in the [Definition of Free Cultural Works](http://freedomdefined.org). The Open Definition was initially derived from the Open Source Definition, which in turn was derived from the [Debian Free Software Guidelines](http://www.debian.org/social_contract).
This essential meaning matches that of "open" with respect to software as in the [Open Source Definition](https://en.wikipedia.org/wiki/The_Open_Source_Definition) and is synonymous with "free" or "libre" as in the [Free Software Definition](https://en.wikipedia.org/wiki/The_Free_Software_Definition) and [Definition of Free Cultural Works](https://en.wikipedia.org/wiki/Definition_of_Free_Cultural_Works).

The term **work** will be used to denote the item or piece of knowledge being transferred.

The term **license** refers to the legal conditions under which the work is
made available. Where no license has been offered this should be interpreted
as referring to default legal conditions governing use of the work (for
example, copyright or public domain).
provided. Where no license has been offered the term refers to default legal conditions
governing use of the work (for example, copyright or public domain).

The key words "must", "must not", "should",and "may"
in this document are to be interpreted as described in
[RFC2119](https://tools.ietf.org/html/rfc2119).

## 1. Open Works

An open **work** must satisfy the following requirements in its distribution:
An open **work** *must* satisfy the following requirements in its distribution:

### 1.1 Open License

The **work** *must* be available under an open **license** (as defined in Section 2).
The **work** *must* be provided under an open **license** (as defined in Section 2).
Any additional terms accompanying the work (such as a terms of use, or patents held by the licensor) *must not*
contradict the terms of the license.

### 1.2 Access

The **work** shall be available as a whole and at no more than a reasonable
one-time reproduction cost, preferably downloadable via the Internet without charge.
The **work** *must* be provided as a whole and at no more than a reasonable
one-time reproduction cost, and *should* be downloadable via the Internet without charge.
Any additional information necessary for license compliance (such as names of
contributors required for compliance with attribution requirements) *must* also
accompany the work.

### 1.3 Open Format

The **work** *must* be machine-readable and provided in an open format. An open format is
one which places no restrictions, monetary or otherwise, upon its use and can be processed
with at least one free/libre/open-source software tool. Data *should* be provided in bulk
where possible.

The **work** *must* be provided in an open format. An open format is
one which places no restrictions, monetary or otherwise, upon its use and can be fully processed
with at least one free/libre/open-source software tool. The work *should* be provided in the form preferred for making modifications to it.

## 2. Open Licenses

A **license** *should* be compatible with other open licenses.

A **license** is open if its terms satisfy the following conditions:

### 2.1 Required Permissions
@@ -77,7 +80,7 @@ The **license** *must* allow any part of the work
to be freely used, distributed, or modified separately from any other part
of the work or from any collection of works in which it was originally
distributed. All parties who receive any distribution of any part of
a work within the terms of the original license should have the same rights
a work within the terms of the original license *should* have the same rights
as those that are granted in conjunction with the original work.

#### 2.1.5 Compilation
@@ -107,13 +110,13 @@ compensation or monetary remuneration as part of its conditions.

### 2.2 Acceptable Conditions

The **license** shall not limit, make uncertain, or otherwise diminish the permissions
The **license** *must not* limit, make uncertain, or otherwise diminish the permissions
required in Section 2.1 except by the following allowable conditions:

#### 2.2.1 Attribution

The **license** *may* require distributions of the work to include attribution
of contributors, rights holders, sponsors and creators as long as
of contributors, rights holders, sponsors, and creators as long as
any such prescriptions are not onerous.

#### 2.2.2 Integrity
@@ -124,16 +127,16 @@ otherwise indicate what changes have been made.

#### 2.2.3 Share-alike

The **license** *may* require copies or derivatives of a licensed work to remain
under a license the same as or similar to the original.
The **license** *may* require distributions of the work to remain
under the same license or a similar license.

#### 2.2.4 Notice

The **license** *may* require retention of copyright notices and identification of the license.

#### 2.2.5 Source

The **license** *may* require modified works to be made available in a form preferred for further modification.
The **license** *may* require that anyone distributing the work provide recipients with access to the preferred form for making modifications.

#### 2.2.6 Technical Restriction Prohibition

@@ -142,3 +145,6 @@ The **license** *may* require that distributions of the work remain free of any
#### 2.2.7 Non-aggression

The **license** *may* require modifiers to grant the public additional permissions (for example, patent licenses) as required for exercise of the rights allowed by the license. The license may also condition permissions on not aggressing against licensees with respect to exercising any allowed right (again, for example, patent litigation).

----
*The Open Definition was initially derived from the Open Source Definition, which in turn was derived from the original Debian Free Software Guidelines, and the Debian Social Contract of which they are a part, which were created by Bruce Perens and the Debian Developers. Bruce later used the same text in creating the Open Source Definition. This definition is substantially derivative of those documents and retains their essential principles. Richard Stallman was the first to push the ideals of software freedom which we continue.*