Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify contracts description (896) #1208

Merged
merged 18 commits into from
Jul 30, 2021

Conversation

JachymHercher
Copy link
Contributor

@JachymHercher JachymHercher commented Feb 7, 2021

#896

together with #1216, addresses #903

@JachymHercher JachymHercher added Semantics Relating to field and code descriptions Schema: Fields Relating to adding or deprecating fields in the JSON Schema Focus - Documentation Includes corrections, clarifications, new guidance, and UI/UX issues labels Feb 7, 2021
@JachymHercher JachymHercher added this to the 1.2.0 milestone Feb 7, 2021
@JachymHercher JachymHercher linked an issue Feb 7, 2021 that may be closed by this pull request
@JachymHercher JachymHercher changed the base branch from 1.1-dev to 1.2-dev February 7, 2021 21:33
@jpmckinney
Copy link
Member

@JachymHercher Please click "Ready for review" unless this PR is still in draft.

@JachymHercher
Copy link
Contributor Author

I left it as a draft intentionally, because I haven't yet drafted the guidance section. I'm waiting for #1123 with that (and perhaps I should wait also for getting started), see #896 (comment).

@jpmckinney
Copy link
Member

@JachymHercher #1123 is merged, and you've now seen the Primer, so I think this issue is now unblocked.

@JachymHercher JachymHercher marked this pull request as ready for review July 29, 2021 09:14
@JachymHercher
Copy link
Contributor Author

Ready for review, see #896 (comment)

Remove the recommendation to use a single award for all suppliers entering a framework agreement.
@jpmckinney
Copy link
Member

jpmckinney commented Jul 30, 2021

Notes on the merge:

  • Somehow, docs/guidance/map/awards_contracts_buyers_suppliers.md reappeared – possibly from a bad merge in Merge 1.1-dev into 1.2-dev #1356
  • The changelog was getting quite messy, so I took the opportunity to put it in order

I also added a commit for a broken link, that I assume also occurred in #1356.

@jpmckinney jpmckinney merged commit 096a22b into 1.2-dev Jul 30, 2021
@jpmckinney jpmckinney deleted the 896-clarify-contracts-description branch July 30, 2021 04:02
@jpmckinney jpmckinney removed Focus - Documentation Includes corrections, clarifications, new guidance, and UI/UX issues Schema: Fields Relating to adding or deprecating fields in the JSON Schema Semantics Relating to field and code descriptions labels Jul 31, 2021
@duncandewhurst duncandewhurst mentioned this pull request Aug 2, 2021
11 tasks
jpmckinney added a commit that referenced this pull request Aug 12, 2021
…o demand-side assessment. Clarify normative relationship between JSON and Excel/CSV. Rephrase to avoid repetition. Capitalize Primer. Copy-edit punctuation. Fix typo.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Clarify Contract description
2 participants