Merge branch 'conneg-editorial' into conneg-3PWD-candidate

# Conflicts: # conneg-by-ap/index.html
w3c · Aug 31, 2019 · 1b1adb2 · 1b1adb2
2 parents 569862f + 83d4f1d
commit 1b1adb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/conneg-by-ap/config.js b/conneg-by-ap/config.js
@@ -10,10 +10,10 @@ var respecConfig = {
     canonicalURI: "TR",
     editors: [{
         name:       "Lars G. Svensson",
-        company:    "Deutsche Nationalbibliothek",
+        company:    "Invited Expert and before at Deutsche Nationalbibliothek",
         companyURL: "http://www.dnb.de/",
 	    orcid:      "0000-0002-8714-9718",
-        w3cid:      "44603"
+        w3cid:      44603
       },
       {
         name:       "Rob Atkinson",
@@ -24,8 +24,8 @@ var respecConfig = {
       {
         name:       "Nicholas J. Car",
         mailto:     "nicholas.car@surroundaustralia.com",
-        company:    "SURROUND Australia Pty Ltd, formerly CSIRO",
-        companyURL: "https://surroundaustralia.com",
+        company:    "Invited Expert and before at CSIRO",
+        companyURL: "https://www.csiro.au",
         orcid:      "0000-0002-8742-7730",
         w3cid:      70131
     }],

diff --git a/conneg-by-ap/index.html b/conneg-by-ap/index.html
@@ -272,8 +272,8 @@ <h2>Motivation</h2>
     <h2>Related Work</h2>
     <p>
       The standardization of the content-negotiation HTTP headers is the purview of the IETF. A first proposal
-      for an <a href="https://profilenegotiation.github.io/I-D-Accept--Schema/I-D-accept-schema">Internet Draft
-      for Negotiating Profiles in HTTP</a> [[PROF-IETF]] is available but has not yet been submitted to the IETF. The
+      for an <a href="https://profilenegotiation.github.io/I-D-Profile-Negotiation/I-D-Profile-Negotiation">Internet Draft
+      for Indicating and Negotiating Profiles in HTTP</a> [[PROF-IETF]] is available but has not yet been submitted to the IETF. The
       current version of the IETF draft (-00) is expected to be completely re-written in parallel work with this document and should
       not be seen as anything but work-in-progress.
     </p>
@@ -996,15 +996,14 @@ <h4>QSA Functional Profile description</h4>
           fixed keyword "QSA Functional Profile" and the second is the "QSA Alternate Keywords Functional Profile" according to which
           servers may implement any keywords they choose. These various functional profiles are
           all identified in <a href="#conformance-profiles"></a>.
-          <!-- #text commented out pending Appendix profile description work#
-          Conformance of a server to any one or multiple of
-          these <a>profiles</a> of this <a>specification</a> may be demonstrated as per
-          <a href="#conformancetoprofiles"></a>. Note that it is not required that a server indicates conformance to one
-          or more profiles of this specification since not all servers will have the ability to either produce information
-          as per <a href="#conformancetoprofiles"></a> and may be described in that way elsewhere (e.g. a
-          services catalogue).
-          -->
         </p>
+        <div class="note">
+          Conformance of a system to any one, or perhaps multiple, of these profiles may be demonstrated as per
+          <a href="#conformancetoprofiles"></a>. Note that it is not required that a system, perhaps a server, indicate
+          conformance to one or more profiles of this specification since not all servers will have the ability to
+          either produce information as per <a href="#conformancetoprofiles"></a>. Systems may also show conformance to
+          the specification or profile in other ways, such as by a listing in a services catalogue. services catalogue).
+        </div>
         <section id="qsa-uri">
           <h5>QSA URI description</h5>
           <p>