Skip to content

ISC title variations #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 15, 2017
Merged

ISC title variations #497

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
160f38b
ISC title variations
mlinksva Nov 28, 2017
f6c2b0b
escape parens in regex, support ISCL
mlinksva Nov 28, 2017
e50c6a2
@goneall review + [L]?
mlinksva Dec 3, 2017
df6ab04
Title in published text
mlinksva Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ISC.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<crossRef>http://www.opensource.org/licenses/ISC</crossRef>
</crossRefs>
<titleText>
<p>ISC License:</p>
<p><alt match="(The )?ISC License( \(ISC[L]?\))?:?"></alt></p>
Copy link
Contributor

@wking wking Dec 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is back to having no canonical title in the license body (which seems reasonable to me, but has had a fair bit of discussion in this PR, I don't know if there is a consensus yet). If the intention is to have no canonical title in the license body, I think we want to drop the <p> tags too. No need to render an empty <p></p>.

If the intention is to have a canonical title in the license body, then I think you want:

<p><alt match="(The )?ISC License( \(ISC[L]?\))?:?">ISC License</alt></p>

or whatever you decide to use for the canonical title inside. I'm also fine with <alt …><titleText><p>…</p></titleText></alt> if folks prefer that order.

Copy link
Contributor Author

@mlinksva mlinksva Dec 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer the title be in the canonical version, so I'll go ahead and add it back. @goneall can either approve or ask it to be removed.

</titleText>
<copyrightText>
<p>Copyright (c) <alt match=".+" name="copyright">2004-2010 by Internet Systems Consortium, Inc. ("ISC")
Expand All @@ -25,4 +25,4 @@
OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>

</license>
</SPDXLicenseCollection>
</SPDXLicenseCollection>