Skip to content

Commit 3de6496

Browse files
authored
Merge branch 'main' into nits
2 parents d0c0636 + 5ad51ee commit 3de6496

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.circleci/config.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ jobs:
33
build:
44
docker:
55
- image: martinthomson/i-d-template:latest
6-
resource_class: small
76
working_directory: ~/draft
87

98
steps:
109
- run:
1110
name: "Print Configuration"
1211
command: |
1312
xml2rfc --version
14-
gem list -q kramdown-rfc
13+
gem list -q kramdown-rfc2629
1514
echo -n 'mmark '; mmark --version
1615
1716
- restore_cache:
@@ -43,7 +42,7 @@ jobs:
4342
# Build txt and html versions of drafts
4443
- run:
4544
name: "Build Drafts"
46-
command: make
45+
command: "make 'CLONE_ARGS=--reference ~/git-reference'"
4746

4847
# Update editor's copy on gh-pages
4948
- run:
@@ -98,4 +97,4 @@ workflows:
9897
- build:
9998
filters:
10099
tags:
101-
only: /.*?/
100+
only: /.*?/

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ $ make update-files
3232
```
3333

3434
Command line usage requires that you have the necessary software installed. See
35-
[the instructions](https://github.com/martinthomson/i-d-template/blob/main/doc/SETUP.md).
36-
35+
[the instructions](https://github.com/martinthomson/i-d-template/blob/main/doc/SETUP.md).

draft-ietf-core-coap-pubsub.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -1114,13 +1114,12 @@ Description: Topic-data resource of a broker
11141114
Reference: [RFC-XXXX]
11151115
~~~
11161116

1117-
--- back
11181117

1119-
# Appendix: Document Updates
1118+
=======
1119+
# Document Updates # {#sec-document-updates}
1120+
{:removeinrfc}
11201121

1121-
RFC EDITOR: PLEASE REMOVE THIS SECTION.
1122-
1123-
A.1. Version -13 to -14
1122+
## Version -13 to -14
11241123

11251124
* Section restructuring for better readability.
11261125
* Updated topic configuration interactions.
@@ -1130,7 +1129,7 @@ A.1. Version -13 to -14
11301129
* Updated topic discovery section.
11311130
* Other editorial changes
11321131

1133-
A.2. Version -14 to -15
1132+
## Version -14 to -15
11341133

11351134
* Code bug fix https://github.com/jaimejim/aiocoap-pubsub-broker/commit/f32ce4866a81319238d6e905de439c9410cce175
11361135
* Added two new optional topic configuration parameters; ‘initialize,’ and ‘topic-history’.
@@ -1146,4 +1145,6 @@ A.2. Version -14 to -15
11461145

11471146
The current version of this document contains a substantial contribution by Klaus Hartke's proposal {{I-D.hartke-t2trg-coral-pubsub}}, which defines the topic resource model and structure as well as the topic lifecycle and interactions. It also follows a similar architectural design as that provided by Marco Tiloca's {{I-D.ietf-ace-oscore-gm-admin}}.
11481147

1149-
The authors would like to also thank Carsten Bormann, Hannes Tschofenig, Zach Shelby, Mohit Sethi, Peter van der Stok, Tim Kellogg, Anders Eriksson, Goran Selander, Mikko Majanen, Olaf Bergmann and Oscar Novo for their valuable contributions and reviews.
1148+
1149+
The authors would like to also thank {{{Marco Tiloca}}}, {{{Carsten Bormann}}}, {{{Hannes Tschofenig}}}, {{{Zach Shelby}}}, {{{Mohit Sethi}}}, Peter van der Stok, Tim Kellogg, Anders Eriksson, {{{Goran Selander}}}, Mikko Majanen, {{{Olaf Bergmann}}}, {{{David Navarro}}} and Oscar Novo for their valuable contributions and reviews.
1150+

0 commit comments

Comments
 (0)