Merge pull request #128 from httpwg/merge_encryption

Merge encryption

.gitignore

@@ -5,4 +5,7 @@
 *.swp
 /*-[0-9][0-9].xml
 .refcache
-
+draft-ietf-httpbis-client-hints.xml
+draft-ietf-httpbis-encryption-encoding.xml
+draft-ietf-httpbis-http2-encryption.xml
+draft-ietf-httpbis-key.xml

Makefile

@@ -3,15 +3,15 @@ saxpath ?= "lib/saxon9.jar"
 saxon ?= java -classpath $(saxpath) net.sf.saxon.Transform -novw -l
 kramdown2629 ?= XML_RESOURCE_ORG_PREFIX=http://unicorn-wg.github.io/idrefs kramdown-rfc2629
 
-names := http2-encryption alt-svc legally-restricted-status rfc5987bis key client-hints
+names := http2-encryption alt-svc legally-restricted-status rfc5987bis key client-hints encryption-encoding
 drafts := $(addprefix draft-ietf-httpbis-,$(names))
 last_tag = $(shell git tag | grep "$(draft)" | sort | tail -1 | awk -F- '{print $$NF}')
 next_ver = $(if $(last_tag),$(shell printf "%.2d" $$(( 1$(last_tag) - 99)) ),00)
 next := $(foreach draft, $(drafts), $(draft)-$(next_ver))
 
 TARGETS := $(addsuffix .txt,$(drafts)) \
 	  $(addsuffix .html,$(drafts))
-friendly_names := encryption alt-svc legally-restricted-status rfc5987bis key client-hints
+friendly_names := opsec alt-svc legally-restricted-status rfc5987bis key client-hints encryption-encoding
 FRIENDLY := $(addsuffix .txt,$(friendly_names)) \
 	    $(addsuffix .html,$(friendly_names))
 
@@ -36,7 +36,7 @@ clean:
 	-rm -f $(addsuffix *-[0-9][0-9].xml,$(drafts))
 	-rm -f $(addsuffix *.html,$(drafts))
 
-encryption.%: draft-ietf-httpbis-http2-encryption.%
+opsec.%: draft-ietf-httpbis-http2-encryption.%
 	cp -f $< $@
 
 alt-svc.%: draft-ietf-httpbis-alt-svc.%
@@ -54,6 +54,9 @@ key.%: draft-ietf-httpbis-key.%
 client-hints.%: draft-ietf-httpbis-client-hints.%
 	cp -f $< $@
 
+encryption-encoding.%: draft-ietf-httpbis-encryption-encoding.%
+	cp -f $< $@
+
 define makerule_submit_xml =
 $(1)
 	sed -e"s/$$(basename $$<)-latest/$$(basename $$@)/" $$< > $$@
@@ -117,7 +120,7 @@ endif
 	if test `git status -s | wc -l` -gt 0; then git commit -m "Script updating gh-pages."; fi
 ifneq (,$(GH_TOKEN))
 	@echo git push -q https://github.com/$(TRAVIS_REPO_SLUG).git gh-pages
-	@git push -q https://$(GH_TOKEN)@github.com/$(TRAVIS_REPO_SLUG).git gh-pages
+	@git push -q https://$(GH_TOKEN)@github.com/$(TRAVIS_REPO_SLUG).git gh-pages >/dev/null 2>&1
 endif
 	-git checkout -qf "$(GIT_ORIG)"
 	-rm -rf $(GHPAGES_TMP)

README.md

@@ -12,6 +12,13 @@ guidelines](CONTRIBUTING.md) for information about how to participate.
 * [Open Issues](https://github.com/httpwg/http-extensions/issues?q=is%3Aopen+is%3Aissue+label%3Aclient-hints) / [Document Status](https://datatracker.ietf.org/doc/draft-ietf-httpbis-client-hints/)
 
 
+### HTTP Encryption Content Encoding
+
+* [Editors' Draft](https://httpwg.github.io/http-extensions/draft-ietf-httpbis-encryption-encoding.html)
+* [Working Group Draft](https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding) (less recent, more official)
+* [Open Issues](https://github.com/httpwg/http-extensions/issues?q=is%3Aopen+is%3Aissue+label%3Aencryption) / [Document Status](https://datatracker.ietf.org/doc/draft-ietf-httpbis-encryption-encoding/)
+
+
 ### Key
 * [Editors' Draft](https://httpwg.github.io/http-extensions/key.html) ([plain text](https://httpwg.github.io/http-extensions/key.txt))
 * [Working Group Draft](https://tools.ietf.org/html/draft-ietf-httpbis-key) (less recent, more official)
@@ -47,9 +54,3 @@ Working Group Last Call ended 4 December 2015
 * [Working Group Draft](https://tools.ietf.org/html/draft-ietf-httpbis-legally-restricted-status) (less recent, more official)
 * [Open Issues](https://github.com/httpwg/http-extensions/issues?q=is%3Aopen+is%3Aissue+label%3A451) / [Document Status](https://datatracker.ietf.org/doc/draft-ietf-httpbis-legally-restricted-status/)
 
-
-
-
-
-
-