Skip to content

Commit

Permalink
Various fixes after review and compare with EL spec
Browse files Browse the repository at this point in the history
Add some missing asciidoc escapes
Update copyright dates
Use {revdate} where appropriate
Fix overly large first title
Make title consistent (without version number)

Signed-off-by: Mark Thomas <markt@apache.org>
  • Loading branch information
markt-asf committed Jan 20, 2020
1 parent 579cf65 commit 1de6fae
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
11 changes: 6 additions & 5 deletions spec/src/main/asciidoc/WebSocket.adoc
@@ -1,18 +1,19 @@
:sectnums:
= Jakarta WebSocket Specification, Version 2.0
:sectnums!:
== Jakarta WebSocket Specification, Version 2.0

Copyright (c) 2011, 2019 Oracle and/or its affiliates and others.
Copyright (c) 2011, 2020 Oracle and/or its affiliates and others.
All rights reserved.

Eclipse is a registered trademark of the Eclipse Foundation. Jakarta
is a trademark of the Eclipse Foundation. Oracle and Java are
registered trademarks of Oracle and/or its affiliates. Other names
may be trademarks of their respective owners.

The Jakarta WebSocket Team TBD, 2020
The Jakarta WebSocket Team - {revdate}

Comments to: websocket-dev@eclipse.org

:sectnums:
[[introduction]]
== Introduction

Expand Down Expand Up @@ -1476,7 +1477,7 @@ either to the *GOLD_MEMBER* or *PLATINUM_MEMBER* roles.
[[changes-since-1.1-final-release]]
== Changes Since 1.1 Final Release
* https://github.com/eclipse-ee4j/websocket-api/pull/312[Pull Request 312]
Convert from javax.* to jakarta.*
Convert from `javax.\*` to `jakarta.*`
* https://github.com/eclipse-ee4j/websocket-api/pull/312[Pull Request 315]
Update specification document for move to Jakarta EE

Expand Down
2 changes: 1 addition & 1 deletion spec/src/main/asciidoc/license-efsl.adoc
Expand Up @@ -26,7 +26,7 @@ document, or portions thereof, that you use:
* All existing copyright notices, or if one does not exist, a notice
(hypertext is preferred, but a textual representation is permitted)
of the form: "Copyright (c) [$date-of-document]
Eclipse Foundation, Inc. <<url to this license>>"
Eclipse Foundation, Inc. \<<url to this license>>"

Inclusion of the full text of this NOTICE must be provided. We
request that authorship attribution be provided in any software,
Expand Down
4 changes: 2 additions & 2 deletions spec/src/main/asciidoc/websocket-spec.adoc
@@ -1,8 +1,8 @@
//
// Copyright (c) 2017, 2019 Contributors to the Eclipse Foundation
// Copyright (c) 2017, 2020 Contributors to the Eclipse Foundation
//

= Jakarta WebSocket 2.0
= Jakarta WebSocket
:authors: Jakarta WebSocket Team, https://projects.eclipse.org/projects/ee4j.websocket
:email: https://dev.eclipse.org/mailman/listinfo/websocket-dev
:version-label!:
Expand Down

0 comments on commit 1de6fae

Please sign in to comment.