Skip to content

Commit ffc690f

Browse files
clemensvclemensv
committed
2 parents b66f823 + c4650f6 commit ffc690f

File tree

9 files changed

+126
-123
lines changed

9 files changed

+126
-123
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# See http://editorconfig.org
2+
3+
root = true
4+
5+
[*.{md,xml,org}]
6+
charset = utf-8
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Automatically generated CODEOWNERS
2+
# Regenerate with `make update-codeowners`
3+
draft-vasters-httpapi-json-structure-conditional-composition.md clemensv@microsoft.com

‎.github/workflows/setup.yml‎

Lines changed: 0 additions & 110 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
*.html
2+
*.pdf
3+
*.redxml
4+
*.swp
5+
*.txt
6+
*.upload
7+
*~
8+
.tags
9+
/*-[0-9][0-9].xml
10+
/.*.mk
11+
/.gems/
12+
/.refcache
13+
/.venv/
14+
/.vscode/
15+
/lib
16+
/node_modules/
17+
/versioned/
18+
Gemfile.lock
19+
archive.json
20+
draft-vasters-httpapi-json-structure-conditional-composition.xml
21+
package-lock.json
22+
report.xml
23+
!requirements.txt

‎CONTRIBUTING.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Contributing
2+
3+
This repository relates to activities in the Internet Engineering Task Force
4+
([IETF](https://www.ietf.org/)). All material in this repository is considered
5+
Contributions to the IETF Standards Process, as defined in the intellectual
6+
property policies of IETF currently designated as
7+
[BCP 78](https://www.rfc-editor.org/info/bcp78),
8+
[BCP 79](https://www.rfc-editor.org/info/bcp79) and the
9+
[IETF Trust Legal Provisions (TLP) Relating to IETF Documents](http://trustee.ietf.org/trust-legal-provisions.html).
10+
11+
Any edit, commit, pull request, issue, comment or other change made to this
12+
repository constitutes Contributions to the IETF Standards Process
13+
(https://www.ietf.org/).
14+
15+
You agree to comply with all applicable IETF policies and procedures, including,
16+
BCP 78, 79, the TLP, and the TLP rules regarding code components (e.g. being
17+
subject to a Simplified BSD License) in Contributions.
18+
19+
20+
## Working Group Information
21+
22+
Discussion of this work occurs on the [Building Blocks for HTTP APIs
23+
mailing list](mailto:httpapi@ietf.org)
24+
([archive](https://mailarchive.ietf.org/arch/browse/httpapi/),
25+
[subscribe](https://www.ietf.org/mailman/listinfo/httpapi)).
26+
In addition to contributions in GitHub, you are encouraged to participate in
27+
discussions there.
28+
29+
**Note**: Some working groups adopt a policy whereby substantive discussion of
30+
technical issues needs to occur on the mailing list.
31+
32+
You might also like to familiarize yourself with other
33+
[ documents](https://datatracker.ietf.org/wg/httpapi/documents/).

‎LICENSE.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# License
2+
3+
See the
4+
[guidelines for contributions](https://github.com/json-structure/conditional-composition/blob/main/CONTRIBUTING.md).

‎Makefile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
LIBDIR := lib
2+
include $(LIBDIR)/main.mk
3+
4+
$(LIBDIR)/main.mk:
5+
ifneq (,$(shell grep "path *= *$(LIBDIR)" .gitmodules 2>/dev/null))
6+
git submodule sync
7+
git submodule update --init
8+
else
9+
ifneq (,$(wildcard $(ID_TEMPLATE_HOME)))
10+
ln -s "$(ID_TEMPLATE_HOME)" $(LIBDIR)
11+
else
12+
git clone -q --depth 10 -b main \
13+
https://github.com/martinthomson/i-d-template $(LIBDIR)
14+
endif
15+
endif

‎README.md‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
1-
# JSON Structure Conditional Composition - Internet-Draft Repository
1+
<!-- regenerate: on (set to off if you edit this file) -->
2+
3+
# JSON Structure Conditional Composition
4+
5+
This is the working area for the individual Internet-Draft, "JSON Structure Conditional Composition".
6+
7+
* [Editor's Copy](https://json-structure.github.io/conditional-composition/#go.draft-vasters-httpapi-json-structure-conditional-composition.html)
8+
* [Datatracker Page](https://datatracker.ietf.org/doc/draft-vasters-httpapi-json-structure-conditional-composition)
9+
* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-vasters-httpapi-json-structure-conditional-composition)
10+
* [Compare Editor's Copy to Individual Draft](https://json-structure.github.io/conditional-composition/#go.draft-vasters-httpapi-json-structure-conditional-composition.diff)
11+
12+
13+
## Contributing
14+
15+
See the
16+
[guidelines for contributions](https://github.com/json-structure/conditional-composition/blob/main/CONTRIBUTING.md).
17+
18+
Contributions can be made by creating pull requests.
19+
The GitHub interface supports creating pull requests using the Edit (✏) button.
20+
21+
22+
## Command Line Usage
23+
24+
Formatted text and HTML versions of the draft can be built using `make`.
25+
26+
```sh
27+
$ make
28+
```
29+
30+
Command line usage requires that you have the necessary software installed. See
31+
[the instructions](https://github.com/martinthomson/i-d-template/blob/main/doc/SETUP.md).
232

3-
This repository contains the source material for the [JSON Structure Conditional
4-
Composition](draft-vasters-httpapi-json-structure-conditional-composition.md)
5-
Internet-Draft.

‎draft-vasters-httpapi-json-structure-conditional-composition.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
title: "JSON Structure: Conditional Composition"
44
category: info
55

6-
docname: draft-vasters-httpapi-json-structure-conditional-composition
6+
docname: draft-vasters-httpapi-json-structure-conditional-composition-latest
77
submissiontype: IETF # also: "independent", "editorial", "IAB", or "IRTF"
88
number:
99
date:
1010
consensus: true
1111
v: 3
12-
area: AREA
13-
workgroup: WG Working Group
12+
area: ""
13+
workgroup: "Building Blocks for HTTP APIs"
1414
keyword:
1515
- JSON
1616
- schema
1717
venue:
18-
group: WG
19-
type: Working Group
20-
mail: WG@example.com
21-
arch: https://example.com/WG
22-
github: json-structure/conditional-composition
23-
latest: https://json-structure.github.io/conditional-composition
18+
group: "Building Blocks for HTTP APIs"
19+
type: ""
20+
mail: "httpapi@ietf.org"
21+
arch: "https://mailarchive.ietf.org/arch/browse/httpapi/"
22+
github: "json-structure/conditional-composition"
23+
latest: "https://json-structure.github.io/conditional-composition/draft-vasters-httpapi-json-structure-conditional-composition.html"
2424

2525
author:
2626
-

0 commit comments

Comments
 (0)