Merge branch '1.2-dev' into 403-noObjection-document

docs/guidance/build.md

@@ -115,7 +115,7 @@ Contact the [Data Support Team](../support/index) for guidance on customizing a
 **Resource:** To learn about how to create a spreadsheet input template for OCDS, check out our blog series on prototyping OCDS data using spreadsheets ([Part 1](https://www.open-contracting.org/2020/04/24/prototyping-ocds-data-using-spreadsheets/), [Part 2](https://www.open-contracting.org/2020/05/11/prototyping-ocds-data-using-spreadsheets-part-ii/), [Part 3](https://www.open-contracting.org/2020/05/28/prototyping-ocds-data-using-spreadsheets-part-iii/)).
 
 ```{note}
-Re-using tools isn't always easy. [Tool Re-Use in Open Contracting: A Primer](https://www.open-contracting.org/resources/tool-re-use-in-open-contracting-a-primer/) is a step-by-step guide to help you determine what you need, evaluate which tool is the right fit, and evaluate whether the right conditions are in place for successful re-use of a tool.
+Re-using tools isn't always easy. [Tool Reuse in Open Contracting: A Primer](https://www.open-contracting.org/resources/tool-re-use-in-open-contracting-a-primer/) is a step-by-step guide to help you determine what you need, evaluate which tool is the right fit, and evaluate whether the right conditions are in place for successful reuse of a tool.
 ```
 
 ## Build your extensions

docs/guidance/map/milestones.md

@@ -31,7 +31,7 @@ The contract milestones block is used to describe:
 The contract implementation milestones block is used to describe:
   * Any events related to the delivery of the contract, for example, the agreed date by which goods will be delivered.
 
-The nature of the milestone is indicated by the [milestone type codelist](../../schema/codelists.md#milestone-type), for example, to distinguish between milestones in the planning section which relate to events in the pre-procurement phase and those which relate to contract implementation.
+The nature of the milestone is indicated by the [milestone type codelist](../../schema/codelists.md#milestone-type), for example, to distinguish between milestones that relate to bid submission and others that relate to contract implementation.
 
 At the point of contract signature, a comparison between `tender/milestones` and `contract/implementation/milestones` with a `milestone/type` of 'delivery' or 'reporting' should reveal how the negotiated contract differs from what was set out at tender time.
 

docs/guidance/map/organization_classifications.md

@@ -45,7 +45,7 @@ In the examples below, two different publishers have disclosed information about
 
 Each `classification` block contains fields to provide information about the `description` (a textual description or title for the classification code), `id` (the classification code), `uri` (to uniquely identify the classification code) and `scheme`. The `scheme` value can be drawn from the open [classificationScheme codelist](../../schema/codelists.md#classification-scheme) (where the `Category` value is "organization"), or it can be a local scheme. Schemes are given to classify the activities of procuring authorities (i.e. procuring entities and/or buyers).
 
-Where an appropriate scheme is not listed in the [classificationScheme codelist](../../schema/codelists.md#classification-scheme), publishers can specify their own scheme. Publishers can either re-use an alternative scheme, or provide their own. Where publishers provide their own local schemes, they ought to prefix their `scheme` code with an [ISO-3166-1 alpha-3 country code](https://en.wikipedia.org/wiki/ISO_3166-1) to preserve its global uniqueness. Details of this local scheme, and a list of possible codes, ought to be described in the [publication policy](../publish.md#finalize-your-publication-policy).
+Where an appropriate scheme is not listed in the [classificationScheme codelist](../../schema/codelists.md#classification-scheme), publishers can specify their own scheme. Publishers can either reuse an alternative scheme, or provide their own. Where publishers provide their own local schemes, they ought to prefix their `scheme` code with an [ISO-3166-1 alpha-3 country code](https://en.wikipedia.org/wiki/ISO_3166-1) to preserve its global uniqueness. Details of this local scheme, and a list of possible codes, ought to be described in the [publication policy](../publish.md#finalize-your-publication-policy).
 
 #### Example 2.1 disclosing data using existing schemes
 

docs/guidance/map/pre-qualification.md

@@ -139,7 +139,7 @@ The procuring entity will invite a maximum of 5 qualified potential suppliers to
 
 ## Example: Pre-qualification in Paraguay
 
-The Ministry of Public Works and Communications issues an [invitation for potential suppliers to pre-qualify for two tenders for road construction in different neighbourhoods](https://contrataciones.gov.py/licitaciones/convocatoria/338229-servicios-consultoria-estudios-factibilidad-diseno-final-ingenieria-tramos-caminos-1/precalificacion.html). Each tender will re-use the list of pre-qualified potential suppliers established as a result of this first procedure.
+The Ministry of Public Works and Communications issues an [invitation for potential suppliers to pre-qualify for two tenders for road construction in different neighbourhoods](https://contrataciones.gov.py/licitaciones/convocatoria/338229-servicios-consultoria-estudios-factibilidad-diseno-final-ingenieria-tramos-caminos-1/precalificacion.html). Each tender will reuse the list of pre-qualified potential suppliers established as a result of this first procedure.
 
 The invitation represents the initiation of a contracting process to establish a list of pre-qualified potential suppliers, so it is modelled using the `tender` section in OCDS.
 

docs/guidance/publish.md

@@ -34,9 +34,9 @@ The publication policy ought to also contain information about future plans for
 
 ## License your data
 
-Publishing data under an open license is an important part of open contracting. Without this, restrictions on re-use can prevent many of the important [use cases](design/user_needs) for open contracting information being realized.
+Publishing data under an open license is an important part of open contracting. Without this, restrictions on reuse can prevent many of the important [use cases](design/user_needs) for open contracting information being realized.
 
-A license statement sets out the permission that users have to access, use and re-use the data. This can take the form of a [Public Domain Dedication or Certification](https://creativecommons.org/publicdomain/) which transfers a dataset into the public domain, or re-asserts that there are no existing copyrights or database rights inherent in the dataset (which is the case for government datasets in some jurisdictions), or the application of a license which sets out the terms under which a dataset can be re-used.
+A license statement sets out the permission that users have to access, use and reuse the data. This can take the form of a [Public Domain Dedication or Certification](https://creativecommons.org/publicdomain/) which transfers a dataset into the public domain, or re-asserts that there are no existing copyrights or database rights inherent in the dataset (which is the case for government datasets in some jurisdictions), or the application of a license which sets out the terms under which a dataset can be re-used.
 
 We encourage the use of either a public domain dedication/certification, or an attribution only license.
 

docs/history/changelog.md

@@ -122,6 +122,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
     * 'procurement'
     * 'contractClose'
   * [#1353](https://github.com/open-contracting/standard/pull/1353) Replace "tender submissions" with "bid submissions".
+  * [#1644](https://github.com/open-contracting/standard/pull/1644) Replace "pre-procurement phase" with "planning process".
 
 * `partyRole.csv`:
   * [#1187](https://github.com/open-contracting/standard/pull/1187) Add 'contractImplementationManager'
@@ -137,9 +138,12 @@ Per the [normative and non-normative content and changes policy](../governance/n
     * 'lender'
     * 'equityInvestor'
   * [#1182](https://github.com/open-contracting/standard/pull/1182) Deprecate 'funder'
-  * [#1163](https://github.com/open-contracting/standard/pull/1163) Clarify the description of 'procuringEntity'.
-  * [#1182](https://github.com/open-contracting/standard/pull/1182) Clarify the description of 'buyer'.
-  * [#1232](https://github.com/open-contracting/standard/pull/1232) Clarify the description of 'supplier'.
+  * Clarify the descriptions of:
+    * [#1182](https://github.com/open-contracting/standard/pull/1182) 'buyer'
+    * [#1644](https://github.com/open-contracting/standard/pull/1182) 'enquirer'
+    * [#1644](https://github.com/open-contracting/standard/pull/1644) 'interestedParty'
+    * [#1163](https://github.com/open-contracting/standard/pull/1163) 'procuringEntity'
+    * [#1232](https://github.com/open-contracting/standard/pull/1232) 'supplier'
   * [#1352](https://github.com/open-contracting/standard/pull/1352) Replace "party", "entity", etc. with "organization".
   * [#1353](https://github.com/open-contracting/standard/pull/1353) Replace "submit a tender" with "submit a bid".
 
@@ -276,6 +280,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
 * [#1618](https://github.com/open-contracting/standard/pull/1618) Add conformance rule about normative statements.
 * [#1618](https://github.com/open-contracting/standard/pull/1618) Remove validator and application conformance rules.
 * [#1618](https://github.com/open-contracting/standard/pull/1618) Move governance policies from Google Docs, updating references for OCDS 1.1.5 and OCDS 1.2.0, and removing references to GitHub issues.
+* [#1643](https://github.com/open-contracting/standard/pull/1643) Update identifier section in release reference.
 
 ## [1.1.5] - 2020-08-20
 

docs/index.md

@@ -70,7 +70,7 @@ Check whether your data follows the OCDS correctly
 
 ````
 
-The Open Contracting Data Standard is a core product of the [Open Contracting Partnership](https://www.open-contracting.org/) (OCP). If you are interested to learn more about Open Contracting advocacy and how it can be used to support wider reform and measurable improvements in public contracting, please visit www.open-contracting.org.
+The Open Contracting Data Standard is a core product of the [Open Contracting Partnership](https://www.open-contracting.org/) (OCP). If you are interested to learn more about Open Contracting advocacy and how it can be used to support wider reform and measurable improvements in public contracting, please visit [www.open-contracting.org](https://www.open-contracting.org/).
 
 ```{note}
 This is the English (and canonical) version of the OCDS documentation. You can switch to the Spanish and French translations using the language switcher.

docs/schema/reference.md

@@ -343,7 +343,7 @@ Information on subcontracts is not currently included in the core OCDS schema, b
 :collapse: providerOrganization,receiverOrganization,amount,payer,payee,value
 ```
 
-The transaction block is modelled on the [International Aid Transparency Initiative (IATI) transaction element](https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/transaction/), and can be used to represent actual flows of money between organizations in relation to this contract. As with the [budget](#budget) block, this can be used to cross-reference to a third party `source` of data, and ought to re-use identifiers from that source.
+The transaction block is modelled on the [International Aid Transparency Initiative (IATI) transaction element](https://iatistandard.org/en/iati-standard/203/activity-standard/iati-activities/iati-activity/transaction/), and can be used to represent actual flows of money between organizations in relation to this contract. As with the [budget](#budget) block, this can be used to cross-reference to a third party `source` of data, and ought to reuse identifiers from that source.
 
 ```{note}
 To represent planned payments, use [Milestones](#milestones) instead.
@@ -438,7 +438,7 @@ See the [parties](#parties) section.
 
 The identifier block provides a way to [identify the legal entities](identifiers.md#organization-identifiers) involved in a contracting (or planning) process.
 
-If a contracting process represents a contract arranged by the department or branch of a larger organization, the legal entity (usually the registered organization) should be described in the [identifier](#identifier) section, with details of the branch or department given in the name, [address](#address) and [contact point](#contactpoint) as relevant. 
+When describing an organizational unit (for example, a department or branch of an organization), the `identifier` field should identify the main organization. The other fields should describe the organizational unit. For more information, see [organizational units](../guidance/map/organizational_units.md).
 
 ````{admonition} Example
 :class: hint

schema/codelists/milestoneType.csv

@@ -1,5 +1,5 @@
 Code,Title,Description
-preProcurement,Pre-procurement milestones,"For events during the planning or pre-procurement phase of a process, such as the preparation of key studies."
+preProcurement,Pre-procurement milestones,"For events during the planning process, such as the preparation of key studies."
 approval,Approval milestones,For events such as the sign-off of a contract or project.
 engagement,Engagement milestones,"For engagement milestones, such as a public hearing."
 assessment,Assessment milestones,"For assessment and adjudication milestones, such as the meeting date of a committee."

schema/codelists/partyRole.csv

@@ -4,11 +4,11 @@ procuringEntity,Procuring entity,"The organization managing the contracting (or
 supplier,Supplier,An organization with which a buyer or a procuring entity decided to conclude a contract.,,
 tenderer,Tenderer,An organization that submitted a bid.,,
 funder,Funder,The funder is an organization providing money or finance for this contracting process.,,1.2
-enquirer,Enquirer,An organization that has made an enquiry during the enquiry phase of a contracting process.,,
+enquirer,Enquirer,An organization that submitted an enquiry during the enquiry period of the contracting process.,,
 payer,Payer,An organization making a payment from a transaction.,,
 payee,Payee,An organization in receipt of a payment from a transaction.,,
 reviewBody,Review body,An organization responsible for the review of this procurement process. This organization often has a role in any challenges made to the contract award.,,
-interestedParty,Interested party,"An organization that has expressed an interest in the contracting process: for example, by purchasing tender documents or submitting clarification questions.",,
+interestedParty,Interested party,"An organization that expressed interest in the contracting process: for example, by signing up for notifications, submitting enquiries, or requesting procurement documents. The organization can be a potential supplier, news organization, investor, etc.",,
 contractImplementationManager,Contract implementation manager,The organization responsible for managing the implementation of the contract on behalf of the buyer. (This may be different from the procuring entity that manages the contracting process.),,
 mediationBody,Mediation body,The organization responsible for mediation procedures.,,
 processContactPoint,Process contact point,A contact point dedicated to this contracting (or planning) process.,,